[project @ 1997-10-19 21:57:18 by sof]

import MachRegs unconditionally

diff --git a/ghc/compiler/nativeGen/StixInteger.lhs b/ghc/compiler/nativeGen/StixInteger.lhs
index eea3212..1d81160 100644 (file)
--- a/ghc/compiler/nativeGen/StixInteger.lhs
+++ b/ghc/compiler/nativeGen/StixInteger.lhs
@@ -18,11 +18,7 @@ IMPORT_DELOOPER(NcgLoop)             ( amodeToStix )
 import {-# SOURCE #-} StixPrim ( amodeToStix )
 #endif
 import MachMisc
-#if __GLASGOW_HASKELL__ >= 202
-import MachRegs hiding (Addr)
-#else
 import MachRegs
-#endif
 
 import AbsCSyn         -- bits and bobs...
 import Constants       ( mIN_MP_INT_SIZE )

diff --git a/ghc/compiler/nativeGen/StixMacro.lhs b/ghc/compiler/nativeGen/StixMacro.lhs
index 58f9beb..19fc2a1 100644 (file)
--- a/ghc/compiler/nativeGen/StixMacro.lhs
+++ b/ghc/compiler/nativeGen/StixMacro.lhs
@@ -16,12 +16,7 @@ import {-# SOURCE #-} StixPrim ( amodeToStix )
 
 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
 import MachRegs
-#endif
 
 import AbsCSyn         ( CStmtMacro(..), MagicId(..), mkIntCLit, CAddrMode )
 import Constants       ( uF_RET, uF_SUA, uF_SUB, uF_UPDATEE,

diff --git a/ghc/compiler/nativeGen/StixPrim.lhs b/ghc/compiler/nativeGen/StixPrim.lhs
index fd20512..1537e26 100644 (file)
--- a/ghc/compiler/nativeGen/StixPrim.lhs
+++ b/ghc/compiler/nativeGen/StixPrim.lhs
@@ -13,11 +13,7 @@ IMPORT_DELOOPER(NcgLoop)             -- paranoia checking only
 #endif
 
 import MachMisc
-#if __GLASGOW_HASKELL__ >= 202
-import MachRegs hiding (Addr)
-#else
 import MachRegs
-#endif
 
 import AbsCSyn
 import AbsCUtils       ( getAmodeRep, mixedTypeLocn )