[commit: ghc] ghc-7.8: Revert "Add comments explaining #8754" (d1699f9)
git at git.haskell.org
git at git.haskell.org
Wed Feb 19 14:00:48 UTC 2014
Repository : ssh://git@git.haskell.org/ghc
On branch : ghc-7.8
Link : http://ghc.haskell.org/trac/ghc/changeset/d1699f9a6c1bfc4930f61d27302985196020f909/ghc
>---------------------------------------------------------------
commit d1699f9a6c1bfc4930f61d27302985196020f909
Author: Austin Seipp <austin at well-typed.com>
Date: Tue Feb 18 05:20:15 2014 -0600
Revert "Add comments explaining #8754"
This reverts commit b626c3d4ce0e66216705ba8355c914dc809e3fe7.
(cherry picked from commit 642bba349fda1508aa136f7169c0ba63fb00a6f9)
>---------------------------------------------------------------
d1699f9a6c1bfc4930f61d27302985196020f909
ghc/Main.hs | 21 +--------------------
1 file changed, 1 insertion(+), 20 deletions(-)
diff --git a/ghc/Main.hs b/ghc/Main.hs
index 0011aa9..1aa6553 100644
--- a/ghc/Main.hs
+++ b/ghc/Main.hs
@@ -77,7 +77,7 @@ import Data.Maybe
main :: IO ()
main = do
- defaultsHook -- See Note [-Bsymbolic and hooks]
+ defaultsHook
hSetBuffering stdout LineBuffering
hSetBuffering stderr LineBuffering
GHC.defaultErrorHandler defaultFatalMessager defaultFlushOut $ do
@@ -821,23 +821,4 @@ unknownFlagsErr fs = throwGhcException $ UsageError $ concatMap oneError fs
[] -> ""
suggs -> "did you mean one of:\n" ++ unlines (map (" " ++) suggs))
-{- Note [-Bsymbolic and hooks]
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--Bsymbolic is a flag that prevents the binding of references to global
-symbols to symbols outside the shared library being compiled (see `man
-ld`). When dynamically linking, we don't use -Bsymbolic on the RTS
-package: that is because we want hooks to be overridden by the user,
-we don't want to constrain them to the RTS package.
-
-Unfortunately this seems to have broken somehow on OS X: as a result,
-defaultHooks (in hschooks.c) is not called, which does not initialize
-the GC stats. As a result, this breaks things like `:set +s` in GHCi
-(#8754). As a hacky workaround, we instead call 'defaultHooks'
-directly to initalize the flags in the RTS.
-
-A biproduct of this, I believe, is that hooks are likely broken on OS
-X when dynamically linking. But this probably doesn't affect most
-people since we're linking GHC dynamically, but most things themselves
-link statically.
--}
foreign import ccall safe "defaultsHook" defaultsHook :: IO ()
More information about the ghc-commits
mailing list