From 85a4daedff65aedd84e7768f4aecccb996e3a794 Mon Sep 17 00:00:00 2001
From: sof <unknown>
Date: Thu, 5 Jun 1997 21:18:10 +0000
Subject: [PATCH] [project @ 1997-06-05 21:15:00 by sof] import updates
---
ghc/compiler/codeGen/CgBindery.lhs | 1 -
ghc/compiler/codeGen/CgCase.lhs | 4 ++++
ghc/compiler/codeGen/CgClosure.lhs | 4 ++++
ghc/compiler/codeGen/CgExpr.lhs | 2 ++
ghc/compiler/codeGen/CgLetNoEscape.lhs | 4 ++++
ghc/compiler/codeGen/CgMonad.lhs | 8 +++++++-
6 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/ghc/compiler/codeGen/CgBindery.lhs b/ghc/compiler/codeGen/CgBindery.lhs
index 9fbdb2c22126..e5916e4df742 100644
--- a/ghc/compiler/codeGen/CgBindery.lhs
+++ b/ghc/compiler/codeGen/CgBindery.lhs
@@ -27,7 +27,6 @@ module CgBindery (
) where
IMP_Ubiq(){-uitous-}
---IMPORT_DELOOPER(CgLoop1) -- here for paranoia-checking
import AbsCSyn
import CgMonad
diff --git a/ghc/compiler/codeGen/CgCase.lhs b/ghc/compiler/codeGen/CgCase.lhs
index 07d9f48161da..1c15b4be431f 100644
--- a/ghc/compiler/codeGen/CgCase.lhs
+++ b/ghc/compiler/codeGen/CgCase.lhs
@@ -13,7 +13,11 @@
module CgCase ( cgCase, saveVolatileVarsAndRegs ) where
IMP_Ubiq(){-uitous-}
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201
IMPORT_DELOOPER(CgLoop2) ( cgExpr, getPrimOpArgAmodes )
+#else
+import {-# SOURCE #-} CgExpr
+#endif
import CgMonad
import StgSyn
diff --git a/ghc/compiler/codeGen/CgClosure.lhs b/ghc/compiler/codeGen/CgClosure.lhs
index 4e96e75b9fff..75a4d1921bb5 100644
--- a/ghc/compiler/codeGen/CgClosure.lhs
+++ b/ghc/compiler/codeGen/CgClosure.lhs
@@ -13,7 +13,11 @@ with {\em closures} on the RHSs of let(rec)s. See also
module CgClosure ( cgTopRhsClosure, cgRhsClosure ) where
IMP_Ubiq(){-uitous-}
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201
IMPORT_DELOOPER(CgLoop2) ( cgExpr )
+#else
+import {-# SOURCE #-} CgExpr ( cgExpr )
+#endif
import CgMonad
import AbsCSyn
diff --git a/ghc/compiler/codeGen/CgExpr.lhs b/ghc/compiler/codeGen/CgExpr.lhs
index 5026a31ea759..b600193b56c7 100644
--- a/ghc/compiler/codeGen/CgExpr.lhs
+++ b/ghc/compiler/codeGen/CgExpr.lhs
@@ -13,7 +13,9 @@
module CgExpr ( cgExpr, getPrimOpArgAmodes ) where
IMP_Ubiq(){-uitous-}
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201
IMPORT_DELOOPER(CgLoop2) -- here for paranoia-checking
+#endif
import Constants ( mAX_SPEC_SELECTEE_SIZE )
import StgSyn
diff --git a/ghc/compiler/codeGen/CgLetNoEscape.lhs b/ghc/compiler/codeGen/CgLetNoEscape.lhs
index c3ee85bec2cd..935b441910d0 100644
--- a/ghc/compiler/codeGen/CgLetNoEscape.lhs
+++ b/ghc/compiler/codeGen/CgLetNoEscape.lhs
@@ -13,7 +13,11 @@
module CgLetNoEscape ( cgLetNoEscapeClosure ) where
IMP_Ubiq(){-uitious-}
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201
IMPORT_DELOOPER(CgLoop2) ( cgExpr )
+#else
+import {-# SOURCE #-} CgExpr ( cgExpr )
+#endif
import StgSyn
import CgMonad
diff --git a/ghc/compiler/codeGen/CgMonad.lhs b/ghc/compiler/codeGen/CgMonad.lhs
index bd7c9d673dc9..902774bd2d0a 100644
--- a/ghc/compiler/codeGen/CgMonad.lhs
+++ b/ghc/compiler/codeGen/CgMonad.lhs
@@ -47,9 +47,15 @@ module CgMonad (
CompilationInfo(..)
) where
+IMPORT_1_3(List(nub))
IMP_Ubiq(){-uitous-}
+
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201
IMPORT_DELOOPER(CgLoop1) -- stuff from CgBindery and CgUsages
-IMPORT_1_3(List(nub))
+#else
+import {-# SOURCE #-} CgBindery
+import {-# SOURCE #-} CgUsages
+#endif
import AbsCSyn
import AbsCUtils ( mkAbsCStmts )
--
GitLab