X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fghc.mk;h=2daf6832f03da5d5e777e267341a1d9222832858;hp=5b59bbefb743d81c6a9b6a73eab2b02e9de54b52;hb=24a3fee9f3ff6cef6fe471ab6f0a7ba9ac001faf;hpb=0ef6ba7b28187a4bf5309f9702eeaf53a281204b diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 5b59bbe..2daf683 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -17,7 +17,7 @@ define compiler-hs-dependency # args: $1 = module, $2 = dependency $$(foreach stage,1 2 3,\ $$(foreach way,$$(compiler_stage$$(stage)_WAYS),\ - compiler/stage$$(stage)/build/$1.$($(way)_osuf))) : $2 + compiler/stage$$(stage)/build/$1.$$($$(way)_osuf))) : $2 endef @@ -29,13 +29,21 @@ endef compiler_CONFIG_HS = compiler/main/Config.hs +# This is just to avoid generating a warning when generating deps +# involving RtsFlags.h +compiler_stage1_MKDEPENDC_OPTS = -DMAKING_GHC_BUILD_SYSTEM_DEPENDENCIES +compiler_stage2_MKDEPENDC_OPTS = -DMAKING_GHC_BUILD_SYSTEM_DEPENDENCIES +compiler_stage3_MKDEPENDC_OPTS = -DMAKING_GHC_BUILD_SYSTEM_DEPENDENCIES + +compiler_stage1_C_FILES_NODEPS = compiler/parser/cutils.c + ifneq "$(BINDIST)" "YES" compiler/stage1/package-data.mk : $(compiler_CONFIG_HS) compiler/stage2/package-data.mk : $(compiler_CONFIG_HS) compiler/stage3/package-data.mk : $(compiler_CONFIG_HS) endif -$(compiler_CONFIG_HS) : mk/config.mk +$(compiler_CONFIG_HS) : mk/config.mk mk/project.mk "$(RM)" $(RM_OPTS) $@ @echo "Creating $@ ... " @echo "module Config where" >>$@ @@ -51,14 +59,16 @@ $(compiler_CONFIG_HS) : mk/config.mk @echo "cBooterVersion = \"$(GhcVersion)\"" >> $@ @echo "cStage :: String" >> $@ @echo "cStage = show (STAGE :: Int)" >> $@ - @echo "cHscIfaceFileVersion :: String" >> $@ - @echo "cHscIfaceFileVersion = \"$(HscIfaceFileVersion)\"" >> $@ + @echo "cIntegerLibrary :: String" >> $@ + @echo "cIntegerLibrary = \"$(INTEGER_LIBRARY)\"" >> $@ @echo "cSplitObjs :: String" >> $@ @echo "cSplitObjs = \"$(SupportsSplitObjs)\"" >> $@ @echo "cGhcWithInterpreter :: String" >> $@ @echo "cGhcWithInterpreter = \"$(GhcWithInterpreter)\"" >> $@ @echo "cGhcWithNativeCodeGen :: String" >> $@ @echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $@ + @echo "cGhcWithLlvmCodeGen :: String" >> $@ + @echo "cGhcWithLlvmCodeGen = \"YES\"" >> $@ @echo "cGhcWithSMP :: String" >> $@ @echo "cGhcWithSMP = \"$(GhcWithSMP)\"" >> $@ @echo "cGhcRTSWays :: String" >> $@ @@ -77,42 +87,32 @@ $(compiler_CONFIG_HS) : mk/config.mk @echo "cMKDLL = \"$(BLD_DLL)\"" >> $@ @echo "cLdIsGNULd :: String" >> $@ @echo "cLdIsGNULd = \"$(LdIsGNULd)\"" >> $@ - @echo "cLD_X :: String" >> $@ - @echo "cLD_X = \"$(LD_X)\"" >> $@ - @echo "cGHC_DRIVER_DIR :: String" >> $@ - @echo "cGHC_DRIVER_DIR = \"$(GHC_DRIVER_DIR)\"" >> $@ + @echo "cLD_X :: String" >> $@ + @echo "cLD_X = \"$(LD_X)\"" >> $@ + @echo "cGHC_DRIVER_DIR :: String" >> $@ + @echo "cGHC_DRIVER_DIR = \"$(GHC_DRIVER_DIR)\"" >> $@ @echo "cGHC_TOUCHY_PGM :: String" >> $@ @echo "cGHC_TOUCHY_PGM = \"$(GHC_TOUCHY_PGM)\"" >> $@ - @echo "cGHC_TOUCHY_DIR :: String" >> $@ - @echo "cGHC_TOUCHY_DIR = \"$(GHC_TOUCHY_DIR)\"" >> $@ + @echo "cGHC_TOUCHY_DIR :: String" >> $@ + @echo "cGHC_TOUCHY_DIR = \"$(GHC_TOUCHY_DIR)\"" >> $@ @echo "cGHC_UNLIT_PGM :: String" >> $@ @echo "cGHC_UNLIT_PGM = \"$(GHC_UNLIT_PGM)\"" >> $@ - @echo "cGHC_UNLIT_DIR :: String" >> $@ - @echo "cGHC_UNLIT_DIR = \"$(GHC_UNLIT_DIR)\"" >> $@ + @echo "cGHC_UNLIT_DIR :: String" >> $@ + @echo "cGHC_UNLIT_DIR = \"$(GHC_UNLIT_DIR)\"" >> $@ @echo "cGHC_MANGLER_PGM :: String" >> $@ @echo "cGHC_MANGLER_PGM = \"$(GHC_MANGLER_PGM)\"" >> $@ - @echo "cGHC_MANGLER_DIR :: String" >> $@ - @echo "cGHC_MANGLER_DIR = \"$(GHC_MANGLER_DIR)\"" >> $@ + @echo "cGHC_MANGLER_DIR :: String" >> $@ + @echo "cGHC_MANGLER_DIR = \"$(GHC_MANGLER_DIR)\"" >> $@ @echo "cGHC_SPLIT_PGM :: String" >> $@ @echo "cGHC_SPLIT_PGM = \"$(GHC_SPLIT_PGM)\"" >> $@ - @echo "cGHC_SPLIT_DIR :: String" >> $@ - @echo "cGHC_SPLIT_DIR = \"$(GHC_SPLIT_DIR)\"" >> $@ + @echo "cGHC_SPLIT_DIR :: String" >> $@ + @echo "cGHC_SPLIT_DIR = \"$(GHC_SPLIT_DIR)\"" >> $@ @echo "cGHC_SYSMAN_PGM :: String" >> $@ @echo "cGHC_SYSMAN_PGM = \"$(GHC_SYSMAN)\"" >> $@ - @echo "cGHC_SYSMAN_DIR :: String" >> $@ - @echo "cGHC_SYSMAN_DIR = \"$(GHC_SYSMAN_DIR)\"" >> $@ - @echo "cGHC_CP :: String" >> $@ - @echo "cGHC_CP = \"$(GHC_CP)\"" >> $@ + @echo "cGHC_SYSMAN_DIR :: String" >> $@ + @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" >> $@ @@ -141,8 +141,7 @@ $(eval $(call clean-target,compiler,config_hs,$(compiler_CONFIG_HS))) PLATFORM_H = ghc_boot_platform.h -compiler/stage1/$(PLATFORM_H) : mk/config.mk - "$(MKDIRHIER)" $(dir $@) +compiler/stage1/$(PLATFORM_H) : mk/config.mk mk/project.mk | $$(dir $$@)/. "$(RM)" $(RM_OPTS) $@ @echo "Creating $@..." @echo "#ifndef __PLATFORM_H__" >$@ @@ -188,8 +187,7 @@ endif # For stage2 and above, the BUILD platform is the HOST of stage1, and # the HOST platform is the TARGET of stage1. The TARGET remains the same # (stage1 is the cross-compiler, not stage2). -compiler/stage2/$(PLATFORM_H) : mk/config.mk - "$(MKDIRHIER)" $(dir $@) +compiler/stage2/$(PLATFORM_H) : mk/config.mk mk/project.mk | $$(dir $$@)/. "$(RM)" $(RM_OPTS) $@ @echo "Creating $@..." @echo "#ifndef __PLATFORM_H__" >$@ @@ -235,9 +233,6 @@ endif compiler/stage3/$(PLATFORM_H) : compiler/stage2/$(PLATFORM_H) "$(CP)" $< $@ -# Every Constants.o object file depends on includes/GHCConstants.h: -$(eval $(call compiler-hs-dependency,Constants,$(includes_GHCCONSTANTS))) - # ---------------------------------------------------------------------------- # Generate supporting stuff for prelude/PrimOp.lhs # from prelude/primops.txt @@ -262,6 +257,7 @@ $(PRIMOPS_TXT) compiler/parser/Parser.y: %: %.pp compiler/stage1/$(PLATFORM_H) $(eval $(call clean-target,compiler,primop, $(PRIMOPS_TXT) compiler/parser/Parser.y $(PRIMOP_BITS))) +ifneq "$(BootingFromHc)" "YES" compiler/primop-data-decl.hs-incl: $(PRIMOPS_TXT) $(GENPRIMOP_INPLACE) "$(GENPRIMOP_INPLACE)" --data-decl < $< > $@ compiler/primop-tag.hs-incl: $(PRIMOPS_TXT) $(GENPRIMOP_INPLACE) @@ -283,13 +279,11 @@ compiler/primop-strictness.hs-incl: $(PRIMOPS_TXT) $(GENPRIMOP_INPLACE) compiler/primop-primop-info.hs-incl: $(PRIMOPS_TXT) $(GENPRIMOP_INPLACE) "$(GENPRIMOP_INPLACE)" --primop-primop-info < $< > $@ -# Every PrimOp.o object file depends on $(PRIMOP_BITS): -$(eval $(call compiler-hs-dependency,PrimOp,$(PRIMOP_BITS))) - # Usages aren't used any more; but the generator # can still generate them if we want them back compiler/primop-usage.hs-incl: $(PRIMOPS_TXT) "$(GENPRIMOP_INPLACE)" --usage < $< > $@ +endif # ----------------------------------------------------------------------------- # Configuration @@ -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 @@ -370,30 +366,30 @@ ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" # The #include is vital for the via-C route with older compilers, else the C # compiler doesn't realise that the stcall foreign imports are indeed # stdcall, and doesn't generate the Foo@8 name for them -# As it's only important for older compilers we don't need to do anything -# for stage2+. +# It's only important for older compilers, and in fact newer compilers +# will give a warning if the -#include flag is used. We therefore only +# do it for stage1, and only for < 6.11. +ifeq "$(ghc_ge_611)" "NO" compiler_stage1_CONFIGURE_OPTS += --ghc-option='-\#include' \ --ghc-option='""' \ --ghc-option='-\#include' \ --ghc-option='""' endif +endif # ghc_strlen percolates through so many modules that it is easier to get its # prototype via a global option instead of a myriad of per-file OPTIONS. -# Again, this is only important for older compilers, so we don't do it in -# stage 2+. +# Again, this is only done for older compilers. +ifeq "$(ghc_ge_611)" "NO" compiler_stage1_CONFIGURE_OPTS += --ghc-options='-\#include "cutils.h"' +endif compiler_stage3_CONFIGURE_OPTS := $(compiler_stage2_CONFIGURE_OPTS) compiler_stage1_CONFIGURE_OPTS += --ghc-option=-DSTAGE=1 compiler_stage2_CONFIGURE_OPTS += --ghc-option=-DSTAGE=2 compiler_stage3_CONFIGURE_OPTS += --ghc-option=-DSTAGE=3 -compiler_stage2_HADDOCK_OPTS += --haddock-option=--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_stage2_HADDOCK_OPTS += --optghc=-DSTAGE=2 compiler/stage1/package-data.mk : compiler/ghc.mk compiler/stage2/package-data.mk : compiler/ghc.mk @@ -415,10 +411,22 @@ compiler_PACKAGE = ghc # Note: we also have to tweak the version number of the package itself # when it gets registered; see Note [munge-stage1-package-config] # below. -ifneq "$(ProjectPatchLevel)" "0" +# The ProjectPatchLevel > 20000000 iff it's a date. If it's e.g. 6.12.1 +# then we don't want to remove it +ifneq "$(CLEANING)" "YES" +ifeq "$(shell [ $(ProjectPatchLevel) -gt 20000000 ] && echo YES)" "YES" +compiler_stage1_VERSION_MUNGED = YES +endif +endif + +ifeq "$(compiler_stage1_VERSION_MUNGED)" "YES" define compiler_PACKAGE_MAGIC compiler_stage1_VERSION = $(subst .$(ProjectPatchLevel),,$(ProjectVersion)) endef + +# Don't register the non-munged package +compiler_stage1_REGISTER_PACKAGE = NO + endif # haddocking only happens for stage2 @@ -431,39 +439,65 @@ 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_stage1_depfile) : compiler/stage1/$(PLATFORM_H) -$(compiler_stage2_depfile) : compiler/stage2/$(PLATFORM_H) -$(compiler_stage3_depfile) : compiler/stage3/$(PLATFORM_H) +compiler_stage2_TAGS_HC_OPTS = -package ghc +$(eval $(call tags-package,compiler,stage2)) -$(compiler_stage1_depfile) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(includes_GHCCONSTANTS) $(includes_DERIVEDCONSTANTS) $(PRIMOP_BITS) -$(compiler_stage2_depfile) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(includes_GHCCONSTANTS) $(includes_DERIVEDCONSTANTS) $(PRIMOP_BITS) -$(compiler_stage3_depfile) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(includes_GHCCONSTANTS) $(includes_DERIVEDCONSTANTS) $(PRIMOP_BITS) +$(compiler_stage1_depfile_haskell) : compiler/stage1/$(PLATFORM_H) +$(compiler_stage2_depfile_haskell) : compiler/stage2/$(PLATFORM_H) +$(compiler_stage3_depfile_haskell) : compiler/stage3/$(PLATFORM_H) + +$(compiler_stage1_depfile_haskell) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(includes_GHCCONSTANTS) $(includes_DERIVEDCONSTANTS) $(PRIMOP_BITS) +$(compiler_stage2_depfile_haskell) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(includes_GHCCONSTANTS) $(includes_DERIVEDCONSTANTS) $(PRIMOP_BITS) +$(compiler_stage3_depfile_haskell) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(includes_GHCCONSTANTS) $(includes_DERIVEDCONSTANTS) $(PRIMOP_BITS) + +# Every Constants.o object file depends on includes/GHCConstants.h: +$(eval $(call compiler-hs-dependency,Constants,$(includes_GHCCONSTANTS) includes/HaskellConstants.hs)) + +# Every PrimOp.o object file depends on $(PRIMOP_BITS): +$(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/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. -ifneq "$(ProjectPatchLevel)" "0" +ifeq "$(compiler_stage1_VERSION_MUNGED)" "YES" compiler/stage1/inplace-pkg-config-munged: compiler/stage1/inplace-pkg-config sed -e 's/^\(version: .*\)\.$(ProjectPatchLevel)$$/\1/' \ + -e 's/^\(id: .*\)\.$(ProjectPatchLevel)$$/\1/' \ -e 's/^\(hs-libraries: HSghc-.*\)\.$(ProjectPatchLevel)$$/\1/' \ < $< > $@ "$(compiler_stage1_GHC_PKG)" update --force $(compiler_stage1_GHC_PKG_OPTS) $@