X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FcodeGen%2FStgCmmCon.hs;h=368bc534838b219d30cc8fc6431eba76b23213ab;hp=3226f0c111c44bf1bfec68c46b89d82d663d0939;hb=cbd7463c986d54422de15cb3b56184de116ef7ba;hpb=f64aaa7b4230cec62f0679ddf998fe79e0a42820

diff --git a/compiler/codeGen/StgCmmCon.hs b/compiler/codeGen/StgCmmCon.hs
index 3226f0c..368bc53 100644
--- 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
@@ -189,7 +193,7 @@ buildDynCon binder ccs con args
   = do	{ let (cl_info, args_w_offsets) = layOutDynConstr con (addArgReps args)
 		-- No void args in args_w_offsets
 	; (tmp, init) <- allocDynClosure cl_info use_cc blame_cc args_w_offsets
- 	; return (regIdInfo binder lf_info tmp, init) }
+	; regIdInfo binder lf_info tmp init }
   where
     lf_info = mkConLFInfo con