From 99c00cd603a2538616d0156256d4ae3d59426e07 Mon Sep 17 00:00:00 2001
From: sof <unknown>
Date: Thu, 5 Jun 1997 20:50:37 +0000
Subject: [PATCH] [project @ 1997-06-05 20:49:02 by sof] updated imports
---
ghc/compiler/nativeGen/StixInteger.lhs | 5 ++++-
ghc/compiler/nativeGen/StixMacro.lhs | 6 ++++++
ghc/compiler/nativeGen/StixPrim.lhs | 3 ++-
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ghc/compiler/nativeGen/StixInteger.lhs b/ghc/compiler/nativeGen/StixInteger.lhs
index d4be4d50d13c..eea3212026fd 100644
--- a/ghc/compiler/nativeGen/StixInteger.lhs
+++ b/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)
diff --git a/ghc/compiler/nativeGen/StixMacro.lhs b/ghc/compiler/nativeGen/StixMacro.lhs
index 5333c3c70e8d..58f9beb3ae34 100644
--- 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
diff --git a/ghc/compiler/nativeGen/StixPrim.lhs b/ghc/compiler/nativeGen/StixPrim.lhs
index c7c4883abf0d..e4168a0f6d7e 100644
--- a/ghc/compiler/nativeGen/StixPrim.lhs
+++ b/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}
-
--
GitLab