Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/1f9ca81cff59ed6c0078437a992f40c13d2667c7

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

commit 1f9ca81cff59ed6c0078437a992f40c13d2667c7
Author: David Terei <[email protected]>
Date:   Fri Nov 18 14:42:47 2011 -0800

    Enable '-split-objs' with llvm backend

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

 compiler/main/DriverPipeline.hs |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index a953b01..e590658 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -1376,11 +1376,12 @@ runPhase LlvmLlc input_fn dflags
 -----------------------------------------------------------------------------
 -- LlvmMangle phase
 
-runPhase LlvmMangle input_fn _dflags
+runPhase LlvmMangle input_fn dflags
   = do
-      output_fn <- phaseOutputFilename As
+      let next_phase = if dopt Opt_SplitObjs dflags then Splitter else As
+      output_fn <- phaseOutputFilename next_phase
       io $ llvmFixupAsm input_fn output_fn
-      return (As, output_fn)
+      return (next_phase, output_fn)
 
 -----------------------------------------------------------------------------
 -- merge in stub objects



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to