[project @ 1997-05-19 00:12:10 by sof]

[ghc-hetmet.git] / ghc / compiler / nativeGen / StixInteger.lhs

diff --git a/ghc/compiler/nativeGen/StixInteger.lhs b/ghc/compiler/nativeGen/StixInteger.lhs
index 5c90139..d4be4d5 100644 (file)
--- a/ghc/compiler/nativeGen/StixInteger.lhs
+++ b/ghc/compiler/nativeGen/StixInteger.lhs
@@ -15,21 +15,25 @@ IMP_Ubiq(){-uitous-}
 IMPORT_DELOOPER(NcgLoop)               ( amodeToStix )
 
 import MachMisc
+#if __GLASGOW_HASKELL__ >= 202
+import MachRegs hiding (Addr)
+#else
 import MachRegs
+#endif
 
 import AbsCSyn         -- bits and bobs...
-import CgCompInfo      ( mIN_MP_INT_SIZE )
+import Constants       ( mIN_MP_INT_SIZE )
 import Literal         ( Literal(..) )
 import OrdList         ( OrdList )
 import PrimOp          ( PrimOp(..) )
 import PrimRep         ( PrimRep(..) )
 import SMRep           ( SMRep(..), SMSpecRepKind, SMUpdateKind )
 import Stix            ( getUniqLabelNCG, sStLitLbl, stgHp, stgHpLim,
-                         StixTree(..), StixTreeList(..),
+                         StixTree(..), SYN_IE(StixTreeList),
                          CodeSegment, StixReg
                        )
 import StixMacro       ( macroCode, heapCheck )
-import UniqSupply      ( returnUs, thenUs, UniqSM(..) )
+import UniqSupply      ( returnUs, thenUs, SYN_IE(UniqSM) )
 import Util            ( panic )
 \end{code}