X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=4f0d8c6bd51b5dde2db7524edf16e3e92d71806f;hb=24f3d678e8ce4f075023efb4be0d59efe000e446;hp=67320830786748e1fae1ca60543cb0b01daf0a4f;hpb=c872dd3e96aeacfeff2c7e4f3991aa28cd6d4734;p=ghc-hetmet.git diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index 6732083..4f0d8c6 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -86,11 +86,19 @@ WAYS=$(GhcCompilerWays) # - create a link tree. The problem with requiring link trees is that # Windows doesn't support symbolic links. -boot :: +ifeq "$(stage)" "" +stage=1 +endif + +.DUMMY: stage_dir +stage_dirs : $(MKDIRHIER) stage$(stage) for i in $(ALL_DIRS); do \ $(MKDIRHIER) stage$(stage)/$$i; \ done + +boot :: stage_dirs + # On Windows, we can't use symbolic links for the -hi-boot files # because GHC itself is a Mingw program and does not understand # symbolic links. So we have to copy the files instead of link them. @@ -100,6 +108,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 +119,7 @@ else $(LN_S) -f ../../$$i stage$(stage)/$$i || true ; \ done endif - -ifeq "$(stage)" "" -stage=1 +endif endif ifeq "$(stage)" "1" @@ -159,6 +167,7 @@ endif # be to do `env PATH=$(PATH) make ghc' to minimise the environment. (or the # equivalent of `env' if it doesn't exist locally). # +ifneq "$(BuildPackageGHC)" "YES" ifneq "$(way)" "dll" ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32" HS_PROG=$(odir)/ghc$(_way)-$(ProjectVersion) @@ -168,6 +177,7 @@ endif else HS_PROG=$(odir)/ghc-$(ProjectVersion) endif +endif # ----------------------------------------------------------------------------- # Create compiler configuration @@ -188,8 +198,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 "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $(CONFIG_HS) @echo "cGhcUnregisterised = \"$(GhcUnregisterised)\"" >> $(CONFIG_HS) @echo "cLeadingUnderscore = \"$(LeadingUnderscore)\"" >> $(CONFIG_HS) @@ -224,14 +232,122 @@ 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) : stage_dirs $(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) : stage_dirs $(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) : stage_dirs stage2/$(PLATFORM_H) + $(CP) stage2/$(PLATFORM_H) stage3/$(PLATFORM_H) + +STAGE_PLATFORM_H = stage$(stage)/$(PLATFORM_H) + +boot :: $(STAGE_PLATFORM_H) + +SRC_HC_OPTS += -Istage$(stage) + +# ----------------------------------------------------------------------------- # Set SRCS etc. # # First figure out ALL_DIRS, the source sub-directories ALL_DIRS = \ utils basicTypes types hsSyn prelude rename typecheck deSugar coreSyn \ - specialise simplCore stranal stgSyn simplStg codeGen absCSyn main \ - profiling parser cprAnalysis compMan ndpFlatten cbits iface + specialise simplCore stranal stgSyn simplStg codeGen main \ + profiling parser cprAnalysis compMan ndpFlatten iface cmm # Make sure we include Config.hs even if it doesn't exist yet... ALL_SRCS += $(CONFIG_HS) @@ -258,35 +374,53 @@ 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 -# Only include GHCi if we're bootstrapping with at least version 411 +# ----------------------------------------------------------------------------- +# Building a compiler with interpreter support +# +# The interpreter, GHCi interface, and Template Haskell are only +# enabled when we are bootstrapping with the same version of GHC, and +# the interpreter is supported on this platform. + ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES" -# Yes, include the interpreter, readline, and Template Haskell extensions + +# Yes, include the interepreter, readline, and Template Haskell extensions SRC_HC_OPTS += -DGHCI -package template-haskell + +ALL_DIRS += ghci + +# Enable readline if either: +# - we're building stage 1 and $(GhcHasReadline)="YES" +# - we're building stage 2/3, and we have built the readline package +# +# But we don't enable readline on Windows, because readline is fairly +# broken there. +# ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32" -SRC_HC_OPTS += -package unix -ifeq "$(GhcLibsWithReadline)" "YES" -SRC_HC_OPTS += -package readline +ifeq "$(stage)" "1" +ifeq "$(GhcHasReadline)" "YES" +SRC_HC_OPTS += -package readline -DUSE_READLINE endif +else +ifeq "$(GhcLibsWithReadline)" "YES" +SRC_HC_OPTS += -package readline -DUSE_READLINE endif -ALL_DIRS += ghci +endif # stage=1 +endif # not windows + else + # No interpreter, so exclude Template Haskell modules EXCLUDED_SRCS += deSugar/DsMeta.hs typecheck/TcSplice.lhs hsSyn/Convert.lhs -endif -# There are some C files to include in HS_PROG, so add these to HS_OBJS -HS_OBJS += $(C_OBJS) +endif # bootstrapped with interpreter # ----------------------------------------------- # mkdependC stuff @@ -304,7 +438,7 @@ SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR) # Haskell compilations SRC_HC_OPTS += \ - -cpp -fglasgow-exts -Rghc-timing \ + -cpp -fglasgow-exts -fno-generics -Rghc-timing \ -I. -IcodeGen -InativeGen -Iparser # Omitted: -I$(GHC_INCLUDE_DIR) @@ -322,16 +456,19 @@ SRC_HC_OPTS += \ # which needs it). SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR) -# When bootstrapped, we don't make use of *any* packages -# (except possibly readline if GHCi is enabled, see above) -ifneq "$(bootstrapped)" "YES" -ifneq "$(mingw32_HOST_OS)" "1" -SRC_HC_OPTS += -package concurrent -package posix -package util +# We need System.Posix (or Posix when ghc < 6.2) +ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32" +ifeq "$(bootstrapped) $(ghc_ge_601)" "NO NO" +SRC_HC_OPTS += -package posix else -SRC_HC_OPTS += -package concurrent -package util +SRC_HC_OPTS += -package unix endif endif +ifneq "$(findstring YES, $(bootstrapped) $(ghc_ge_603))" "" +SRC_HC_OPTS += -package Cabal +endif + SRC_CC_OPTS += -Iparser -I. -O SRC_HC_OPTS += -recomp $(GhcHcOpts) $(GhcStage$(stage)HcOpts) SRC_HC_OPTS += -H16M @@ -374,11 +511,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 @@ -389,6 +521,11 @@ utils/Binary_HC_OPTS += -O utils/FastMutInt_HC_OPTS += -O +# ---- Profiling ---- +#simplCore/Simplify_HC_OPTS = -auto-all +#simplCore/SimplEnv_HC_OPTS = -auto-all +#simplCore/SimplUtils_HC_OPTS = -auto-all + # CSE interacts badly with top-level IORefs (reportedly in DriverState and # DriverMkDepend), causing some of them to be commoned up. We have a fix for # this in 5.00+, but earlier versions of the compiler will need CSE turned off. @@ -411,9 +548,6 @@ ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" main/SysTools_HC_OPTS += '-\#include ' '-\#include ' endif -# Required due to use of Concurrent.myThreadId -utils/Panic_HC_OPTS += -fvia-C - parser/Lexer_HC_OPTS += -funbox-strict-fields # ghc_strlen percolates through so many modules that it is easier to get its @@ -481,7 +615,35 @@ primop-usage.hs-incl: prelude/primops.txt #----------------------------------------------------------------------------- # Linking -SRC_LD_OPTS += -no-link-chk +# Include libghccompat in stage1 only. In stage2 onwards, all these +# libraries will be available from the main libraries. +ifeq "$(stage)" "1" +SRC_HC_OPTS += -i$(GHC_LIB_COMPAT_DIR) +SRC_LD_OPTS += -L$(GHC_LIB_COMPAT_DIR) -lghccompat + +ifeq "$(Windows)" "YES" +# not very nice, but required for -lghccompat on Windows +SRC_LD_OPTS += -lshell32 +endif + +# This is horrible. We ought to be able to omit the entire directory +# from mkDependHS. +SRC_MKDEPENDHS_OPTS += \ + -optdep--exclude-module=Compat.RawSystem \ + -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.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 # ----------------------------------------------------------------------------- # create ghc-inplace, a convenient way to run ghc from the build tree... @@ -554,12 +716,21 @@ endif # typecheck/TcTyDecls_HC_OPTS += -auto-all # typecheck/TcType_HC_OPTS += -auto-all # typecheck/TcUnify_HC_OPTS += -auto-all -# -# absCSyn/PprAbsC_HC_OPTS += -auto-all coreSyn/CorePrep_HC_OPTS += -auto-all #----------------------------------------------------------------------------- +# Building GHC package + +ifeq "$(BuildPackageGHC)" "YES" + +PACKAGE = ghc +STANDALONE_PACKAGE = YES +PACKAGE_DEPS = + +endif + +#----------------------------------------------------------------------------- # clean MAINTAINER_CLEAN_FILES += parser/Parser.info main/ParsePkgConf.info @@ -575,6 +746,16 @@ MKDEPENDC_SRCS = parser/Parser.y : parser/Parser.y.pp EXTRA_SRCS += parser/Parser.y + +#----------------------------------------------------------------------------- +# Source files for tags file generation +# +# We want to excluded derived sources, because they won't be in the source +# tree, which is where we are going to move the TAGS file to.a + +TAGS_HS_SRCS = parser/Parser.y.pp $(filter-out $(DERIVED_SRCS) main/Config.hs parser/Parser.y, $(sort $(SRCS))) + + include $(TOP)/mk/target.mk # ----------------------------------------------------------------------------- @@ -585,7 +766,7 @@ MKDEPENDHS_HC_OPTS = $(patsubst -i$(odir)/%, -i%, $(HC_OPTS)) MKDEPENDHS=$(HC) # Must do this *after* including target.mk, because $(HS_SRCS) isn't set yet. -depend :: $(HS_SRCS) $(C_SRCS) +depend :: $(STAGE_PLATFORM_H) $(HS_SRCS) $(C_SRCS) touch .depend-BASE ifneq "$(BootingFromHc)" "YES" $(MKDEPENDHS) -M -optdep-f -optdep.depend-BASE $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-osuf $(obj)) $(MKDEPENDHS_OPTS) $(filter-out -split-objs, $(MKDEPENDHS_HC_OPTS)) $(HS_SRCS)