X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FCodeOutput.lhs;h=0e520770602a58b404221d288a92900f5c9a6d3d;hb=2eb04ca0f8d0ec72b417cddc60672c696b4a3daa;hp=30f273ebaafc1879063f622cbea65b62b1cc56d1;hpb=61d2625ae2e6a4cdae2ffc92df828905e81c24cc;p=ghc-hetmet.git

diff --git a/compiler/main/CodeOutput.lhs b/compiler/main/CodeOutput.lhs
index 30f273e..0e52077 100644
--- a/compiler/main/CodeOutput.lhs
+++ b/compiler/main/CodeOutput.lhs
@@ -13,10 +13,6 @@ import UniqSupply	( mkSplitUniqSupply )
 import AsmCodeGen	( nativeCodeGen )
 #endif
 
-#ifdef ILX
-import IlxGen		( ilxGen )
-#endif
-
 #ifdef JAVA
 import JavaGen		( javaGen )
 import qualified PrintJava
@@ -33,6 +29,7 @@ import FastString	( unpackFS )
 import Cmm		( Cmm )
 import HscTypes
 import DynFlags
+
 import ErrUtils		( dumpIfSet_dyn, showPass, ghcExit )
 import Outputable
 import Pretty		( Mode(..), printDoc )
@@ -94,13 +91,6 @@ codeOutput dflags this_mod location foreign_stubs pkg_deps flat_abstractC
 #else
                                panic "Java support not compiled into this ghc";
 #endif
-	     HscILX         -> 
-#ifdef ILX
-			       let tycons = typeEnvTyCons type_env in
-	                       outputIlx dflags filenm mod_name tycons stg_binds;
-#else
-                               panic "ILX support not compiled into this ghc";
-#endif
 	  }
 	; return stubs_exist
 	}
@@ -126,7 +116,7 @@ outputC dflags filenm mod location flat_absC
        --   * -#include options from the cmdline and OPTIONS pragmas
        --   * the _stub.h file, if there is one.
        --
-       pkg_configs <- getExplicitPackagesAnd dflags packages
+       pkg_configs <- getPreloadPackagesAnd dflags packages
        let pkg_names = map (showPackageId.package) pkg_configs
 
        c_includes <- getPackageCIncludes pkg_configs
@@ -142,7 +132,7 @@ outputC dflags filenm mod location flat_absC
            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 
@@ -211,22 +201,6 @@ outputJava dflags filenm mod tycons core_binds
 
 %************************************************************************
 %*									*
-\subsection{Ilx}
-%*									*
-%************************************************************************
-
-\begin{code}
-#ifdef ILX
-outputIlx dflags filename mod tycons stg_binds
-  =  doOutput filename (\ f -> printForC f pp_ilx)
-  where
-    pp_ilx = ilxGen mod tycons stg_binds
-#endif
-\end{code}
-
-
-%************************************************************************
-%*									*
 \subsection{Foreign import/export}
 %*									*
 %************************************************************************