[commit: ghc] master: Fix ./validate failure due to unused result. (874124d)
git at git.haskell.org
git at git.haskell.org
Tue Jan 28 14:27:21 UTC 2014
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/874124d71fb8af9c42fabd1b08e0e66545a02ff2/ghc
>---------------------------------------------------------------
commit 874124d71fb8af9c42fabd1b08e0e66545a02ff2
Author: Austin Seipp <austin at well-typed.com>
Date: Mon Jan 27 22:22:03 2014 -0600
Fix ./validate failure due to unused result.
Fallout from 4ade9627608ea0a88450506222bb9afbbcff4294
Signed-off-by: Austin Seipp <austin at well-typed.com>
>---------------------------------------------------------------
874124d71fb8af9c42fabd1b08e0e66545a02ff2
compiler/main/GHC.hs | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs
index 2f878fb..553d1a9 100644
--- a/compiler/main/GHC.hs
+++ b/compiler/main/GHC.hs
@@ -468,11 +468,14 @@ checkBrokenTablesNextToCode :: MonadIO m => DynFlags -> m ()
checkBrokenTablesNextToCode dflags
= do { broken <- checkBrokenTablesNextToCode' dflags
; when broken
- $ do { liftIO $ throwIO $ mkApiErr dflags
- (text "Tables-next-to-code not supported on ARM using binutils ld (https://sourceware.org/bugzilla/show_bug.cgi?id=16177)")
+ $ do { _ <- liftIO $ throwIO $ mkApiErr dflags invalidLdErr
; fail "unsupported linker"
}
}
+ where
+ invalidLdErr = text "Tables-next-to-code not supported on ARM" <+>
+ text "when using binutils ld (please see:" <+>
+ text "https://sourceware.org/bugzilla/show_bug.cgi?id=16177)"
checkBrokenTablesNextToCode' :: MonadIO m => DynFlags -> m Bool
checkBrokenTablesNextToCode' dflags
More information about the ghc-commits
mailing list