X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FDriverPipeline.hs;h=84b7a69db4929a6c888967abe20536162d1b619d;hb=153b9cb9b11e05c4edb1b6bc0a7b972660e41f70;hp=9b83280dbfa2b6ef0fa15a3a9a487a7f2b9de312;hpb=bfdd44b2bfec3d819fd5ce19279832c25f096bb4;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/DriverPipeline.hs b/ghc/compiler/main/DriverPipeline.hs
index 9b83280..84b7a69 100644
--- a/ghc/compiler/main/DriverPipeline.hs
+++ b/ghc/compiler/main/DriverPipeline.hs
@@ -816,10 +816,12 @@ runPhase cc_phase todo dflags basename suff input_fn get_output_fn maybe_loc
 
 runPhase Mangle todo dflags _basename _suff input_fn get_output_fn maybe_loc
    = do let mangler_opts = getOpts dflags opt_m
-        machdep_opts <- if (prefixMatch "i386" cTARGETPLATFORM)
-			  then do let n_regs = stolen_x86_regs dflags
-			          return [ show n_regs ]
-		          else return []
+
+#if i386_TARGET_ARCH
+        machdep_opts <- return [ show (stolen_x86_regs dflags) ]
+#else
+	machdep_opts <- return []
+#endif
 
 	split <- readIORef v_Split_object_files
 	let next_phase
@@ -1253,8 +1255,12 @@ doCpp dflags raw include_cc_opts input_fn output_fn = do
 	              | otherwise = SysTools.runCc dflags (SysTools.Option "-E" : args)
 
     let target_defs = 
-	  [ "-D" ++ cTARGETOS   ++ "_TARGET_OS=1",
-	    "-D" ++ cTARGETARCH ++ "_TARGET_ARCH=1" ]
+	  [ "-D" ++ HOST_OS     ++ "BUILD_OS=1",
+	    "-D" ++ HOST_ARCH   ++ "BUILD_ARCH=1",
+	    "-D" ++ TARGET_OS   ++ "HOST_OS=1",
+	    "-D" ++ TARGET_ARCH ++ "HOST_ARCH=1" ]
+	-- remember, in code we *compile*, the HOST is the same our TARGET,
+	-- and BUILD is the same as our HOST.
 
     cpp_prog       ([SysTools.Option verb]
 		    ++ map SysTools.Option include_paths