X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=c96b6adc6e40c8062297b52a0aa4ef4aa592a30c;hb=e8b2fe5550ee87ee6d6dce1aaffa50558da6f8e3;hp=ee0473cc92ba20ba6b21f190136dd0ff29258cd0;hpb=a0fafeff92725ef29c1e2ed5caf834cba6b59051;p=ghc-hetmet.git diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index ee0473c..c96b6ad 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -18,6 +18,7 @@ TOP = .. # Use GHC for compiling C bits (NB. must be before boilerplate include) +# NB. this requires BootingFromHc to be set on the make command line! # ifneq "$(BootingFromHc)" "YES" UseGhcForCc = YES @@ -104,11 +105,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 +183,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 +235,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 # Make sure we include Config.hs even if it doesn't exist yet... ALL_SRCS += $(CONFIG_HS) @@ -277,7 +278,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 @@ -344,9 +348,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 @@ -380,8 +381,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 @@ -405,6 +412,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"' @@ -424,7 +434,6 @@ 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 @@ -434,7 +443,7 @@ SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -traditional 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" @@ -459,17 +468,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 @@ -510,16 +522,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