From: sof <unknown>
Date: Sun, 19 Oct 1997 22:17:22 +0000 (+0000)
Subject: [project @ 1997-10-19 22:16:16 by sof]
X-Git-Tag: Approx_2487_patches~1342
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=f810b7273ec4329665e2f84fa2a78b5438e73a08;p=ghc-hetmet.git

[project @ 1997-10-19 22:16:16 by sof]
Updated to reflect MachRegs.Addr to MachRegs.Address renaming
---

diff --git a/ghc/compiler/nativeGen/AbsCStixGen.lhs b/ghc/compiler/nativeGen/AbsCStixGen.lhs
index 7dcc67f..ee394ef 100644
--- a/ghc/compiler/nativeGen/AbsCStixGen.lhs
+++ b/ghc/compiler/nativeGen/AbsCStixGen.lhs
@@ -14,11 +14,7 @@ import AbsCSyn
 import Stix
 
 import MachMisc
-#if __GLASGOW_HASKELL__ >= 202
-import MachRegs hiding (Addr)
-#else
 import MachRegs
-#endif
 
 import AbsCUtils	( getAmodeRep, mixedTypeLocn,
 			  nonemptyAbsC, mkAbsCStmts, mkAbsCStmtList
@@ -453,8 +449,8 @@ already finish with a jump to the join point.
     	cjmpHi = StCondJump dflt (StPrim IntGtOp [am, StInt highTag])
 
     	offset = StPrim IntSubOp [am, StInt lowTag]
-    	jump = StJump (StInd PtrRep (StIndex PtrRep (StCLbl utlbl) offset))
 
+    	jump = StJump (StInd PtrRep (StIndex PtrRep (StCLbl utlbl) offset))
     	tlbl = StLabel utlbl
     	table = StData PtrRep (mkTable branches [lowTag..highTag] [])
     in
diff --git a/ghc/compiler/nativeGen/AsmCodeGen.lhs b/ghc/compiler/nativeGen/AsmCodeGen.lhs
index d57f34b..d592676 100644
--- a/ghc/compiler/nativeGen/AsmCodeGen.lhs
+++ b/ghc/compiler/nativeGen/AsmCodeGen.lhs
@@ -11,11 +11,7 @@ IMP_Ubiq(){-uitous-}
 IMPORT_1_3(IO(Handle))
 
 import MachMisc
-#if __GLASGOW_HASKELL__ >= 202
-import MachRegs         hiding (Addr)
-#else
 import MachRegs
-#endif
 import MachCode
 import PprMach