X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FnativeGen%2FPIC.hs;h=c375ab4707f9f6a01728a38a4a13819e63f31864;hp=5bfe90b0fab4139aa0f99a0fbda086ef9e5b05eb;hb=d9a655dad8e013e41c74dca98fb86c4ed6f29879;hpb=0af418beb1aadcae1df036240151556895d00321

diff --git a/compiler/nativeGen/PIC.hs b/compiler/nativeGen/PIC.hs
index 5bfe90b..c375ab4 100644
--- a/compiler/nativeGen/PIC.hs
+++ b/compiler/nativeGen/PIC.hs
@@ -63,7 +63,7 @@ import Reg
 import NCGMonad
 
 
-import Cmm
+import OldCmm
 import CLabel           ( CLabel, ForeignLabelSource(..), pprCLabel,
                           mkDynamicLinkerLabel, DynamicLinkerLabelInfo(..),
                           dynamicLinkerLabelInfo, mkPicBaseLabel,
@@ -635,7 +635,7 @@ pprImportedSymbol _ OSDarwin _
 --    section.
 --    The "official" GOT mechanism (label@got) isn't intended to be used
 --    in position dependent code, so we have to create our own "fake GOT"
---    when not opt_PCI && not opt_Static.
+--    when not opt_PIC && not opt_Static.
 --
 -- 2) PowerPC Linux is just plain broken.
 --    While it's theoretically possible to use GOT offsets larger
@@ -713,7 +713,7 @@ initializePicBase_ppc
 	-> NatM [NatCmmTop PPC.Instr]
 
 initializePicBase_ppc ArchPPC os picReg
-    (CmmProc info lab params (ListGraph blocks) : statics)
+    (CmmProc info lab (ListGraph blocks) : statics)
     | osElfTarget os
     = do
         gotOffLabel <- getNewLabelNat
@@ -739,11 +739,11 @@ initializePicBase_ppc ArchPPC os picReg
                                : PPC.ADD picReg picReg (PPC.RIReg tmp)
                                : insns)
 
-        return (CmmProc info lab params (ListGraph (b' : tail blocks)) : gotOffset : statics)
+        return (CmmProc info lab (ListGraph (b' : tail blocks)) : gotOffset : statics)
 
 initializePicBase_ppc ArchPPC OSDarwin picReg
-	(CmmProc info lab params (ListGraph blocks) : statics)
-	= return (CmmProc info lab params (ListGraph (b':tail blocks)) : statics)
+	(CmmProc info lab (ListGraph blocks) : statics)
+	= return (CmmProc info lab (ListGraph (b':tail blocks)) : statics)
 
 	where 	BasicBlock bID insns = head blocks
           	b' = BasicBlock bID (PPC.FETCHPC picReg : insns)
@@ -766,15 +766,15 @@ initializePicBase_x86
 	-> NatM [NatCmmTop X86.Instr]
 
 initializePicBase_x86 ArchX86 os picReg 
-	(CmmProc info lab params (ListGraph blocks) : statics)
+	(CmmProc info lab (ListGraph blocks) : statics)
     | osElfTarget os
-    = return (CmmProc info lab params (ListGraph (b':tail blocks)) : statics)
+    = return (CmmProc info lab (ListGraph (b':tail blocks)) : statics)
     where BasicBlock bID insns = head blocks
           b' = BasicBlock bID (X86.FETCHGOT picReg : insns)
 
 initializePicBase_x86 ArchX86 OSDarwin picReg
-	(CmmProc info lab params (ListGraph blocks) : statics)
-	= return (CmmProc info lab params (ListGraph (b':tail blocks)) : statics)
+	(CmmProc info lab (ListGraph blocks) : statics)
+	= return (CmmProc info lab (ListGraph (b':tail blocks)) : statics)
 
 	where 	BasicBlock bID insns = head blocks
           	b' = BasicBlock bID (X86.FETCHPC picReg : insns)