X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=7f23b5f7ab529d389a43d4eb8b2b13a4afb6ffd0;hb=486c94ae36e36c341cf607a8bda3241ba90bf538;hp=d7ac0a01a9a50628c50d2eb1e5102ce4d8f31a10;hpb=8c63d0ff9123be6ae33502c26229a647c9fd0482;p=ghc-hetmet.git diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index d7ac0a0..7f23b5f 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------------- -# $Id: Makefile,v 1.131 2001/01/09 17:43:57 rrt Exp $ +# $Id: Makefile,v 1.154 2001/04/13 13:37:24 panne Exp $ TOP = .. include $(TOP)/mk/boilerplate.mk @@ -23,8 +23,6 @@ else HS_PROG=ghc-$(ProjectVersion) endif -LINK = ghc - # ----------------------------------------------------------------------------- # Create compiler configuration @@ -52,6 +50,7 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile @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) @@ -64,12 +63,7 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile @echo "cHaveLibGmp = \"$(HaveLibGmp)\"" >> $(CONFIG_HS) @echo "cUSER_WAY_NAMES = \"$(USER_WAY_NAMES)\"" >> $(CONFIG_HS) @echo "cUSER_WAY_OPTS = \"$(USER_WAY_OPTS)\"" >> $(CONFIG_HS) - @echo "clibdir = \"$(libdir)\"" >> $(CONFIG_HS) - @echo "clibexecdir = \"$(libexecdir)\"" >> $(CONFIG_HS) - @echo "cdatadir = \"$(datadir)\"" >> $(CONFIG_HS) - @echo "cbindir = \"$(bindir)\"" >> $(CONFIG_HS) @echo "cDEFAULT_TMPDIR = \"$(DEFAULT_TMPDIR)\"" >> $(CONFIG_HS) - @echo "cFPTOOLS_TOP_ABS = \"$(FPTOOLS_TOP_ABS)\"" >> $(CONFIG_HS) @echo "cRAWCPP = \"$(RAWCPP)\"" >> $(CONFIG_HS) @echo done. @@ -91,33 +85,40 @@ ifeq ($(GhcWithNativeCodeGen),YES) DIRS += nativeGen else SRC_HC_OPTS += -DOMIT_NATIVE_CODEGEN +endif + ifeq ($(GhcWithIlx),YES) DIRS += ilxGen SRC_HC_OPTS += -DILX endif -endif -ghc_411_at_least = $(shell expr "$(GhcMinVersion)" \>= 11) +ifeq "$(BootingFromHc)" "YES" +# HC files are always from a self-booted compiler +ghc_411_at_least = 1 +else +ghc_411_at_least = $(shell expr "$(GhcVersion)" \>= 4.11) +endif # Only include GHCi if we're bootstrapping with at least version 411 ifeq "$(GhcWithInterpreter)" "YES" 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 main/ParsePkgConf.hs $(CONFIG_HS), $(HS_SRCS)) +HS_SRCS += $(CONFIG_HS) -ifneq "$(GhcWithHscBuiltViaC)" "YES" -HS_SRCS += rename/ParseIface.hs parser/Parser.hs +ifneq "$(BootingFromHc)" "YES" +HS_SRCS += rename/ParseIface.hs parser/Parser.hs main/ParsePkgConf.hs endif HCS = $(patsubst %.lhs, %.hc, $(patsubst %.hs, %.hc, $(HS_SRCS))) -ifeq "$(GhcWithHscBuiltViaC)" "YES" -HCS += rename/ParseIface.hc parser/Parser.hc +ifeq "$(BootingFromHc)" "YES" +HCS += rename/ParseIface.hc parser/Parser.hc main/ParsePkgConf.hc endif HS_OBJS = \ @@ -135,7 +136,7 @@ C_SRCS += parser/hschooks.c # Big Fudge to get around inherent problem that Makefile setup # has got with 'mkdependC'. # -SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) +SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(GHC_INCLUDES) # ----------------------------------------------------------------------------- # Haskell compilations @@ -144,16 +145,17 @@ SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) # Compiler to use for building ghc, use the build tree # driver when booting. # -ifneq "$(GhcWithHscBuiltViaC)" "YES" HC=$(GHC) -else -HC=$(GHC_INPLACE) -endif # # Use GHC for compiling C bits # +ifeq "$(BootingFromHc)" "YES" +SRC_CC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) +else CC = $(HC) +CC_OPTS := $(addprefix -optc, $(CC_OPTS)) +endif # magic from GNU make manual to convert a list of values # into a colon-separated list @@ -161,54 +163,36 @@ 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 +main/TmpFiles_HC_OPTS += -Dmingw32_TARGET_OS 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 -H80m # 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 +main/ParsePkgConf_HC_OPTS += -fno-warn-incomplete-patterns # The latest GHC version doesn't have a -K option yet, and it doesn't # seem to be necessary anymore for the modules below. @@ -221,63 +205,35 @@ 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 # because it contains a 'ccall strlen', which gets inlined by # gcc, causing a lack of registers. # -# -optC-funfolding-interface-threshold7 -# To stop the definition of 'strLength', which calls strlen, getting -# into the interface file and spreading the -monly-3-regs virus. -# We need -optC here because the driver before 3.02 didn't understand -# the -funfolding flags. - -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 +utils/PrimPacked_HC_OPTS = -fvia-C -monly-3-regs + +# ByteCodeItbls uses primops that the NCG doesn't support yet. +ghci/ByteCodeItbls_HC_OPTS = -fvia-C +ghci/ByteCodeLink_HC_OPTS = -fvia-C + +# 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. +# To be on the safe side, we disable CSE in *all* modules with top-level IORefs. +compMan/CompManager_HC_OPTS = -fno-cse +ghci/InteractiveUI_HC_OPTS = -fno-cse +main/CmdLineOpts_HC_OPTS = -fno-cse +main/DriverFlags_HC_OPTS = -fno-cse +main/DriverMkDepend_HC_OPTS = -fno-cse +main/DriverPipeline_HC_OPTS = -fno-cse +main/DriverState_HC_OPTS = -fno-cse +main/DriverUtil_HC_OPTS = -fno-cse +main/Finder_HC_OPTS = -fno-cse +main/TmpFiles_HC_OPTS = -fno-cse # ---------------------------------------------------------------------------- # C compilations @@ -303,9 +259,13 @@ PRIMOP_BITS=primop-data-decl.hs-incl \ primop-usage.hs-incl \ primop-primop-info.hs-incl -prelude/PrimOp.o: $(PRIMOP_BITS) +ifneq "$(BootingFromHc)" "YES" +prelude/PrimOp.lhs prelude/PrimOp.o: $(PRIMOP_BITS) +endif +ifneq "$(BootingFromHc)" "YES" depend :: $(PRIMOP_BITS) +endif primop-data-decl.hs-incl: prelude/primops.txt $(GENPOC) --data-decl < $< > $@ @@ -342,54 +302,19 @@ 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... all :: ghc-inplace -ghc-inplace : ghc +ghc-inplace : $(HS_PROG) @$(RM) $@ echo '#!/bin/sh' >>$@ - echo exec $(FPTOOLS_TOP_ABS)/ghc/compiler/ghc -B$(FPTOOLS_TOP_ABS) '"$$@"' >>$@ + echo exec $(FPTOOLS_TOP_ABS_UNIX)/ghc/compiler/$(HS_PROG) -B$(FPTOOLS_TOP_ABS) '"$$@"' >>$@ chmod 755 $@ 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 @@ -397,7 +322,7 @@ install :: # but put it together with the libraries. # Also don't want any interface files intstalled -INSTALL_PROGS += $(HS_PROG) +INSTALL_LIBEXECS += $(HS_PROG) #----------------------------------------------------------------------------- # clean @@ -407,8 +332,8 @@ CLEAN_FILES += $(PRIMOP_BITS) # Extra tidy, remove the .hc files (if you've got them). MAINTAINER_CLEAN_FILES += $(wildcard */*.hc) \ - parser/Parser.info rename/ParseIface.info \ - parser/Parser.hs rename/ParseIface.hs + parser/Parser.info rename/ParseIface.info main/ParsePkgConf.info \ + parser/Parser.hs rename/ParseIface.hs main/ParsePkgConf.hs #----------------------------------------------------------------------------- # Include target-rule boilerplate