X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FStaticFlags.hs;h=ad65dfe2f4492ba56fd49d01cba0385b2ade4c2e;hb=fa2879a0a740ee3c3860822ff5bb93c97d4d6af6;hp=512f52ca0d8f77cc85871043a187d216bd3dfce6;hpb=bdfa0107143179ddd8e539306442eefeb1913d48;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/StaticFlags.hs b/ghc/compiler/main/StaticFlags.hs
index 512f52c..ad65dfe 100644
--- a/ghc/compiler/main/StaticFlags.hs
+++ b/ghc/compiler/main/StaticFlags.hs
@@ -71,7 +71,6 @@ module StaticFlags (
 
 #include "HsVersions.h"
 
-import DriverPhases
 import Util		( consIORef )
 import CmdLineParser
 import Config		( cProjectVersionInt, cProjectPatchLevel,
@@ -508,14 +507,12 @@ way_details =
     (WayProf, Way  "p" False "Profiling"
 	[ "-fscc-profiling"
 	, "-DPROFILING"
-	, "-optc-DPROFILING"
-	, "-fvia-C" ]),
+	, "-optc-DPROFILING" ]),
 
     (WayTicky, Way  "t" False "Ticky-ticky Profiling"  
 	[ "-fticky-ticky"
 	, "-DTICKY_TICKY"
-	, "-optc-DTICKY_TICKY"
-	, "-fvia-C" ]),
+	, "-optc-DTICKY_TICKY" ]),
 
     (WayUnreg, Way  "u" False "Unregisterised" 
 	unregFlags ),
@@ -529,8 +526,7 @@ way_details =
         , "-optc-w"
         , "-optl-L${PVM_ROOT}/lib/${PVM_ARCH}"
         , "-optl-lpvm3"
-        , "-optl-lgpvm3"
-	, "-fvia-C" ]),
+        , "-optl-lgpvm3" ]),
 
     -- at the moment we only change the RTS and could share compiler and libs!
     (WayPar, Way  "mt" False "Parallel ticky profiling" 
@@ -542,8 +538,7 @@ way_details =
         , "-optc-w"
         , "-optl-L${PVM_ROOT}/lib/${PVM_ARCH}"
         , "-optl-lpvm3"
-        , "-optl-lgpvm3"
-	, "-fvia-C" ]),
+        , "-optl-lgpvm3" ]),
 
     (WayPar, Way  "md" False "Distributed" 
 	[ "-fparallel"
@@ -555,24 +550,23 @@ way_details =
         , "-optc-w"
         , "-optl-L${PVM_ROOT}/lib/${PVM_ARCH}"
         , "-optl-lpvm3"
-        , "-optl-lgpvm3"
-	, "-fvia-C" ]),
+        , "-optl-lgpvm3" ]),
 
     (WayGran, Way  "mg" False "GranSim"
 	[ "-fgransim"
 	, "-D__GRANSIM__"
 	, "-optc-DGRAN"
-	, "-package concurrent"
-	, "-fvia-C" ]),
+	, "-package concurrent" ]),
 
     (WaySMP, Way  "s" False "SMP"
 	[ "-fsmp"
+#if !defined(mingw32_TARGET_OS)
 	, "-optc-pthread"
-#ifndef freebsd_TARGET_OS
+#endif
+#if !defined(mingw32_TARGET_OS) && !defined(freebsd_TARGET_OS)
 	, "-optl-pthread"
 #endif
-	, "-optc-DSMP"
-	, "-fvia-C" ]),
+	, "-optc-DSMP" ]),
 
     (WayNDP, Way  "ndp" False "Nested data parallelism"
 	[ "-fparr"