From 17ff3689c6926ffe029dad933d51d9fed20f1568 Mon Sep 17 00:00:00 2001 From: Matthias Kilian Date: Sun, 19 Dec 2010 18:02:39 +0000 Subject: [PATCH] Drop GhcWithLlvmCodeGen configuration bits The LLVM code generator is always built unconditionally, so both the configuration variable in mk/config.mk.in as well as the string in compilerInfo can be removed. --- compiler/ghc.mk | 2 -- compiler/main/DynFlags.hs | 1 - mk/config.mk.in | 3 --- 3 files changed, 6 deletions(-) diff --git a/compiler/ghc.mk b/compiler/ghc.mk index df07430..fb09a33 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -82,8 +82,6 @@ compiler/stage%/build/Config.hs : mk/config.mk mk/project.mk | $$(dir $$@)/. @echo 'cGhcWithInterpreter = "$(GhcWithInterpreter)"' >> $@ @echo 'cGhcWithNativeCodeGen :: String' >> $@ @echo 'cGhcWithNativeCodeGen = "$(GhcWithNativeCodeGen)"' >> $@ - @echo 'cGhcWithLlvmCodeGen :: String' >> $@ - @echo 'cGhcWithLlvmCodeGen = "YES"' >> $@ @echo 'cGhcWithSMP :: String' >> $@ @echo 'cGhcWithSMP = "$(GhcWithSMP)"' >> $@ @echo 'cGhcRTSWays :: String' >> $@ diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index ab755b0..220aa02 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -2286,7 +2286,6 @@ compilerInfo = [("Project name", String cProjectName), ("Have interpreter", String cGhcWithInterpreter), ("Object splitting", String cSplitObjs), ("Have native code generator", String cGhcWithNativeCodeGen), - ("Have llvm code generator", String cGhcWithLlvmCodeGen), ("Support SMP", String cGhcWithSMP), ("Unregisterised", String cGhcUnregisterised), ("Tables next to code", String cGhcEnableTablesNextToCode), diff --git a/mk/config.mk.in b/mk/config.mk.in index 902c0dc..7acf824 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -146,9 +146,6 @@ GhcWithNativeCodeGen=$(strip\ $(if $(filter YESYESNO,\ $(OsSupportsNCG)$(ArchSupportsNCG)$(GhcUnregisterised)),YES,NO)) -# Build a compiler with the llvm code generator backend -GhcWithLlvmCodeGen=NO - HaveLibDL = @HaveLibDL@ # ArchSupportsSMP should be set iff there is support for that arch in -- 1.7.10.4