From: simonpj <unknown>
Date: Mon, 1 Apr 2002 08:16:50 +0000 (+0000)
Subject: [project @ 2002-04-01 08:16:49 by simonpj]
X-Git-Tag: Approx_11550_changesets_converted~2202
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=995c2dc3387f079a3ea4785c4e1b4be21604d749;p=ghc-hetmet.git

[project @ 2002-04-01 08:16:49 by simonpj]
Import wibbles
---

diff --git a/ghc/compiler/main/TidyPgm.lhs b/ghc/compiler/main/TidyPgm.lhs
index 38c6745..3bfcb0b 100644
--- a/ghc/compiler/main/TidyPgm.lhs
+++ b/ghc/compiler/main/TidyPgm.lhs
@@ -20,8 +20,8 @@ import VarEnv
 import VarSet
 import Var		( Id, Var )
 import Id		( idType, idInfo, idName, idCoreRules, 
-			  isExportedId, idUnique, mkVanillaGlobal, isLocalId, 
-			  isImplicitId, mkUserLocal, setIdInfo
+			  isExportedId, mkVanillaGlobal, isLocalId, 
+			  isImplicitId 
 			) 
 import IdInfo		{- loads of stuff -}
 import NewDemand	( isBottomingSig, topSig )
@@ -42,7 +42,6 @@ import HscTypes		( PersistentCompilerState( pcs_PRS ),
 import FiniteMap	( lookupFM, addToFM )
 import Maybes		( orElse )
 import ErrUtils		( showPass, dumpIfSet_core )
-import SrcLoc		( noSrcLoc )
 import UniqFM		( mapUFM )
 import UniqSupply	( splitUniqSupply, uniqFromSupply )
 import List		( partition )
diff --git a/ghc/compiler/nativeGen/AsmRegAlloc.lhs b/ghc/compiler/nativeGen/AsmRegAlloc.lhs
index 744d1f6..90b379a 100644
--- a/ghc/compiler/nativeGen/AsmRegAlloc.lhs
+++ b/ghc/compiler/nativeGen/AsmRegAlloc.lhs
@@ -19,7 +19,7 @@ import FiniteMap	( FiniteMap, emptyFM,
 			  listToFM, fmToList )
 import OrdList		( fromOL )
 import Outputable
-import Unique		( Unique, Uniquable(..), mkPseudoUnique3 )
+import Unique		( mkPseudoUnique3 )
 import CLabel		( CLabel, pprCLabel )
 import FastTypes
 
diff --git a/ghc/compiler/nativeGen/StixPrim.lhs b/ghc/compiler/nativeGen/StixPrim.lhs
index c970808..e186c39 100644
--- a/ghc/compiler/nativeGen/StixPrim.lhs
+++ b/ghc/compiler/nativeGen/StixPrim.lhs
@@ -8,7 +8,7 @@ where
 
 #include "HsVersions.h"
 
-import MachMisc
+-- import MachMisc
 import Stix
 
 import PprAbsC		( pprAmode )
@@ -23,7 +23,7 @@ import Constants	( wORD_SIZE,
 			  mIN_INTLIKE, mIN_CHARLIKE, uF_UPDATEE, bLOCK_SIZE,
 			  rESERVED_STACK_WORDS )
 import CLabel		( mkIntlikeClosureLabel, mkCharlikeClosureLabel,
-			  mkMAP_FROZEN_infoLabel, mkEMPTY_MVAR_infoLabel,
+			  mkMAP_FROZEN_infoLabel, 
 			  mkForeignLabel )
 import ForeignCall	( ForeignCall(..), CCallSpec(..), CCallTarget(..),
 			  CCallConv(..), playSafe, playThreadSafe )