X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FCodeOutput.lhs;h=25a10f6fe579dceb8f8099d03bddf91cb07b3cc5;hb=99794f66b568709176dd9fc2248a57a21a165556;hp=a66a836c67f7e8856a9b523c4867582d1b4b66d2;hpb=fb38b8bab2b531ca7ac4ea28ad5b259a00e3759b;p=ghc-hetmet.git

diff --git a/compiler/main/CodeOutput.lhs b/compiler/main/CodeOutput.lhs
index a66a836..25a10f6 100644
--- a/compiler/main/CodeOutput.lhs
+++ b/compiler/main/CodeOutput.lhs
@@ -26,9 +26,10 @@ import Packages
 import PackageConfig	( rtsPackageId )
 import Util
 import FastString	( unpackFS )
-import Cmm		( Cmm )
+import Cmm		( RawCmm )
 import HscTypes
 import DynFlags
+
 import ErrUtils		( dumpIfSet_dyn, showPass, ghcExit )
 import Outputable
 import Pretty		( Mode(..), printDoc )
@@ -54,7 +55,7 @@ codeOutput :: DynFlags
 	   -> ModLocation
 	   -> ForeignStubs
 	   -> [PackageId]
-	   -> [Cmm]			-- Compiled C--
+	   -> [RawCmm]			-- Compiled C--
 	   -> IO (Bool{-stub_h_exists-}, Bool{-stub_c_exists-})
 
 codeOutput dflags this_mod location foreign_stubs pkg_deps flat_abstractC
@@ -123,15 +124,15 @@ outputC dflags filenm mod location flat_absC
        
 	   ffi_decl_headers 
 	      = case foreign_stubs of
-		  NoStubs 		  -> []
-		  ForeignStubs _ _ fdhs _ -> map unpackFS (nub fdhs)
+		  NoStubs 		-> []
+		  ForeignStubs _ _ fdhs -> map unpackFS (nub fdhs)
 			-- Remove duplicates, because distinct foreign import decls
 			-- may cite the same #include.  Order doesn't matter.
 
            all_headers =  c_includes
 		       ++ reverse cmdline_includes
 		       ++ ffi_decl_headers
-
+                       
        let cc_injects = unlines (map mk_include all_headers)
        	   mk_include h_file = 
        	    case h_file of 
@@ -162,10 +163,10 @@ outputAsm dflags filenm flat_absC
 #ifndef OMIT_NATIVE_CODEGEN
 
   = do ncg_uniqs <- mkSplitUniqSupply 'n'
-       ncg_output_d <- _scc_ "NativeCodeGen" 
+       ncg_output_d <- {-# SCC "NativeCodeGen" #-}
 			  nativeCodeGen dflags flat_absC ncg_uniqs
        dumpIfSet_dyn dflags Opt_D_dump_asm "Asm code" (docToSDoc ncg_output_d)
-       _scc_ "OutputAsm" doOutput filenm $
+       {-# SCC "OutputAsm" #-} doOutput filenm $
 	   \f -> printDoc LeftMode f ncg_output_d
   where
 
@@ -216,7 +217,7 @@ outputForeignStubs dflags mod location stubs
 	stub_h_exists <- doesFileExist stub_h
 	return (stub_h_exists, stub_c_exists)
 
-  | ForeignStubs h_code c_code _ _ <- stubs
+  | ForeignStubs h_code c_code _ <- stubs
   = do
 	let
 	    stub_c_output_d = pprCode CStyle c_code