X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=8324e8b03c470513a1157f225d92e1eba25e0186;hb=153b9cb9b11e05c4edb1b6bc0a7b972660e41f70;hp=12e50eb711652fba7fa76490c38424afd154e968;hpb=ab3a88f2dc64677df8fb92dacef47570ac3c5023;p=ghc-hetmet.git diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index 12e50eb..8324e8b 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -86,6 +86,10 @@ WAYS=$(GhcCompilerWays) # - create a link tree. The problem with requiring link trees is that # Windows doesn't support symbolic links. +ifeq "$(stage)" "" +stage=1 +endif + boot :: $(MKDIRHIER) stage$(stage) for i in $(ALL_DIRS); do \ @@ -100,6 +104,8 @@ boot :: # PS: 'ln -s foo baz' takes 'foo' relative to the path to 'baz' # whereas 'cp foo baz' treats the two paths independently. # Hence the "../.." in the ln command line +ifeq "$(stage)" "1" +ifeq "$(ghc_ge_603)" "NO" ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" for i in */*hi-boot*; do \ cp -u -f $$i stage$(stage)/$$i; \ @@ -109,9 +115,7 @@ else $(LN_S) -f ../../$$i stage$(stage)/$$i || true ; \ done endif - -ifeq "$(stage)" "" -stage=1 +endif endif ifeq "$(stage)" "1" @@ -190,10 +194,6 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile @echo "cProjectPatchLevel = \"$(ProjectPatchLevel)\"" >> $(CONFIG_HS) @echo "cBooterVersion = \"$(GhcVersion)\"" >> $(CONFIG_HS) @echo "cHscIfaceFileVersion = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS) - @echo "cHOSTPLATFORM = \"$(HOSTPLATFORM)\"" >> $(CONFIG_HS) - @echo "cTARGETPLATFORM = \"$(TARGETPLATFORM)\"" >> $(CONFIG_HS) - @echo "cTARGETOS = \"$(TargetOS_CPP)\"" >> $(CONFIG_HS) - @echo "cTARGETARCH = \"$(TargetArch_CPP)\"" >> $(CONFIG_HS) @echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $(CONFIG_HS) @echo "cGhcUnregisterised = \"$(GhcUnregisterised)\"" >> $(CONFIG_HS) @echo "cLeadingUnderscore = \"$(LeadingUnderscore)\"" >> $(CONFIG_HS) @@ -228,6 +228,112 @@ endif CLEAN_FILES += $(CONFIG_HS) # ----------------------------------------------------------------------------- +# Create platform includes + +# Here we generate a little header file containing CPP symbols that GHC +# uses to determine which platform it is building on/for. The platforms +# can differ between stage1 and stage2 if we're cross-compiling, so we +# need one of these header files per stage. + +PLATFORM_H = ghc_boot_platform.h + +stage1/$(PLATFORM_H) : $(FPTOOLS_TOP)/mk/config.mk Makefile + @echo "Creating $@..." + @$(RM) $@ + @echo "#ifndef __PLATFORM_H__" >$@ + @echo "#define __PLATFORM_H__" >>$@ + @echo >> $@ + @echo "#define BuildPlatform_TYPE $(BuildPlatform_CPP)" >> $@ + @echo "#define HostPlatform_TYPE $(HostPlatform_CPP)" >> $@ + @echo "#define TargetPlatform_TYPE $(TargetPlatform_CPP)" >> $@ + @echo >> $@ + @echo "#define $(BuildPlatform_CPP)_BUILD 1" >> $@ + @echo "#define $(HostPlatform_CPP)_HOST 1" >> $@ + @echo "#define $(TargetPlatform_CPP)_TARGET 1" >> $@ + @echo >> $@ + @echo "#define $(BuildArch_CPP)_BUILD_ARCH 1" >> $@ + @echo "#define $(HostArch_CPP)_HOST_ARCH 1" >> $@ + @echo "#define $(TargetArch_CPP)_TARGET_ARCH 1" >> $@ + @echo "#define BUILD_ARCH \"$(BuildArch_CPP)\"" >> $@ + @echo "#define HOST_ARCH \"$(HostArch_CPP)\"" >> $@ + @echo "#define TARGET_ARCH \"$(TargetArch_CPP)\"" >> $@ + @echo >> $@ + @echo "#define $(BuildOS_CPP)_BUILD_OS 1" >> $@ + @echo "#define $(HostOS_CPP)_HOST_OS 1" >> $@ + @echo "#define $(TargetOS_CPP)_TARGET_OS 1" >> $@ + @echo "#define BUILD_OS \"$(BuildOS_CPP)\"" >> $@ + @echo "#define HOST_OS \"$(HostOS_CPP)\"" >> $@ + @echo "#define TARGET_OS \"$(TargetOS_CPP)\"" >> $@ +ifeq "$(HostOS_CPP)" "irix" + @echo "#ifndef $(IRIX_MAJOR)_TARGET_OS " >> $@ + @echo "#define $(IRIX_MAJOR)_TARGET_OS 1" >> $@ + @echo "#endif " >> $@ +endif + @echo >> $@ + @echo "#define $(BuildVendor_CPP)_BUILD_VENDOR 1" >> $@ + @echo "#define $(HostVendor_CPP)_HOST_VENDOR 1" >> $@ + @echo "#define $(TargetVendor_CPP)_TARGET_VENDOR 1" >> $@ + @echo "#define BUILD_VENDOR \"$(BuildVendor_CPP)\"" >> $@ + @echo "#define HOST_VENDOR \"$(HostVendor_CPP)\"" >> $@ + @echo "#define TARGET_VENDOR \"$(TargetVendor_CPP)\"" >> $@ + @echo >> $@ + @echo "#endif /* __PLATFORM_H__ */" >> $@ + @echo "Done." + +# 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). +stage2/$(PLATFORM_H) : $(FPTOOLS_TOP)/mk/config.mk Makefile + @echo "Creating $@..." + @$(RM) $@ + @echo "#ifndef __PLATFORM_H__" >$@ + @echo "#define __PLATFORM_H__" >>$@ + @echo >> $@ + @echo "#define BuildPlatform_TYPE $(HostPlatform_CPP)" >> $@ + @echo "#define HostPlatform_TYPE $(TargetPlatform_CPP)" >> $@ + @echo "#define TargetPlatform_TYPE $(TargetPlatform_CPP)" >> $@ + @echo >> $@ + @echo "#define $(HostPlatform_CPP)_BUILD 1" >> $@ + @echo "#define $(TargetPlatform_CPP)_HOST 1" >> $@ + @echo "#define $(TargetPlatform_CPP)_TARGET 1" >> $@ + @echo >> $@ + @echo "#define $(HostArch_CPP)_BUILD_ARCH 1" >> $@ + @echo "#define $(TargetArch_CPP)_HOST_ARCH 1" >> $@ + @echo "#define $(TargetArch_CPP)_TARGET_ARCH 1" >> $@ + @echo "#define BUILD_ARCH \"$(HostArch_CPP)\"" >> $@ + @echo "#define HOST_ARCH \"$(TargetArch_CPP)\"" >> $@ + @echo "#define TARGET_ARCH \"$(TargetArch_CPP)\"" >> $@ + @echo >> $@ + @echo "#define $(HostOS_CPP)_BUILD_OS 1" >> $@ + @echo "#define $(TargetOS_CPP)_HOST_OS 1" >> $@ + @echo "#define $(TargetOS_CPP)_TARGET_OS 1" >> $@ + @echo "#define BUILD_OS \"$(HostOS_CPP)\"" >> $@ + @echo "#define HOST_OS \"$(TargetOS_CPP)\"" >> $@ + @echo "#define TARGET_OS \"$(TargetOS_CPP)\"" >> $@ +ifeq "$(HostOS_CPP)" "irix" + @echo "#ifndef $(IRIX_MAJOR)_TARGET_OS " >> $@ + @echo "#define $(IRIX_MAJOR)_TARGET_OS 1" >> $@ + @echo "#endif " >> $@ +endif + @echo >> $@ + @echo "#define $(HostVendor_CPP)_BUILD_VENDOR 1" >> $@ + @echo "#define $(TargetVendor_CPP)_HOST_VENDOR 1" >> $@ + @echo "#define $(TargetVendor_CPP)_TARGET_VENDOR 1" >> $@ + @echo "#define BUILD_VENDOR \"$(HostVendor_CPP)\"" >> $@ + @echo "#define HOST_VENDOR \"$(TargetVendor_CPP)\"" >> $@ + @echo "#define TARGET_VENDOR \"$(TargetVendor_CPP)\"" >> $@ + @echo >> $@ + @echo "#endif /* __PLATFORM_H__ */" >> $@ + @echo "Done." + +stage3/$(PLATFORM_H) : stage2/$(PLATFORM_H) + $(CP) stage2/$(PLATFORM_H) stage3/$(PLATFORM_H) + +boot :: stage$(stage)/$(PLATFORM_H) + +SRC_HC_OPTS += -Istage$(stage) + +# ----------------------------------------------------------------------------- # Set SRCS etc. # # First figure out ALL_DIRS, the source sub-directories @@ -262,14 +368,11 @@ endif ifeq "$(BootingFromHc)" "YES" # HC files are always from a self-booted compiler bootstrapped = YES -compiling_with_4xx=NO else ifneq "$(findstring $(stage), 2 3)" "" bootstrapped = YES -compiling_with_4xx = NO else bootstrapped = $(shell if (test $(GhcCanonVersion) -ge $(ProjectVersionInt) -a $(GhcPatchLevel) -ge $(ProjectPatchLevel)); then echo YES; else echo NO; fi) -compiling_with_4xx = $(shell if (test $(GhcCanonVersion) -lt 500); then echo YES; else echo NO; fi) endif endif @@ -317,6 +420,10 @@ EXCLUDED_SRCS += deSugar/DsMeta.hs typecheck/TcSplice.lhs hsSyn/Convert.lhs endif # bootstrapped with interpreter +ifeq "$(bootstrapped)" "YES" +SRC_HC_OPTS += -package Cabal +endif + # ----------------------------------------------- # mkdependC stuff # @@ -403,11 +510,6 @@ ifeq "$(bootstrapped)" "YES" utils/Binary_HC_OPTS = -funbox-strict-fields endif -# 4.08.2's NCG can't cope with Binary -ifeq "$(compiling_with_4xx)" "YES" -utils/Binary_HC_OPTS += -fvia-C -endif - # ByteCodeItbls uses primops that the NCG doesn't support yet. ghci/ByteCodeItbls_HC_OPTS += -fvia-C ghci/ByteCodeLink_HC_OPTS += -fvia-C -monly-3-regs @@ -522,10 +624,17 @@ endif # from mkDependHS. SRC_MKDEPENDHS_OPTS += \ -optdep--exclude-module=Compat.RawSystem \ - -optdep--exclude-module=Data.Version \ - -optdep--exclude-module=Distribution.Package \ + -optdep--exclude-module=Compat.Directory \ + -optdep--exclude-module=Distribution.Compat.ReadP \ + -optdep--exclude-module=Distribution.Extension \ + -optdep--exclude-module=Distribution.GetOpt \ -optdep--exclude-module=Distribution.InstalledPackageInfo \ - -optdep--exclude-module=Distribution.Package + -optdep--exclude-module=Distribution.License \ + -optdep--exclude-module=Distribution.Package \ + -optdep--exclude-module=Distribution.ParseUtils \ + -optdep--exclude-module=Distribution.Setup \ + -optdep--exclude-module=Distribution.Version \ + -optdep--exclude-module=System.Directory.Internals endif SRC_LD_OPTS += -no-link-chk