summaryrefslogtreecommitdiff
path: root/compiler/main/CodeOutput.lhs
diff options
context:
space:
mode:
authorDavid Terei <davidterei@gmail.com>2010-06-18 09:32:05 +0000
committerDavid Terei <davidterei@gmail.com>2010-06-18 09:32:05 +0000
commit24a3fee9f3ff6cef6fe471ab6f0a7ba9ac001faf (patch)
treefe36d4be479d7b798cb89bb4115460d3dbcf337d /compiler/main/CodeOutput.lhs
parent1d8585bc1160be0c21c34d1f9d9c62e22b3948a8 (diff)
downloadhaskell-24a3fee9f3ff6cef6fe471ab6f0a7ba9ac001faf.tar.gz
Add support of TNTC to llvm backend
We do this through a gnu as feature called subsections, where you can put data/code into a numbered subsection and those subsections will be joined together in descending order by gas at compile time.
Diffstat (limited to 'compiler/main/CodeOutput.lhs')
-rw-r--r--compiler/main/CodeOutput.lhs16
1 files changed, 2 insertions, 14 deletions
diff --git a/compiler/main/CodeOutput.lhs b/compiler/main/CodeOutput.lhs
index 40f4f11a81..bc2dd1eafc 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}