X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=compiler%2Fghc.mk;h=3c8c95f9c35bf97e88e448d348699de6407acd17;hb=615d88d1912a81ca3bef44010285424f6c454449;hp=7153dfe1adb495c54699ad2755571ea4ef67e702;hpb=a998343dfabe92da17b2f60c78968eff2f444050;p=ghc-hetmet.git

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 7153dfe..3c8c95f 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -43,12 +43,6 @@ compiler/stage2/package-data.mk : $(compiler_CONFIG_HS)
 compiler/stage3/package-data.mk : $(compiler_CONFIG_HS)
 endif
 
-ifeq "$(GhcEnableTablesNextToCode)" "NO"
-GhcWithLlvmCodeGen = YES
-else
-GhcWithLlvmCodeGen = NO
-endif
-
 $(compiler_CONFIG_HS) : mk/config.mk mk/project.mk
 	"$(RM)" $(RM_OPTS) $@
 	@echo "Creating $@ ... "
@@ -74,7 +68,7 @@ $(compiler_CONFIG_HS) : mk/config.mk mk/project.mk
 	@echo "cGhcWithNativeCodeGen :: String" >> $@
 	@echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $@
 	@echo "cGhcWithLlvmCodeGen   :: String" >> $@
-	@echo "cGhcWithLlvmCodeGen   = \"$(GhcWithLlvmCodeGen)\"" >> $@
+	@echo "cGhcWithLlvmCodeGen   = \"YES\"" >> $@
 	@echo "cGhcWithSMP           :: String" >> $@
 	@echo "cGhcWithSMP           = \"$(GhcWithSMP)\"" >> $@
 	@echo "cGhcRTSWays           :: String" >> $@
@@ -321,7 +315,7 @@ ifeq "$(GhcEnableTablesNextToCode) $(GhcUnregisterised)" "YES NO"
 # or not?
 # XXX This should logically be a CPP option, but there doesn't seem to
 # be a flag for that
-compiler_CONFIGURE_OPTS += --ghc-option=-DGHCI_TABLES_NEXT_TO_CODE
+compiler_stage2_CONFIGURE_OPTS += --ghc-option=-DGHCI_TABLES_NEXT_TO_CODE
 endif
 
 # Should the debugger commands be enabled?
@@ -342,10 +336,6 @@ compiler_CONFIGURE_OPTS += --ld-options=-E
 endif
 
 ifeq "$(GhcUnregisterised)" "NO"
-ifeq "$(HOSTPLATFORM)" "ia64-unknown-linux"
-# needed for generating proper relocation in large binaries: trac #856
-compiler_CONFIGURE_OPTS += --ld-option=-Wl,--relax
-endif
 else
 compiler_CONFIGURE_OPTS += --ghc-option=-DNO_REGS
 endif