X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=aa5c001eebfca0ee66ee4ea6f8b90041fc5b480d;hb=4257efe4c07ab9e674e621a9177f7f41cc72c152;hp=c8651c7d6b650e1cacb93d1839b0f569a1830d97;hpb=803963adcff2a811b7ec494e37ab8b2e318bff45;p=ghc-hetmet.git diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index c8651c7..aa5c001 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------------- -# $Id: Makefile,v 1.106 2000/11/02 14:27:02 simonmar Exp $ +# $Id: Makefile,v 1.128 2000/12/30 20:35:37 panne Exp $ TOP = .. include $(TOP)/mk/boilerplate.mk @@ -9,7 +9,7 @@ include $(TOP)/mk/boilerplate.mk WAYS=$(GhcCompilerWays) # ----------------------------------------------------------------------------- -# Set HS_PROG, LIBRARY +# Set HS_PROG # Note: there have been reports of people running up against the ARG_MAX limit # when linking ghc with all its constituent object files. The likely source of @@ -28,8 +28,8 @@ LINK = ghc # ----------------------------------------------------------------------------- # Create compiler configuration -CURRENT_DIR=ghc/compiler -CONFIG_HS = main/Config.hs +CURRENT_DIR = ghc/compiler +CONFIG_HS = main/Config.hs boot :: $(CONFIG_HS) $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile @@ -39,6 +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 "cHscIfaceFileVersion = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS) @echo "cHOSTPLATFORM = \"$(HOSTPLATFORM)\"" >> $(CONFIG_HS) @echo "cTARGETPLATFORM = \"$(TARGETPLATFORM)\"" >> $(CONFIG_HS) @@ -54,7 +55,6 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile @echo "cGHC_UNLIT = \"$(GHC_UNLIT)\"" >> $(CONFIG_HS) @echo "cGHC_MANGLER = \"$(GHC_MANGLER)\"" >> $(CONFIG_HS) @echo "cGHC_SPLIT = \"$(GHC_SPLIT)\"" >> $(CONFIG_HS) - @echo "cGHC_STATS = \"$(GHC_STATS)\"" >> $(CONFIG_HS) @echo "cGHC_SYSMAN = \"$(GHC_SYSMAN)\"" >> $(CONFIG_HS) @echo "cEnableWin32DLLs = \"$(EnableWin32DLLs)\"" >> $(CONFIG_HS) @echo "cCP = \"$(CP)\"" >> $(CONFIG_HS) @@ -75,14 +75,7 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile CLEAN_FILES += $(CONFIG_HS) # ----------------------------------------------------------------------------- -# Compilation history for Patrick - -# Make the sources first, because that's what the compilation history needs -$(HS_PROG) :: $(HS_SRCS) - - -# ----------------------------------------------------------------------------- -# Set SRCS, LOOPS, HCS, OBJS +# Set SRCS, HCS, OBJS # # First figure out DIRS, the source sub-directories # Then derive SRCS by looking in them @@ -103,34 +96,32 @@ SRC_HC_OPTS += -DILX endif endif -# Only include GHCi if we're bootstrapping with at least version 409 +# Only include GHCi if we're bootstrapping with at least version 411 ifeq "$(GhcWithInterpreter)" "YES" -ghc_409_at_least = $(shell expr "$(GhcMinVersion)" \>= 9) -ifeq "$(ghc_409_at_least)" "1" -SRC_HC_OPTS += -DGHCI +ghc_411_at_least = $(shell expr "$(GhcMinVersion)" \>= 11) +ifeq "$(ghc_411_at_least)" "1" +SRC_HC_OPTS += -DGHCI -optc-DGHCI DIRS += ghci endif endif -HS_SRCS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.lhs) $(wildcard $(dir)/*.hs)) +HS_SRCS := $(foreach dir,$(DIRS),$(wildcard $(dir)/*.lhs) $(wildcard $(dir)/*.hs)) +HS_SRCS := $(filter-out rename/ParseIface.hs parser/Parser.hs, $(HS_SRCS)) -# ToDo: not clear why this is here -- messes up linking -#ifneq "$(GhcWithHscBuiltViaC)" "YES" -#HS_SRCS += rename/ParseIface.hs parser/Parser.hs -#endif +ifneq "$(GhcWithHscBuiltViaC)" "YES" +HS_SRCS += rename/ParseIface.hs parser/Parser.hs +endif HCS = $(patsubst %.lhs, %.hc, $(patsubst %.hs, %.hc, $(HS_SRCS))) -# ParseIface.hs ain't part of HS_SRCS when this is on.. ifeq "$(GhcWithHscBuiltViaC)" "YES" -HCS += rename/ParseIface.hc parser/Parser.hc +HCS += rename/ParseIface.hc parser/Parser.hc endif HS_OBJS = \ $(patsubst %.hc, %.o, $(HCS)) \ parser/hschooks.o - DESTDIR = $(INSTALL_LIBRARY_DIR_GHC) # @@ -144,10 +135,6 @@ C_SRCS += parser/hschooks.c # SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) -# stuff you get for free in a source distribution -# -# SRC_DIST_FILES += rename/ParseIface.hs rename/Parser.hs - # ----------------------------------------------------------------------------- # Haskell compilations @@ -161,6 +148,11 @@ else HC=$(GHC_INPLACE) endif +# +# Use GHC for compiling C bits +# +CC = $(HC) + # magic from GNU make manual to convert a list of values # into a colon-separated list empty:= @@ -168,18 +160,18 @@ space:= $(empty) $(empty) SRC_HC_OPTS += \ -cpp -fglasgow-exts \ - -Rghc-timing -I. -IcodeGen -InativeGen -Iparser \ + -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 +SRC_HC_OPTS += -package concurrent -package posix -package text -package util else -SRC_HC_OPTS += -package concurrent -package text +SRC_HC_OPTS += -package concurrent -package text -package util endif else -SRC_HC_OPTS += -syslib concurrent -syslib posix -syslib misc +SRC_HC_OPTS += -syslib concurrent -syslib posix -syslib misc -syslib util endif SRC_CC_OPTS += -Iparser -I. -I$(TOP)/includes -O @@ -193,10 +185,8 @@ SRC_HC_OPTS += -recomp $(GhcHcOpts) # Was 6m with 2.10 absCSyn/PprAbsC_HC_OPTS = -H10m -basicTypes/IdInfo_HC_OPTS = -K2m codeGen/CgCase_HC_OPTS = -fno-prune-tydecls -hsSyn/HsExpr_HC_OPTS = -K2m -main/Main_HC_OPTS = +main/Main_HC_OPTS = -fvia-C ifneq "$(GhcWithHscBuiltViaC)" "YES" ifeq "$(GhcReportCompiles)" "YES" @@ -204,36 +194,35 @@ main/Main_HC_OPTS += -syslib misc -DREPORT_TO_MOTHERLODE endif endif -main/CmdLineOpts_HC_OPTS = -K6m -nativeGen/PprMach_HC_OPTS = -K2m -nativeGen/MachMisc_HC_OPTS = -K2m nativeGen/MachCode_HC_OPTS = -H10m # Avoids Bug in 3.02, it seems usageSP/UsageSPInf_HC_OPTS = -Onot -prelude/PrimOp_HC_OPTS = -H12m -K3m +prelude/PrimOp_HC_OPTS = -H12m -no-recomp # because the NCG can't handle the 64-bit math in here prelude/PrelRules_HC_OPTS = -fvia-C -parser/Lex_HC_OPTS = -K2m -H16m -parser/Ctype_HC_OPTS = -K2m +rename/ParseIface_HC_OPTS += -Onot -H45m -fno-warn-incomplete-patterns -rename/ParseIface_HC_OPTS += -Onot -H45m -K2m -fno-warn-incomplete-patterns +parser/Parser_HC_OPTS += -Onot -fno-warn-incomplete-patterns -parser/Parser_HC_OPTS += -Onot -H80m -optCrts-M80m -K2m -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. +ifeq "$(ghc_411_at_least)" "0" +rename/ParseIface_HC_OPTS += -K2m +parser/Parser_HC_OPTS += -K2m +endif ifeq "$(TARGETPLATFORM)" "hppa1.1-hp-hpux9" rename/RnMonad_HC_OPTS = -O2 -O2-for-C endif -rename/RnEnv_HC_OPTS = rename/RnSource_HC_OPTS = -H12m rename/RnIfaces_HC_OPTS = -H8m rename/RnExpr_HC_OPTS = -H10m rename/RnNames_HC_OPTS = -H12m -rename/RnMonad_HC_OPTS = specialise/Specialise_HC_OPTS = -Onot -H12m simplCore/Simplify_HC_OPTS = -H15m simplCore/OccurAnal_HC_OPTS = -H10m @@ -259,21 +248,14 @@ typecheck/TcExpr_HC_OPTS = -H15m typecheck/TcBinds_HC_OPTS = -H10m typecheck/TcEnv_HC_OPTS = -H10m -utils/SST_HC_OPTS = utils/StringBuffer_HC_OPTS = -fvia-C -fno-prune-tydecls utils/Digraph_HC_OPTS = -fglasgow-exts -utils/DirUtils_HC_OPTS = # 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 -ifeq "$(alpha_HOST_ARCH)" "1" -# "stbu" bug in alpha native code generator... -basicTypes/Unique_HC_OPTS = -endif - # flags for PrimPacked: # # -monly-3-regs @@ -286,14 +268,14 @@ endif # 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 -optC-funfolding-interface-threshold7 +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 -stgSyn/StgInterp_HC_OPTS = -fvia-C +ghci/StgInterp_HC_OPTS = -fvia-C # ---------------------------------------------------------------------------- # C compilations @@ -351,30 +333,12 @@ primop-primop-info.hs-incl: prelude/primops.txt # ---------------------------------------------------------------------------- # Parsers/lexers -parser/hschooks.o : parser/hschooks.c - @$(RM) $@ - $(HC) -c -o $@ $(HC_OPTS) parser/hschooks.c - - -# Interface-file parser uses Happy SRC_HAPPY_OPTS += +RTS -K2m -H16m -RTS $(GHC_HAPPY_OPTS) -rename/ParseIface.hs : rename/ParseIface.y - @$(RM) rename/ParseIface.hs rename/ParseIface.hinfo - $(HAPPY) $(HAPPY_OPTS) rename/ParseIface.y - @chmod 444 rename/ParseIface.hs - -parser/Parser.hs : parser/Parser.y - @$(RM) parser/Parser.hs parser/ParseIface.hinfo - $(HAPPY) $(HAPPY_OPTS) parser/Parser.y - @chmod 444 parser/Parser.hs - #----------------------------------------------------------------------------- # Linking SRC_LD_OPTS += -no-link-chk -# REMOVED SLPJ -# -ldl ifneq "$(GhcWithHscBuiltViaC)" "YES" ifeq "$(GhcReportCompiles)" "YES" @@ -434,18 +398,6 @@ install :: INSTALL_PROGS += $(HS_PROG) #----------------------------------------------------------------------------- -# depend - -# -# Before doing `make depend', need to build all derived Haskell source files -# -depend :: $(LOOPS) - -ifneq "$(GhcWithHscBuiltViaC)" "YES" -depend :: rename/ParseIface.hs -endif - -#----------------------------------------------------------------------------- # clean CLEAN_FILES += $(wildcard */*.$(way_)o */*.$(way_)hi) @@ -453,20 +405,10 @@ 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 - -#----------------------------------------------------------------------------- -# TAGS setup - -SRC_HSTAGS_OPTS += -fglasgow-exts -cpp -TAGS_HS_SRCS=$(foreach dir,$(DIRS),$(wildcard $(dir)/*.lhs)) -TAGS_C_SRCS=$(strip $(foreach f,$(foreach dir,$(DIRS),$(wildcard $(dir)/*.c)),$(shell if [ -w $(f) ]; then echo $(f); else echo ''; fi))) - #----------------------------------------------------------------------------- # Include target-rule boilerplate include $(TOP)/mk/target.mk - -parser/%.o : parser/%.c -