[commit: ghc] wip/kavon-nosplit-llvm: gross workaround but I want to see if this is the only bug (05ca291)

git at git.haskell.org git at git.haskell.org
Tue Jun 27 09:16:52 UTC 2017


Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/kavon-nosplit-llvm
Link       : http://ghc.haskell.org/trac/ghc/changeset/05ca2915bcf7cd072b62d6d3391b9ce9da89ba59/ghc

>---------------------------------------------------------------

commit 05ca2915bcf7cd072b62d6d3391b9ce9da89ba59
Author: Kavon Farvardin <kavon at farvard.in>
Date:   Wed Jun 14 17:07:35 2017 +0100

    gross workaround but I want to see if this is the only bug


>---------------------------------------------------------------

05ca2915bcf7cd072b62d6d3391b9ce9da89ba59
 compiler/main/DriverPipeline.hs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index 5e683eb..3935aad 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -1479,6 +1479,7 @@ runPhase (RealPhaseWithInfo mangInfo LlvmLlc) input_fn dflags
 
     liftIO $ SysTools.runLlvmLlc dflags
                 ([ SysTools.Option (llvmOpts !! opt_lvl),
+                    SysTools.Option cpscall_workaround,
                     SysTools.Option $ "-relocation-model=" ++ rmodel,
                     SysTools.FileOption "" input_fn,
                     SysTools.Option "-o", SysTools.FileOption "" output_fn]
@@ -1500,6 +1501,10 @@ runPhase (RealPhaseWithInfo mangInfo LlvmLlc) input_fn dflags
 
     return (doNext, output_fn)
   where
+        
+        -- TODO(kavon): temporary
+        cpscall_workaround = "-disable-machine-cse"
+      
         -- Bug in LLVM at O3 on OSX.
         llvmOpts = if platformOS (targetPlatform dflags) == OSDarwin
                    then ["-O1", "-O2", "-O2"]



More information about the ghc-commits mailing list