X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghc.mk;h=2daf6832f03da5d5e777e267341a1d9222832858;hb=ecc60710f04cce34c121af1a17416c7140d364f2;hp=b9c8ae7f8c52ff0d99f723516591b44af8944139;hpb=e09e233ca81e4dfa5e2c648dd2ae6bafc3939d61;p=ghc-hetmet.git

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index b9c8ae7..2daf683 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -67,6 +67,8 @@ $(compiler_CONFIG_HS) : mk/config.mk mk/project.mk
 	@echo "cGhcWithInterpreter   = \"$(GhcWithInterpreter)\"" >> $@
 	@echo "cGhcWithNativeCodeGen :: String" >> $@
 	@echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $@
+	@echo "cGhcWithLlvmCodeGen   :: String" >> $@
+	@echo "cGhcWithLlvmCodeGen   = \"YES\"" >> $@
 	@echo "cGhcWithSMP           :: String" >> $@
 	@echo "cGhcWithSMP           = \"$(GhcWithSMP)\"" >> $@
 	@echo "cGhcRTSWays           :: String" >> $@
@@ -111,14 +113,6 @@ $(compiler_CONFIG_HS) : mk/config.mk mk/project.mk
 	@echo "cGHC_SYSMAN_DIR       = \"$(GHC_SYSMAN_DIR)\"" >> $@
 	@echo "cGHC_PERL             :: String" >> $@
 	@echo "cGHC_PERL             = \"$(GHC_PERL)\"" >> $@
-	@echo "cEnableWin32DLLs      :: String" >> $@
-	@echo "cEnableWin32DLLs      = \"$(EnableWin32DLLs)\"" >> $@
-	@echo "cCONTEXT_DIFF         :: String" >> $@
-	@echo "cCONTEXT_DIFF         = \"$(CONTEXT_DIFF)\"" >> $@
-	@echo "cUSER_WAY_NAMES       :: String" >> $@
-	@echo "cUSER_WAY_NAMES       = \"$(USER_WAY_NAMES)\"" >> $@
-	@echo "cUSER_WAY_OPTS        :: String" >> $@
-	@echo "cUSER_WAY_OPTS        = \"$(USER_WAY_OPTS)\"" >> $@
 	@echo "cDEFAULT_TMPDIR       :: String" >> $@
 	@echo "cDEFAULT_TMPDIR       = \"$(DEFAULT_TMPDIR)\"" >> $@
 	@echo "cRelocatableBuild     :: Bool"                 >> $@
@@ -346,6 +340,8 @@ 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
 
 # We need to turn on profiling either if we have been asked to
@@ -395,10 +391,6 @@ compiler_stage2_CONFIGURE_OPTS += --ghc-option=-DSTAGE=2
 compiler_stage3_CONFIGURE_OPTS += --ghc-option=-DSTAGE=3
 compiler_stage2_HADDOCK_OPTS += --optghc=-DSTAGE=2
 
-compiler_stage1_CONFIGURE_OPTS += --ghc-options='$(GhcStage1HcOpts)'
-compiler_stage2_CONFIGURE_OPTS += --ghc-options='$(GhcStage2HcOpts)'
-compiler_stage3_CONFIGURE_OPTS += --ghc-options='$(GhcStage3HcOpts)'
-
 compiler/stage1/package-data.mk : compiler/ghc.mk
 compiler/stage2/package-data.mk : compiler/ghc.mk
 compiler/stage3/package-data.mk : compiler/ghc.mk
@@ -447,24 +439,28 @@ compiler_stage1_SplitObjs = NO
 compiler_stage2_SplitObjs = NO
 compiler_stage3_SplitObjs = NO
 
-# For now, bindists always use stage 2
-ifneq "$(BINDIST)" "YES"
-# stage 1 is enabled unless $(stage) is set to something other than 1
-ifeq "$(filter-out 1,$(stage))" ""
-$(eval $(call build-package,compiler,stage1,0))
+# if stage is set to something other than "1" or "", disable stage 1
+ifneq "$(filter-out 1,$(stage))" ""
+compiler_stage1_NOT_NEEDED = YES
 endif
+# if stage is set to something other than "2" or "", disable stage 2
+ifneq "$(filter-out 2,$(stage))" ""
+compiler_stage2_NOT_NEEDED = YES
 endif
-
-# stage 2 is enabled unless $(stage) is set to something other than 2
-ifeq "$(filter-out 2,$(stage))" ""
-$(eval $(call build-package,compiler,stage2,1))
+# stage 3 has to be requested explicitly with stage=3
+ifneq "$(stage)" "3"
+compiler_stage3_NOT_NEEDED = YES
 endif
+$(eval $(call build-package,compiler,stage1,0))
+$(eval $(call build-package,compiler,stage2,1))
+$(eval $(call build-package,compiler,stage3,2))
+
+# after build-package, because that sets compiler_stage1_HC_OPTS:
+compiler_stage1_HC_OPTS += $(GhcStage1HcOpts)
+compiler_stage2_HC_OPTS += $(GhcStage2HcOpts)
+compiler_stage3_HC_OPTS += $(GhcStage3HcOpts)
 
 ifneq "$(BINDIST)" "YES"
-# stage 3 has to be requested explicitly with stage=3
-ifeq "$(stage)" "3"
-$(eval $(call build-package,compiler,stage3,2))
-endif
 
 compiler_stage2_TAGS_HC_OPTS = -package ghc
 $(eval $(call tags-package,compiler,stage2))
@@ -485,9 +481,16 @@ $(eval $(call compiler-hs-dependency,PrimOp,$(PRIMOP_BITS)))
 
 # GHC itself doesn't know about the above dependencies, so we have to
 # switch off the recompilation checker for those modules:
-compiler/prelude/PrimOps_HC_OPTS += -fforce-recomp
+compiler/prelude/PrimOp_HC_OPTS  += -fforce-recomp
 compiler/main/Constants_HC_OPTS  += -fforce-recomp
 
+# Workaround for #4003 in GHC 6.12.2.  It didn't happen in 6.12.1, and
+# will be fixed in 6.12.3.  Unfortunately we don't have a way to do
+# this for just stage1 in the build system.
+ifeq "$(GhcVersion)" "6.12.2"
+compiler/hsSyn/HsLit_HC_OPTS     += -fomit-interface-pragmas
+endif
+
 # Note [munge-stage1-package-config]
 # Strip the date/patchlevel from the version of stage1.  See Note
 # [fiddle-stage1-version] above.