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

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

diff --git a/ghc/compiler/nativeGen/StixMacro.lhs b/ghc/compiler/nativeGen/StixMacro.lhs
index 5333c3c..58f9beb 100644 (file)
--- a/ghc/compiler/nativeGen/StixMacro.lhs
+++ b/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