[project @ 1997-07-05 03:02:04 by sof]

[ghc-hetmet.git] / ghc / compiler / absCSyn / CLabel.lhs

diff --git a/ghc/compiler/absCSyn/CLabel.lhs b/ghc/compiler/absCSyn/CLabel.lhs
index 603f0a0..7a7c548 100644 (file)
--- a/ghc/compiler/absCSyn/CLabel.lhs
+++ b/ghc/compiler/absCSyn/CLabel.lhs
@@ -48,17 +48,26 @@ module CLabel (
     ) where
 
 IMP_Ubiq(){-uitous-}
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201
 IMPORT_DELOOPER(AbsCLoop)              ( CtrlReturnConvention(..),
                          ctrlReturnConvAlg
                        )
+#else
+import {-# SOURCE #-} CgRetConv
+#endif
+
+
 #if ! OMIT_NATIVE_CODEGEN
+# if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201
 IMPORT_DELOOPER(NcgLoop)               ( underscorePrefix, fmtAsmLbl )
+# else
+import {-# SOURCE #-} MachMisc ( underscorePrefix, fmtAsmLbl )
+# endif
 #endif
 
 import CStrings                ( pp_cSEP )
 import Id              ( externallyVisibleId, cmpId_withSpecDataCon,
                          isDataCon, isDictFunId,
-                         isConstMethodId_maybe,
                          isDefaultMethodId_maybe,
                          isSuperDictSelId_maybe, fIRST_TAG,
                          SYN_IE(ConTag), GenId{-instance Outputable-},
@@ -319,7 +328,7 @@ pprCLabel_asm = pprCLabel (PprForAsm underscorePrefix fmtAsmLbl)
 pprCLabel :: PprStyle -> CLabel -> Doc
 
 pprCLabel (PprForAsm _ fmtAsmLbl) (AsmTempLabel u)
-  = text (fmtAsmLbl (_UNPK_ (showUnique u)))
+  = text (fmtAsmLbl (showUnique u))
 
 pprCLabel (PprForAsm prepend_cSEP _) lbl
   = if prepend_cSEP