X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=f69caa79d65f9529b8700d37edefd80c3bf05125;hb=ba123ed2ac4b1ffde94aad48beea54d115b39517;hp=aa5c001eebfca0ee66ee4ea6f8b90041fc5b480d;hpb=4257efe4c07ab9e674e621a9177f7f41cc72c152;p=ghc-hetmet.git diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index aa5c001..f69caa7 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------------- -# $Id: Makefile,v 1.128 2000/12/30 20:35:37 panne Exp $ +# $Id: Makefile,v 1.138 2001/02/13 09:35:45 simonmar Exp $ TOP = .. include $(TOP)/mk/boilerplate.mk @@ -39,7 +39,7 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile @echo "cProjectName = \"$(ProjectName)\"" >> $(CONFIG_HS) @echo "cProjectVersion = \"$(ProjectVersion)\"" >> $(CONFIG_HS) @echo "cProjectVersionInt = \"$(ProjectVersionInt)\"" >> $(CONFIG_HS) - @echo "cBooterVersion = \"$(GhcVersion)\"" >> $(CONFIG_HS) + @echo "cBooterVersion = \"$(GhcVersion)\"" >> $(CONFIG_HS) @echo "cHscIfaceFileVersion = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS) @echo "cHOSTPLATFORM = \"$(HOSTPLATFORM)\"" >> $(CONFIG_HS) @echo "cTARGETPLATFORM = \"$(TARGETPLATFORM)\"" >> $(CONFIG_HS) @@ -50,7 +50,9 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile @echo "cGHC_INCLUDE_DIR = \"$(GHC_INCLUDE_DIR)\"" >> $(CONFIG_HS) @echo "cGHC_DRIVER_DIR = \"$(GHC_DRIVER_DIR)\"" >> $(CONFIG_HS) @echo "cGCC = \"$(WhatGccIsCalled)\"" >> $(CONFIG_HS) + @echo "cMkDLL = \"$(BLD_DLL)\"" >> $(CONFIG_HS) @echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $(CONFIG_HS) + @echo "cGhcUnregisterised = \"$(GhcUnregisterised)\"" >> $(CONFIG_HS) @echo "cLeadingUnderscore = \"$(LeadingUnderscore)\"" >> $(CONFIG_HS) @echo "cGHC_UNLIT = \"$(GHC_UNLIT)\"" >> $(CONFIG_HS) @echo "cGHC_MANGLER = \"$(GHC_MANGLER)\"" >> $(CONFIG_HS) @@ -96,17 +98,19 @@ SRC_HC_OPTS += -DILX endif endif +ghc_411_at_least = $(shell expr "$(GhcMinVersion)" \>= 11) + # Only include GHCi if we're bootstrapping with at least version 411 ifeq "$(GhcWithInterpreter)" "YES" -ghc_411_at_least = $(shell expr "$(GhcMinVersion)" \>= 11) ifeq "$(ghc_411_at_least)" "1" -SRC_HC_OPTS += -DGHCI -optc-DGHCI +SRC_HC_OPTS += -DGHCI DIRS += ghci endif endif HS_SRCS := $(foreach dir,$(DIRS),$(wildcard $(dir)/*.lhs) $(wildcard $(dir)/*.hs)) -HS_SRCS := $(filter-out rename/ParseIface.hs parser/Parser.hs, $(HS_SRCS)) +HS_SRCS := $(filter-out rename/ParseIface.hs parser/Parser.hs $(CONFIG_HS), $(HS_SRCS)) +HS_SRCS += $(CONFIG_HS) ifneq "$(GhcWithHscBuiltViaC)" "YES" HS_SRCS += rename/ParseIface.hs parser/Parser.hs @@ -159,53 +163,33 @@ empty:= space:= $(empty) $(empty) SRC_HC_OPTS += \ - -cpp -fglasgow-exts \ + -cpp -fglasgow-exts -Rghc-timing \ -I. -IcodeGen -InativeGen -Iparser \ -i$(subst $(space),:,$(DIRS)) -ghc_407_at_least = $(shell expr "$(GhcMinVersion)" \>= 7) -ifeq "$(ghc_407_at_least)" "1" ifneq "$(mingw32_TARGET_OS)" "1" SRC_HC_OPTS += -package concurrent -package posix -package text -package util else SRC_HC_OPTS += -package concurrent -package text -package util endif -else -SRC_HC_OPTS += -syslib concurrent -syslib posix -syslib misc -syslib util -endif SRC_CC_OPTS += -Iparser -I. -I$(TOP)/includes -O - SRC_HC_OPTS += -recomp $(GhcHcOpts) +SRC_HC_OPTS += -H16m # Special flags for particular modules # The standard suffix rule for compiling a Haskell file # adds these flags to the command line -# Was 6m with 2.10 -absCSyn/PprAbsC_HC_OPTS = -H10m - -codeGen/CgCase_HC_OPTS = -fno-prune-tydecls +# not sure if this is required --SDM main/Main_HC_OPTS = -fvia-C -ifneq "$(GhcWithHscBuiltViaC)" "YES" -ifeq "$(GhcReportCompiles)" "YES" -main/Main_HC_OPTS += -syslib misc -DREPORT_TO_MOTHERLODE -endif -endif - -nativeGen/MachCode_HC_OPTS = -H10m - -# Avoids Bug in 3.02, it seems -usageSP/UsageSPInf_HC_OPTS = -Onot - -prelude/PrimOp_HC_OPTS = -H12m -no-recomp +prelude/PrimOp_HC_OPTS = -no-recomp # because the NCG can't handle the 64-bit math in here prelude/PrelRules_HC_OPTS = -fvia-C rename/ParseIface_HC_OPTS += -Onot -H45m -fno-warn-incomplete-patterns - parser/Parser_HC_OPTS += -Onot -fno-warn-incomplete-patterns # The latest GHC version doesn't have a -K option yet, and it doesn't @@ -219,43 +203,9 @@ ifeq "$(TARGETPLATFORM)" "hppa1.1-hp-hpux9" rename/RnMonad_HC_OPTS = -O2 -O2-for-C endif -rename/RnSource_HC_OPTS = -H12m -rename/RnIfaces_HC_OPTS = -H8m -rename/RnExpr_HC_OPTS = -H10m -rename/RnNames_HC_OPTS = -H12m -specialise/Specialise_HC_OPTS = -Onot -H12m -simplCore/Simplify_HC_OPTS = -H15m -simplCore/OccurAnal_HC_OPTS = -H10m -typecheck/TcGenDeriv_HC_OPTS = -H10m - -# tmp, -- SDM -specialise/Specialise_HC_OPTS += -fno-prune-tydecls -hsSyn/HsBasic_HC_OPTS += -fno-prune-tydecls -simplCore/SimplMonad_HC_OPTS += -fno-prune-tydecls -absCSyn/AbsCSyn_HC_OPTS += -fno-prune-tydecls -absCSyn/AbsCUtils_HC_OPTS += -fno-prune-tydecls -codeGen/CgBindery_HC_OPTS += -fno-prune-tydecls -codeGen/CgLetNoEscape_HC_OPTS += -fno-prune-tydecls -codeGen/CgExpr_HC_OPTS += -fno-prune-tydecls -nativeGen/AbsCStixGen_HC_OPTS += -fno-prune-tydecls - -# Was 10m for 2.10 -typecheck/TcHsSyn_HC_OPTS = -H15m - - -# Was 10m for 2.10 -typecheck/TcExpr_HC_OPTS = -H15m -typecheck/TcBinds_HC_OPTS = -H10m - -typecheck/TcEnv_HC_OPTS = -H10m utils/StringBuffer_HC_OPTS = -fvia-C -fno-prune-tydecls utils/Digraph_HC_OPTS = -fglasgow-exts -# temporary, due to bug in NCG (x86 spiller fails because a basic block -# contains both multiply and divide insns, probably soaking up all spill -# regs) (SDM, 1/6/2000), augmented by JRS 27 Oct 00. -utils/FastString_HC_OPTS = -fvia-C - # flags for PrimPacked: # # -monly-3-regs @@ -270,12 +220,8 @@ utils/FastString_HC_OPTS = -fvia-C utils/PrimPacked_HC_OPTS = -fvia-C -monly-3-regs -funfolding-interface-threshold7 -# Strictness analyser misbehaving in 2.10, fails to terminate on -# UpdAnal.lhs due to weird recursive datatype. Bug was exposed by a -# separate bugfix to the fixpoint finder. -simplStg/UpdAnal_HC_OPTS = -fno-strictness - -ghci/StgInterp_HC_OPTS = -fvia-C +# ByteCodeItbls uses primops that the NCG doesn't support yet. +ghci/ByteCodeItbls_HC_OPTS = -fvia-C # ---------------------------------------------------------------------------- # C compilations @@ -301,7 +247,7 @@ PRIMOP_BITS=primop-data-decl.hs-incl \ primop-usage.hs-incl \ primop-primop-info.hs-incl -prelude/PrimOp.o: $(PRIMOP_BITS) +prelude/PrimOp.lhs: $(PRIMOP_BITS) depend :: $(PRIMOP_BITS) @@ -340,12 +286,6 @@ SRC_HAPPY_OPTS += +RTS -K2m -H16m -RTS $(GHC_HAPPY_OPTS) SRC_LD_OPTS += -no-link-chk -ifneq "$(GhcWithHscBuiltViaC)" "YES" -ifeq "$(GhcReportCompiles)" "YES" -SRC_LD_OPTS += -syslib misc -syslib exts -endif -endif - # ----------------------------------------------------------------------------- # create ghc-inplace, a convenient way to run ghc from the build tree... @@ -359,35 +299,6 @@ ghc-inplace : ghc CLEAN_FILES += ghc-inplace -# ----------------------------------------------------------------------------- -# Create link to from ghc-x.xx to ghc... - -all :: $(LINK) - -$(LINK) : $(HS_PROG) - @if ( $(PERL) -e '$$fn="$(LINK)"; exit ((! -f $$fn || -l $$fn) ? 0 : 1);' ); then \ - echo "Creating a symbolic link from $(HS_PROG) to $(LINK)"; \ - $(RM) $(LINK); \ - $(LN_S) $(HS_PROG) $(LINK); \ - else \ - echo "Creating a symbolic link from $(HS_PROG) to $(LINK) failed: \`$(LINK)' already exists"; \ - echo "Perhaps remove \`$(LINK)' manually?"; \ - exit 1; \ - fi; - -CLEAN_FILES += $(LINK) - -install :: - @if ( $(PERL) -e '$$fn="$(bindir)/$(LINK)"; exit ((! -f $$fn || -l $$fn) ? 0 : 1);' ); then \ - echo "Creating a symbol link from $(HS_PROG) to $(LINK) in $(bindir)"; \ - $(RM) $(bindir)/$(LINK); \ - $(LN_S) $(HS_PROG) $(bindir)/$(LINK); \ - else \ - echo "Creating a symbol link from $(HS_PROG) to $(LINK) in $(bindir) failed: \`$(bindir)/$(LINK)' already exists"; \ - echo "Perhaps remove \`$(bindir)/$(LINK)' manually?"; \ - exit 1; \ - fi; - #----------------------------------------------------------------------------- # install