Merge remote-tracking branch 'origin/master' into newcg

* origin/master: (756 commits)
  don't crash if argv[0] == NULL (#7037)
  -package P was loading all versions of P in GHCi (#7030)
  Add a Note, copying text from #2437
  improve the --help docs a bit (#7008)
  Copy Data.HashTable's hashString into our Util module
  Build fix
  Build fixes
  Parse error: suggest brackets and indentation.
  Don't build the ghc DLL on Windows; works around trac #5987
  On Windows, detect if DLLs have too many symbols; trac #5987
  Add some more Integer rules; fixes #6111
  Fix PA dfun construction with silent superclass args
  Add silent superclass parameters to the vectoriser
  Add silent superclass parameters (again)
  Mention Generic1 in the user's guide
  Make the GHC API a little more powerful.
  tweak llvm version warning message
  New version of the patch for #5461.
  Fix Word64ToInteger conversion rule.
  Implemented feature request on reconfigurable pretty-printing in GHCi (#5461)
  ...

Conflicts:
	compiler/basicTypes/UniqSupply.lhs
	compiler/cmm/CmmBuildInfoTables.hs
	compiler/cmm/CmmLint.hs
	compiler/cmm/CmmOpt.hs
	compiler/cmm/CmmPipeline.hs
	compiler/cmm/CmmStackLayout.hs
	compiler/cmm/MkGraph.hs
	compiler/cmm/OldPprCmm.hs
	compiler/codeGen/CodeGen.lhs
	compiler/codeGen/StgCmm.hs
	compiler/codeGen/StgCmmBind.hs
	compiler/codeGen/StgCmmLayout.hs
	compiler/codeGen/StgCmmUtils.hs
	compiler/main/CodeOutput.lhs
	compiler/main/HscMain.hs
	compiler/nativeGen/AsmCodeGen.lhs
	compiler/simplStg/SimplStg.lhs

1 files changed, 6 insertions, 8 deletions

diff --git a/compiler/nativeGen/PPC/Regs.hs b/compiler/nativeGen/PPC/Regs.hs
index 203709e7a3..fe4e06fcc5 100644
--- a/compiler/nativeGen/PPC/Regs.hs
+++ b/compiler/nativeGen/PPC/Regs.hs
@@ -66,9 +66,7 @@ import OldCmm
 import CLabel           ( CLabel )
 import Unique
 
-import Pretty
-import Outputable       ( panic, SDoc )	
-import qualified Outputable
+import Outputable
 import Constants
 import FastBool
 import FastTypes
@@ -136,10 +134,10 @@ mkVirtualReg u size
 regDotColor :: RealReg -> SDoc
 regDotColor reg
  = case classOfRealReg reg of
-        RcInteger       -> Outputable.text "blue"
-        RcFloat         -> Outputable.text "red"
-        RcDouble        -> Outputable.text "green"
-        RcDoubleSSE     -> Outputable.text "yellow"
+        RcInteger       -> text "blue"
+        RcFloat         -> text "red"
+        RcDouble        -> text "green"
+        RcDoubleSSE     -> text "yellow"
 
 
 -- immediates ------------------------------------------------------------------
@@ -147,7 +145,7 @@ data Imm
 	= ImmInt	Int
 	| ImmInteger	Integer	    -- Sigh.
 	| ImmCLbl	CLabel	    -- AbstractC Label (with baggage)
-	| ImmLit	Doc	    -- Simple string
+	| ImmLit	SDoc	    -- Simple string
 	| ImmIndex    CLabel Int
 	| ImmFloat	Rational
 	| ImmDouble	Rational