Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/79939a546be3697101900bfe49dd43880f7a6355 >--------------------------------------------------------------- commit 79939a546be3697101900bfe49dd43880f7a6355 Author: Ian Lynagh <[email protected]> Date: Tue Oct 11 21:49:35 2011 +0100 Always define rtsOptsEnabled in the "extra object" when linking Now that we always link in an extra object, we may as well always define rtsOptsEnabled in it, rather than having a default value in rts/hooks/RtsOptsEnabled.c. >--------------------------------------------------------------- compiler/main/DriverPipeline.hs | 9 ++------- rts/hooks/RtsOptsEnabled.c | 13 ------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs index 220fac0..b655425 100644 --- a/compiler/main/DriverPipeline.hs +++ b/compiler/main/DriverPipeline.hs @@ -1442,16 +1442,11 @@ mkExtraObjToLinkIntoBinary dflags dep_packages = do -- keep gcc happy where - mk_rts_opts_enabled val + rts_opts_enabled = vcat [text "#include \"Rts.h\"", text "#include \"RtsOpts.h\"", text "const RtsOptsEnabledEnum rtsOptsEnabled = " <> - text val <> semi ] - - rts_opts_enabled = case rtsOptsEnabled dflags of - RtsOptsNone -> mk_rts_opts_enabled "RtsOptsNone" - RtsOptsSafeOnly -> empty -- The default - RtsOptsAll -> mk_rts_opts_enabled "RtsOptsAll" + text (show (rtsOptsEnabled dflags)) <> semi ] extra_rts_opts = case rtsOpts dflags of Nothing -> empty diff --git a/rts/hooks/RtsOptsEnabled.c b/rts/hooks/RtsOptsEnabled.c deleted file mode 100644 index f20c325..0000000 --- a/rts/hooks/RtsOptsEnabled.c +++ /dev/null @@ -1,13 +0,0 @@ -/* ----------------------------------------------------------------------------- - * - * (c) The GHC Team 2010 - * - * En/disable RTS options - * - * ---------------------------------------------------------------------------*/ - -#include "Rts.h" -#include "RtsOpts.h" - -const RtsOptsEnabledEnum rtsOptsEnabled = RtsOptsSafeOnly; - _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
