[project @ 1997-06-05 20:49:02 by sof]

updated imports

ghc/compiler/nativeGen/StixInteger.lhs

@@ -12,8 +12,11 @@ module StixInteger (
     ) where
 
 IMP_Ubiq(){-uitous-}
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201
 IMPORT_DELOOPER(NcgLoop)		( amodeToStix )
-
+#else
+import {-# SOURCE #-} StixPrim ( amodeToStix )
+#endif
 import MachMisc
 #if __GLASGOW_HASKELL__ >= 202
 import MachRegs hiding (Addr)

ghc/compiler/nativeGen/StixMacro.lhs

@@ -8,9 +8,15 @@
 module StixMacro ( macroCode, heapCheck ) where
 
 IMP_Ubiq(){-uitious-}
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201
 IMPORT_DELOOPER(NcgLoop)		( amodeToStix )
+#else
+import {-# SOURCE #-} StixPrim ( amodeToStix )
+#endif
 
 import MachMisc
+
+-- In 2.0x we import Addr via GlaExts, so we better hide the other one here.
 #if __GLASGOW_HASKELL__ >= 202
 import MachRegs hiding (Addr)
 #else

ghc/compiler/nativeGen/StixPrim.lhs

@@ -8,7 +8,9 @@
 module StixPrim ( primCode, amodeToStix, amodeToStix' ) where
 
 IMP_Ubiq(){-uitous-}
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201
 IMPORT_DELOOPER(NcgLoop)		-- paranoia checking only
+#endif
 
 import MachMisc
 #if __GLASGOW_HASKELL__ >= 202
@@ -607,4 +609,3 @@ flushStdout = StCall SLIT("fflush") VoidRep [StLitLit SLIT("stdout")]
 flushStderr = StCall SLIT("fflush") VoidRep [StLitLit SLIT("stderr")]
 errorIO = StJump (StInd PtrRep (sStLitLbl SLIT("ErrorIO_innards")))
 \end{code}
-