X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fmain%2FCodeOutput.lhs;h=bc2dd1eafc5d225bd3a4584b1c6f7471efdd08e8;hp=40f4f11a818d286b55487d0637fda98612b6a7d2;hb=24a3fee9f3ff6cef6fe471ab6f0a7ba9ac001faf;hpb=1d8585bc1160be0c21c34d1f9d9c62e22b3948a8

diff --git a/compiler/main/CodeOutput.lhs b/compiler/main/CodeOutput.lhs
index 40f4f11..bc2dd1e 100644
--- a/compiler/main/CodeOutput.lhs
+++ b/compiler/main/CodeOutput.lhs
@@ -11,11 +11,9 @@ module CodeOutput( codeOutput, outputForeignStubs ) where
 #ifndef OMIT_NATIVE_CODEGEN
 import AsmCodeGen	( nativeCodeGen )
 #endif
+import LlvmCodeGen ( llvmCodeGen )
 
 import UniqSupply	( mkSplitUniqSupply )
-#ifndef GHCI_TABLES_NEXT_TO_CODE
-import qualified LlvmCodeGen ( llvmCodeGen )
-#endif
 
 #ifdef JAVA
 import JavaGen		( javaGen )
@@ -179,19 +177,9 @@ outputAsm _ _ _
 
 \begin{code}
 outputLlvm :: DynFlags -> FilePath -> [RawCmm] -> IO ()
-
-#ifndef GHCI_TABLES_NEXT_TO_CODE
 outputLlvm dflags filenm flat_absC
   = do ncg_uniqs <- mkSplitUniqSupply 'n'
-       doOutput filenm $ \f -> 
-	         LlvmCodeGen.llvmCodeGen dflags f ncg_uniqs flat_absC
-#else
-outputLlvm _ _ _
-  = pprPanic "This compiler was built with the LLVM backend disabled"
-	     (text ("This is because the TABLES_NEXT_TO_CODE optimisation is"
-         ++ " enabled, which the LLVM backend doesn't support right now.")
-         $+$ text "Use -fasm instead")
-#endif
+       doOutput filenm $ \f -> llvmCodeGen dflags f ncg_uniqs flat_absC
 \end{code}