[project @ 1996-06-26 10:26:00 by partain]

SLPJ 1.3 changes through 96/06/25

10 files changed, 15 insertions, 9 deletions

diff --git a/ghc/compiler/nativeGen/AbsCStixGen.lhs b/ghc/compiler/nativeGen/AbsCStixGen.lhs
index 830e450dfc..144f586bd5 100644
--- a/ghc/compiler/nativeGen/AbsCStixGen.lhs
+++ b/ghc/compiler/nativeGen/AbsCStixGen.lhs
@@ -31,7 +31,7 @@ import PrimRep	    	( isFloatingRep, PrimRep(..) )
 import StixInfo	    	( genCodeInfoTable )
 import StixMacro	( macroCode )
 import StixPrim		( primCode, amodeToStix, amodeToStix' )
-import UniqSupply	( returnUs, thenUs, mapUs, getUnique, UniqSM(..) )
+import UniqSupply	( returnUs, thenUs, mapUs, getUnique, SYN_IE(UniqSM) )
 import Util		( naturalMergeSortLe, panic )
 
 #ifdef REALLY_HASKELL_1_3
diff --git a/ghc/compiler/nativeGen/AsmCodeGen.lhs b/ghc/compiler/nativeGen/AsmCodeGen.lhs
index 090e13fc68..50c6faeb23 100644
--- a/ghc/compiler/nativeGen/AsmCodeGen.lhs
+++ b/ghc/compiler/nativeGen/AsmCodeGen.lhs
@@ -22,7 +22,7 @@ import PrimOp		( commutableOp, PrimOp(..) )
 import PrimRep		( PrimRep{-instance Eq-} )
 import RegAllocInfo	( mkMRegsState, MRegsState )
 import Stix		( StixTree(..), StixReg(..), CodeSegment )
-import UniqSupply	( returnUs, thenUs, mapUs, UniqSM(..) )
+import UniqSupply	( returnUs, thenUs, mapUs, SYN_IE(UniqSM) )
 import Unpretty		( uppPutStr, uppShow, uppAboves, Unpretty(..) )
 \end{code}
 
diff --git a/ghc/compiler/nativeGen/MachCode.lhs b/ghc/compiler/nativeGen/MachCode.lhs
index c9b671ebd6..031c3ba038 100644
--- a/ghc/compiler/nativeGen/MachCode.lhs
+++ b/ghc/compiler/nativeGen/MachCode.lhs
@@ -31,7 +31,7 @@ import Stix		( getUniqLabelNCG, StixTree(..),
 			  StixReg(..), CodeSegment(..)
 			)
 import UniqSupply	( returnUs, thenUs, mapUs, mapAndUnzipUs,
-			  mapAccumLUs, UniqSM(..)
+			  mapAccumLUs, SYN_IE(UniqSM)
 			)
 import Unpretty		( uppPStr )
 import Util		( panic, assertPanic )
diff --git a/ghc/compiler/nativeGen/MachRegs.lhs b/ghc/compiler/nativeGen/MachRegs.lhs
index 7493de4e9f..b48f136dc5 100644
--- a/ghc/compiler/nativeGen/MachRegs.lhs
+++ b/ghc/compiler/nativeGen/MachRegs.lhs
@@ -72,7 +72,7 @@ import Stix		( sStLitLbl, StixTree(..), StixReg(..),
 import Unique		( mkPseudoUnique1, mkPseudoUnique2, mkPseudoUnique3,
 			  Unique{-instance Ord3-}
 			)
-import UniqSupply	( getUnique, returnUs, thenUs, UniqSM(..) )
+import UniqSupply	( getUnique, returnUs, thenUs, SYN_IE(UniqSM) )
 import Unpretty		( uppStr, Unpretty(..) )
 import Util		( panic )
 \end{code}
diff --git a/ghc/compiler/nativeGen/NcgLoop_1_3.lhi b/ghc/compiler/nativeGen/NcgLoop_1_3.lhi
new file mode 100644
index 0000000000..5cc8f208d1
--- /dev/null
+++ b/ghc/compiler/nativeGen/NcgLoop_1_3.lhi
@@ -0,0 +1,6 @@
+\begin{code}
+interface NcgLoop_1_3 1
+__exports__
+MachMisc underscorePrefix (..)
+MachMisc fmtAsmLbl (..)
+\end{code}
diff --git a/ghc/compiler/nativeGen/Stix.lhs b/ghc/compiler/nativeGen/Stix.lhs
index 2dd8169c55..c6ab81b757 100644
--- a/ghc/compiler/nativeGen/Stix.lhs
+++ b/ghc/compiler/nativeGen/Stix.lhs
@@ -20,7 +20,7 @@ IMP_Ubiq(){-uitous-}
 import AbsCSyn		( node, infoptr, MagicId(..) )
 import AbsCUtils	( magicIdPrimRep )
 import CLabel		( mkAsmTempLabel )
-import UniqSupply	( returnUs, thenUs, getUnique, UniqSM(..) )
+import UniqSupply	( returnUs, thenUs, getUnique, SYN_IE(UniqSM) )
 import Unpretty		( uppPStr, Unpretty(..) )
 \end{code}
 
diff --git a/ghc/compiler/nativeGen/StixInfo.lhs b/ghc/compiler/nativeGen/StixInfo.lhs
index 9afcec5480..150dc41a9c 100644
--- a/ghc/compiler/nativeGen/StixInfo.lhs
+++ b/ghc/compiler/nativeGen/StixInfo.lhs
@@ -25,7 +25,7 @@ import SMRep		( SMRep(..), SMSpecRepKind(..), SMUpdateKind(..),
 			)
 import Stix		-- all of it
 import StixPrim		( amodeToStix )
-import UniqSupply	( returnUs, UniqSM(..) )
+import UniqSupply	( returnUs, SYN_IE(UniqSM) )
 import Unpretty		( uppBesides, uppPStr, uppInt, uppChar )
 \end{code}
 
diff --git a/ghc/compiler/nativeGen/StixInteger.lhs b/ghc/compiler/nativeGen/StixInteger.lhs
index 5c90139f2c..a019c52140 100644
--- a/ghc/compiler/nativeGen/StixInteger.lhs
+++ b/ghc/compiler/nativeGen/StixInteger.lhs
@@ -29,7 +29,7 @@ import Stix		( getUniqLabelNCG, sStLitLbl, stgHp, stgHpLim,
 			  CodeSegment, StixReg
 			)
 import StixMacro	( macroCode, heapCheck )
-import UniqSupply	( returnUs, thenUs, UniqSM(..) )
+import UniqSupply	( returnUs, thenUs, SYN_IE(UniqSM) )
 import Util		( panic )
 \end{code}
 
diff --git a/ghc/compiler/nativeGen/StixMacro.lhs b/ghc/compiler/nativeGen/StixMacro.lhs
index c4b8e3de28..419283c922 100644
--- a/ghc/compiler/nativeGen/StixMacro.lhs
+++ b/ghc/compiler/nativeGen/StixMacro.lhs
@@ -21,7 +21,7 @@ import OrdList		( OrdList )
 import PrimOp		( PrimOp(..) )
 import PrimRep		( PrimRep(..) )
 import Stix
-import UniqSupply	( returnUs, thenUs, UniqSM(..) )
+import UniqSupply	( returnUs, thenUs, SYN_IE(UniqSM) )
 \end{code}
 
 The @ARGS_CHK_A{_LOAD_NODE}@ macros check for sufficient arguments on
diff --git a/ghc/compiler/nativeGen/StixPrim.lhs b/ghc/compiler/nativeGen/StixPrim.lhs
index c986b3117b..cdb4fdb65f 100644
--- a/ghc/compiler/nativeGen/StixPrim.lhs
+++ b/ghc/compiler/nativeGen/StixPrim.lhs
@@ -29,7 +29,7 @@ import SMRep		( SMRep(..), SMSpecRepKind, SMUpdateKind )
 import Stix
 import StixMacro	( heapCheck, smStablePtrTable )
 import StixInteger	{- everything -}
-import UniqSupply	( returnUs, thenUs, UniqSM(..) )
+import UniqSupply	( returnUs, thenUs, SYN_IE(UniqSM) )
 import Unpretty		( uppBeside, uppPStr, uppInt )
 import Util		( panic )