X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=1db9a456b33ba63299f407451ec2157a9d788c55;hb=b180d2d4959b3b5b8361afc8329f40479176555b;hp=8fb48c52cd8332a28ecbe7677381d927937aa6f1;hpb=459c7e36729f593aa09e813a47a61a8ea0c81d4f;p=ghc-hetmet.git diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index 8fb48c5..1db9a45 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,11 +102,11 @@ boot :: # Hence the "../.." in the ln command line ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" for i in */*hi-boot*; do \ - cp -f $$i stage$(stage)/$$i; \ + 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 @@ -182,7 +180,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) @@ -234,7 +232,7 @@ 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 + profiling parser cprAnalysis compMan ndpFlatten cbits # Make sure we include Config.hs even if it doesn't exist yet... ALL_SRCS += $(CONFIG_HS) @@ -277,7 +275,10 @@ ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES" # Yes, include the interepreter, readline, and Template Haskell extensions SRC_HC_OPTS += -DGHCI -package haskell-src ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32" -SRC_HC_OPTS += -package unix -package readline +SRC_HC_OPTS += -package unix +ifeq "$(GhcLibsWithReadline)" "YES" +SRC_HC_OPTS += -package readline +endif endif ALL_DIRS += ghci else @@ -294,7 +295,11 @@ 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 @@ -328,7 +333,7 @@ SRC_HC_OPTS += -package concurrent -package util endif endif -SRC_CC_OPTS += -Iparser -I. -I$(GHC_INCLUDE_DIR) -O +SRC_CC_OPTS += -Iparser -I. -O SRC_HC_OPTS += -recomp $(GhcHcOpts) $(GhcStage$(stage)HcOpts) SRC_HC_OPTS += -H16M @@ -340,9 +345,6 @@ 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 # because the NCG can't handle the 64-bit math in here @@ -363,7 +365,6 @@ 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 ifeq "$(bootstrapped)" "YES" @@ -376,8 +377,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 @@ -401,6 +408,9 @@ 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 + # 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"' @@ -420,17 +430,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" @@ -455,17 +464,20 @@ 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) +SRC_HAPPY_OPTS += +RTS -K2m -H16m -RTS #----------------------------------------------------------------------------- # Linking @@ -506,16 +518,45 @@ 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/RnExpr_HC_OPTS += -auto-all -# rename/RnHsSyn_HC_OPTS += -auto-all -# rename/RnNames_HC_OPTS += -auto-all -# rename/RnTypes_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 + +absCSyn/PprAbsC_HC_OPTS += -auto-all #----------------------------------------------------------------------------- # clean @@ -538,11 +579,12 @@ MKDEPENDHS_HC_OPTS = $(patsubst -i$(odir)/%, -i%, $(HC_OPTS)) MKDEPENDHS=$(HC) -depend :: .depend-$(stage) - # Must do this *after* including target.mk, because $(HS_SRCS) isn't set yet. -.depend-$(stage) : $(HS_SRCS) $(C_SRCS) +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