X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FDriverPipeline.hs;h=6557c05c4e610e4eb90cefb144db7bd085b743bc;hb=8844513929ccd58854227ddb6275095a1f1742ad;hp=32cb4b8a195d0645c2e63c72dccc4875d4bafce5;hpb=5bd3072ac30216a505151601884ac88bf404c9f2;p=ghc-hetmet.git

diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index 32cb4b8..6557c05 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -260,11 +260,10 @@ compile' (nothingCompiler, interactiveCompiler, batchCompiler)
 compileStub :: GhcMonad m => HscEnv -> Module -> ModLocation
             -> m FilePath
 compileStub hsc_env mod location = do
-	let (o_base, o_ext) = splitExtension (ml_obj_file location)
-	    stub_o = (o_base ++ "_stub") <.> o_ext
-
 	-- compile the _stub.c file w/ gcc
-	let (stub_c,_,_) = mkStubPaths (hsc_dflags hsc_env) (moduleName mod) location
+	let (stub_c,_,stub_o) = mkStubPaths (hsc_dflags hsc_env) 
+                                   (moduleName mod) location
+
 	runPipeline StopLn hsc_env (stub_c,Nothing)  Nothing
 		(SpecificFile stub_o) Nothing{-no ModLocation-}
 
@@ -993,6 +992,13 @@ runPhase cc_phase _stop hsc_env _basename _suff input_fn get_output_fn maybe_loc
         -- This is a temporary hack.
                        ++ ["-mcpu=v9"]
 #endif
+#if defined(darwin_TARGET_OS) && defined(i386_TARGET_ARCH)
+                          -- By default, gcc on OS X will generate SSE
+                          -- instructions, which need things 16-byte aligned,
+                          -- but we don't 16-byte align things. Thus drop
+                          -- back to generic i686 compatibility. Trac #2983.
+                       ++ ["-march=i686"]
+#endif
 		       ++ (if hcc && mangle
 		  	     then md_regd_c_flags
 		  	     else [])
@@ -1513,6 +1519,8 @@ maybeCreateManifest dflags exe_filename = do
         -- no FileOptions here: windres doesn't like seeing
         -- backslashes, apparently
 
+  removeFile manifest_filename
+
   return [rc_obj_filename]
 #endif