Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/bba762137354a2113876a0fba6c705b585e3399a >--------------------------------------------------------------- commit bba762137354a2113876a0fba6c705b585e3399a Author: Ian Lynagh <[email protected]> Date: Tue Oct 23 13:44:30 2012 +0100 Fix -fPIC on OS X x86 >--------------------------------------------------------------- compiler/cmm/CmmPipeline.hs | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/compiler/cmm/CmmPipeline.hs b/compiler/cmm/CmmPipeline.hs index 0cd956a..c523b13 100644 --- a/compiler/cmm/CmmPipeline.hs +++ b/compiler/cmm/CmmPipeline.hs @@ -25,6 +25,7 @@ import ErrUtils import HscTypes import Control.Monad import Outputable +import Platform ----------------------------------------------------------------------------- -- | Top level driver for C-- pipeline @@ -156,6 +157,7 @@ cpsTop hsc_env proc = return (cafEnv, [g]) where dflags = hsc_dflags hsc_env + platform = targetPlatform dflags dump = dumpGraph dflags dump' = dumpWith dflags @@ -177,6 +179,10 @@ cpsTop hsc_env proc = -- the entry point. splitting_proc_points = hscTarget dflags /= HscAsm || not (tablesNextToCode dflags) + || usingDarwinX86Pic + usingDarwinX86Pic = platformArch platform == ArchX86 + && platformOS platform == OSDarwin + && gopt Opt_PIC dflags runUniqSM :: UniqSM a -> IO a runUniqSM m = do _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
