X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=1cf49d91a9c0dae772064891c4fb3aa070246069;hb=980f56ed05fe6665e73d130cc99de6390095c2d7;hp=41cc372e1aa25b5dbad3569595e13f417bff6ac9;hpb=0638e7d81533677f5c821a8ec3565b2b32c5543e;p=ghc-hetmet.git diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index 41cc372..1cf49d9 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -19,9 +19,7 @@ TOP = .. # Use GHC for compiling C bits (NB. must be before boilerplate include) # -ifneq "$(BootingFromHc)" "YES" UseGhcForCc = YES -endif include $(TOP)/mk/boilerplate.mk @@ -104,10 +102,11 @@ boot :: # Hence the "../.." in the ln command line ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" for i in */*hi-boot*; do \ + cp -u -f $$i stage$(stage)/$$i; \ done else for i in */*hi-boot*; do \ - $(LN_S) -f ../../$$i stage$(stage)/$$i; \ + $(LN_S) -f ../../$$i stage$(stage)/$$i || true ; \ done endif @@ -160,6 +159,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) @@ -169,6 +169,7 @@ endif else HS_PROG=$(odir)/ghc-$(ProjectVersion) endif +endif # ----------------------------------------------------------------------------- # Create compiler configuration @@ -181,7 +182,7 @@ boot :: $(CONFIG_HS) $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile @$(RM) -f $(CONFIG_HS) - @echo -n "Creating $(CONFIG_HS) ... " + @echo "Creating $(CONFIG_HS) ... " @echo "module Config where" >>$(CONFIG_HS) @echo "cProjectName = \"$(ProjectName)\"" >> $(CONFIG_HS) @echo "cProjectVersion = \"$(ProjectVersion)\"" >> $(CONFIG_HS) @@ -191,6 +192,8 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile @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) @@ -217,7 +220,6 @@ ifeq ($(GhcWithIlx),YES) endif @echo "cEnableWin32DLLs = \"$(EnableWin32DLLs)\"" >> $(CONFIG_HS) @echo "cCONTEXT_DIFF = \"$(CONTEXT_DIFF)\"" >> $(CONFIG_HS) - @echo "cHaveLibGmp = \"$(HaveLibGmp)\"" >> $(CONFIG_HS) @echo "cUSER_WAY_NAMES = \"$(USER_WAY_NAMES)\"" >> $(CONFIG_HS) @echo "cUSER_WAY_OPTS = \"$(USER_WAY_OPTS)\"" >> $(CONFIG_HS) @echo "cDEFAULT_TMPDIR = \"$(DEFAULT_TMPDIR)\"" >> $(CONFIG_HS) @@ -232,8 +234,8 @@ CLEAN_FILES += $(CONFIG_HS) ALL_DIRS = \ utils basicTypes types hsSyn prelude rename typecheck deSugar coreSyn \ - specialise simplCore stranal stgSyn simplStg codeGen absCSyn main \ - profiling parser usageSP cprAnalysis compMan ndpFlatten + 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) @@ -271,21 +273,49 @@ compiling_with_4xx = $(shell if (test $(GhcCanonVersion) -lt 500); then echo YES 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 interepreter, readline, and Template Haskell extensions -SRC_HC_OPTS += -DGHCI -package haskell-src +SRC_HC_OPTS += -DGHCI -package template-haskell + ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32" -SRC_HC_OPTS += -package unix -package readline +SRC_HC_OPTS += -package unix endif + 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" +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 +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 @@ -293,13 +323,17 @@ HS_OBJS += $(C_OBJS) # Big Fudge to get around inherent problem that Makefile setup # has got with 'mkdependC'. # -SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(GHC_INCLUDE_DIR) +SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) + +# XXX not really correct, hschooks.c actually gets include files like +# RtsFlags.c from the installed GHC, but we can't tell mkdependC about that. +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) @@ -328,7 +362,7 @@ endif endif SRC_CC_OPTS += -Iparser -I. -O -SRC_HC_OPTS += -recomp $(GhcHcOpts) +SRC_HC_OPTS += -recomp $(GhcHcOpts) $(GhcStage$(stage)HcOpts) SRC_HC_OPTS += -H16M ifeq "$(BootingFromHc)" "YES" @@ -339,10 +373,9 @@ endif # The standard suffix rule for compiling a Haskell file # adds these flags to the command line -# not sure if this is required --SDM -main/Main_HC_OPTS = -fvia-C - -prelude/PrimOp_HC_OPTS = -no-recomp -H80m +# There used to be a -no-recomp flag on PrimOp, but why? +# It's an expensive module to recompile! +prelude/PrimOp_HC_OPTS = -H80m # because the NCG can't handle the 64-bit math in here prelude/PrelRules_HC_OPTS = -fvia-C @@ -350,21 +383,22 @@ prelude/PrelRules_HC_OPTS = -fvia-C main/ParsePkgConf_HC_OPTS += -fno-warn-incomplete-patterns # Use -fvia-C since the NCG can't handle the narrow16Int# (and intToInt16#?) # primops on all platforms. -parser/Parser_HC_OPTS += -Onot -fno-warn-incomplete-patterns -fvia-C +parser/Parser_HC_OPTS += -fno-warn-incomplete-patterns -fvia-C -# The latest GHC version doesn't have a -K option yet, and it doesn't -# seem to be necessary anymore for the modules below. -ifeq "$(compiling_with_4xx)" "YES" -parser/Parser_HC_OPTS += -K2m -endif +# Careful optimisation of the parser: we don't want to throw everything +# at it, because that takes too long and doesn't buy much, but we do want +# to inline certain key external functions, so we instruct GHC not to +# throw away inlinings as it would normally do in -Onot mode: +parser/Parser_HC_OPTS += -Onot -fno-ignore-interface-pragmas ifeq "$(HOSTPLATFORM)" "hppa1.1-hp-hpux9" rename/RnMonad_HC_OPTS = -O2 -O2-for-C endif -utils/StringBuffer_HC_OPTS = -fvia-C -fno-prune-tydecls utils/Digraph_HC_OPTS = -fglasgow-exts +basicTypes/SrcLoc_HC_OPTS = -funbox-strict-fields + ifeq "$(bootstrapped)" "YES" utils/Binary_HC_OPTS = -funbox-strict-fields endif @@ -375,8 +409,14 @@ 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 +ghci/ByteCodeItbls_HC_OPTS += -fvia-C +ghci/ByteCodeLink_HC_OPTS += -fvia-C -monly-3-regs + +# BinIface and Binary take ages to both compile and run if you don's use -O +main/BinIface_HC_OPTS += -O +utils/Binary_HC_OPTS += -O +utils/FastMutInt_HC_OPTS += -O + # 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 @@ -400,6 +440,8 @@ ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" main/SysTools_HC_OPTS += '-\#include ' '-\#include ' endif +parser/Lexer_HC_OPTS += -funbox-strict-fields + # 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 SRC_HC_OPTS += '-\#include "hschooks.h"' @@ -419,17 +461,16 @@ PRIMOP_BITS=primop-data-decl.hs-incl \ primop-needs-wrapper.hs-incl \ primop-can-fail.hs-incl \ primop-strictness.hs-incl \ - primop-usage.hs-incl \ primop-primop-info.hs-incl CLEAN_FILES += prelude/primops.txt CLEAN_FILES += $(PRIMOP_BITS) -SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -traditional +SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR) SRC_CPP_OPTS += ${GhcCppOpts} ifneq "$(BootingFromHc)" "YES" -prelude/PrimOp.lhs prelude/PrimOp.o: $(PRIMOP_BITS) +prelude/PrimOp.lhs $(odir)/prelude/PrimOp.o: $(PRIMOP_BITS) endif ifneq "$(BootingFromHc)" "YES" @@ -454,21 +495,26 @@ primop-can-fail.hs-incl: prelude/primops.txt $(GENPOC) --can-fail < $< > $@ primop-strictness.hs-incl: prelude/primops.txt $(GENPOC) --strictness < $< > $@ -primop-usage.hs-incl: prelude/primops.txt - $(GENPOC) --usage < $< > $@ primop-primop-info.hs-incl: prelude/primops.txt $(GENPOC) --primop-primop-info < $< > $@ +# Usages aren't used any more; but the generator +# can still generate them if we want them back +primop-usage.hs-incl: prelude/primops.txt + $(GENPOC) --usage < $< > $@ -# ---------------------------------------------------------------------------- -# Parsers/lexers - -SRC_HAPPY_OPTS += +RTS -K2m -H16m -RTS $(GHC_HAPPY_OPTS) - #----------------------------------------------------------------------------- # Linking +# Include libghccompat in stage1. 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 +SRC_MKDEPENDHS_OPTS += -optdep--exclude-module=Compat.RawSystem +endif + SRC_LD_OPTS += -no-link-chk # ----------------------------------------------------------------------------- @@ -505,16 +551,56 @@ endif # ---------------------------------------------------------------------------- # profiling. -# rename/Rename_HC_OPTS += -auto-all -# rename/RnEnv_HC_OPTS += -auto-all -# rename/RnHiFiles_HC_OPTS += -auto-all -# rename/RnIfaces_HC_OPTS += -auto-all -# rename/RnSource_HC_OPTS += -auto-all # rename/RnBinds_HC_OPTS += -auto-all +# rename/RnEnv_HC_OPTS += -auto-all # rename/RnExpr_HC_OPTS += -auto-all +# rename/RnHiFiles_HC_OPTS += -auto-all # rename/RnHsSyn_HC_OPTS += -auto-all +# rename/Rename_HC_OPTS += -auto-all +# rename/RnIfaces_HC_OPTS += -auto-all # rename/RnNames_HC_OPTS += -auto-all +# rename/RnSource_HC_OPTS += -auto-all # rename/RnTypes_HC_OPTS += -auto-all +# +# typecheck/Inst_HC_OPTS += -auto-all +# typecheck/TcBinds_HC_OPTS += -auto-all +# typecheck/TcClassDcl_HC_OPTS += -auto-all +# typecheck/TcDefaults_HC_OPTS += -auto-all +# typecheck/TcDeriv_HC_OPTS += -auto-all +# typecheck/TcEnv_HC_OPTS += -auto-all +# typecheck/TcExpr_HC_OPTS += -auto-all +# typecheck/TcForeign_HC_OPTS += -auto-all +# typecheck/TcGenDeriv_HC_OPTS += -auto-all +# typecheck/TcHsSyn_HC_OPTS += -auto-all +# typecheck/TcIfaceSig_HC_OPTS += -auto-all +# typecheck/TcInstDcls_HC_OPTS += -auto-all +# typecheck/TcMatches_HC_OPTS += -auto-all +# typecheck/TcMonoType_HC_OPTS += -auto-all +# typecheck/TcMType_HC_OPTS += -auto-all +# typecheck/TcPat_HC_OPTS += -auto-all +# typecheck/TcRnDriver_HC_OPTS += -auto-all +# #typecheck/TcRnMonad_HC_OPTS += -auto-all +# #typecheck/TcRnTypes_HC_OPTS += -auto-all +# typecheck/TcRules_HC_OPTS += -auto-all +# typecheck/TcSimplify_HC_OPTS += -auto-all +# typecheck/TcSplice_HC_OPTS += -auto-all +# typecheck/TcTyClsDecls_HC_OPTS += -auto-all +# typecheck/TcTyDecls_HC_OPTS += -auto-all +# typecheck/TcType_HC_OPTS += -auto-all +# typecheck/TcUnify_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 @@ -528,6 +614,20 @@ MAINTAINER_CLEAN_FILES += parser/Parser.info main/ParsePkgConf.info MKDEPENDHS_SRCS = MKDEPENDC_SRCS = +# Make doesn't work this out for itself, it seems +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 # ----------------------------------------------------------------------------- @@ -539,7 +639,10 @@ MKDEPENDHS=$(HC) # Must do this *after* including target.mk, because $(HS_SRCS) isn't set yet. depend :: $(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) +endif $(MKDEPENDC) -f .depend-BASE $(MKDEPENDC_OPTS) $(foreach way,$(WAYS),-s $(way)) -- $(CC_OPTS) -- $(C_SRCS) $(PERL) -pe 'binmode(stdin); binmode(stdout); s@^(\S*\.o)@stage$(stage)/$$1@g; s@(\S*\.hi)@stage$(stage)/$$1@g' <.depend-BASE >.depend-$(stage) # The binmode stuff tells perl not to add stupid ^M's to the output