Merge in new code generator branch.

[ghc-hetmet.git] / compiler / codeGen / StgCmmCon.hs

diff --git a/compiler/codeGen/StgCmmCon.hs b/compiler/codeGen/StgCmmCon.hs
index 3226f0c..633d577 100644 (file)
--- a/compiler/codeGen/StgCmmCon.hs
+++ b/compiler/codeGen/StgCmmCon.hs
@@ -25,9 +25,9 @@ import StgCmmUtils
 import StgCmmClosure
 import StgCmmProf
 
-import Cmm
+import CmmExpr
 import CLabel
-import MkZipCfgCmm (CmmAGraph, mkNop)
+import MkGraph
 import SMRep
 import CostCentre
 import Module
@@ -39,9 +39,13 @@ import Literal
 import PrelInfo
 import Outputable
 import Util             ( lengthIs )
-import StaticFlags     ( opt_PIC )
+
 import Data.Char
 
+#if defined(mingw32_TARGET_OS)
+import StaticFlags     ( opt_PIC )
+#endif
+
 
 ---------------------------------------------------------------
 --     Top-level constructors