X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=724cbbcddbb857ecdda956a885fbb0bd27f9d1ed;hb=77a8c0dbd5c5ad90fe483cb9ddc2b6ef36d3f4d8;hp=47cd2d7c8132cdf335abd4890e7052c7a0841ab6;hpb=09154162a43087c7a36cfea1eca22031693d5d51;p=ghc-hetmet.git diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index 47cd2d7..724cbbc 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------------- -# $Id: Makefile,v 1.61 1999/06/18 13:09:36 simonmar Exp $ +# $Id: Makefile,v 1.83 2000/07/14 08:17:36 simonpj Exp $ TOP = .. include $(TOP)/mk/boilerplate.mk @@ -8,13 +8,6 @@ include $(TOP)/mk/boilerplate.mk # Building hsc different ways (default is just `normal' sequential) WAYS=$(GhcCompilerWays) -#----------------------------------------------------------------------------- -# Set SUBDIRS - -ifeq ($(IncludeTestDirsInBuild),YES) - SUBDIRS = tests -endif - # ----------------------------------------------------------------------------- # Set HS_PROG, LIBRARY @@ -44,13 +37,17 @@ $(HS_PROG) :: $(HS_SRCS) DIRS = \ utils basicTypes types hsSyn prelude rename typecheck deSugar coreSyn \ specialise simplCore stranal stgSyn simplStg codeGen absCSyn main \ - profiling parser usageSP cprAnalysis + profiling parser usageSP cprAnalysis javaGen ifeq ($(GhcWithNativeCodeGen),YES) DIRS += nativeGen else SRC_HC_OPTS += -DOMIT_NATIVE_CODEGEN +ifeq ($(GhcWithIlx),YES) +DIRS += ilxGen +SRC_HC_OPTS += -DILX +endif endif @@ -69,7 +66,7 @@ endif HS_OBJS = \ $(patsubst %.hc, %.o, $(HCS)) \ - parser/ctypes.o parser/hschooks.o + parser/hschooks.o DESTDIR = $(INSTALL_LIBRARY_DIR_GHC) @@ -77,7 +74,7 @@ DESTDIR = $(INSTALL_LIBRARY_DIR_GHC) # # Add misc .c helper code (used by the frontend.) # -C_SRCS += parser/ctypes.c parser/hschooks.c +C_SRCS += parser/hschooks.c # # Big Fudge to get around inherent problem that Makefile setup @@ -87,10 +84,7 @@ SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) # stuff you get for free in a source distribution # -# SRC_DIST_FILES += rename/ParseIface.hs \ -# parser/U_tree.c parser/tree.h parser/tree.c \ -# parser/hsparser.tab.c parser/hsparser.tab.h \ -# parser/hslexer.c +# SRC_DIST_FILES += rename/ParseIface.hs rename/Parser.hs # ----------------------------------------------------------------------------- # Haskell compilations @@ -102,7 +96,7 @@ SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) ifneq "$(GhcWithHscBuiltViaC)" "YES" HC=$(WithGhcHc) else -HC=$(GHC_DRIVER_DIR)/ghc +HC=$(GHC_INPLACE) endif # magic from GNU make manual to convert a list of values @@ -113,7 +107,7 @@ space:= $(empty) $(empty) SRC_HC_OPTS += \ -cpp -fglasgow-exts -Rghc-timing \ -I. -IcodeGen -InativeGen -Iparser \ - -i$(subst $(space),:,$(DIRS)) + -i$(subst $(space),:,$(DIRS)) SRC_CC_OPTS += -Iparser -I. -I$(TOP)/includes -O @@ -129,7 +123,7 @@ 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 = -fvia-C +main/Main_HC_OPTS = main/Constants_HC_OPTS = -DHscIfaceFileVersion=$(HscIfaceFileVersion) ifneq "$(GhcWithHscBuiltViaC)" "YES" @@ -138,36 +132,39 @@ main/Main_HC_OPTS += -syslib misc -DREPORT_TO_MOTHERLODE endif endif -main/CmdLineOpts_HC_OPTS = -fvia-C -K6m +main/CmdLineOpts_HC_OPTS = -K6m nativeGen/PprMach_HC_OPTS = -K2m -nativeGen/MachMisc_HC_OPTS = -K2m -fvia-C +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 -parser/Lex_HC_OPTS = -K2m -H16m -fvia-C +prelude/PrelRules_HC_OPTS = -fvia-C -# -dcore-lint is *temporary* to work around ghc space leak. -rename/ParseIface_HC_OPTS += -Onot -H45m -dcore-lint -fno-warn-incomplete-patterns -dcore-lint +parser/Lex_HC_OPTS = -fvia-C -K2m -H16m +parser/Ctype_HC_OPTS = -K2m -fvia-C + +rename/ParseIface_HC_OPTS += -Onot -H45m -K2m -fno-warn-incomplete-patterns rename/ParseIface_HAPPY_OPTS += -g -parser/Parser_HC_OPTS += -Onot -H64m -K2m -dcore-lint -fno-warn-incomplete-patterns -dcore-lint +parser/Parser_HC_OPTS += -Onot -H80m -optCrts-M80m -K2m -fno-warn-incomplete-patterns parser/Parser_HAPPY_OPTS += -g ifeq "$(TARGETPLATFORM)" "hppa1.1-hp-hpux9" -rename/RnMonad_HC_OPTS = -fvia-C -O2 -O2-for-C +rename/RnMonad_HC_OPTS = -O2 -O2-for-C endif -rename/RnEnv_HC_OPTS = -fvia-C +rename/RnEnv_HC_OPTS = rename/RnSource_HC_OPTS = -H12m -rename/RnIfaces_HC_OPTS = -H8m -fvia-C +rename/RnIfaces_HC_OPTS = -H8m rename/RnExpr_HC_OPTS = -H10m rename/RnNames_HC_OPTS = -H12m -rename/RnMonad_HC_OPTS = -fvia-C +rename/RnMonad_HC_OPTS = specialise/Specialise_HC_OPTS = -Onot -H12m simplCore/Simplify_HC_OPTS = -H15m +simplCore/OccurAnal_HC_OPTS = -H10m typecheck/TcGenDeriv_HC_OPTS = -H10m # tmp, -- SDM @@ -191,15 +188,17 @@ typecheck/TcBinds_HC_OPTS = -H10m typecheck/TcEnv_HC_OPTS = -H10m utils/Argv_HC_OPTS = -fvia-C -utils/SST_HC_OPTS = -fvia-C -utils/FastString_HC_OPTS = -fvia-C +utils/SST_HC_OPTS = utils/StringBuffer_HC_OPTS = -fvia-C -fno-prune-tydecls -utils/Digraph_HC_OPTS = -fglasgow-exts -fvia-C -utils/DirUtils_HC_OPTS = -fvia-C +utils/Digraph_HC_OPTS = -fglasgow-exts +utils/DirUtils_HC_OPTS = + +# temporary, due to bug in NCG (SDM, 1/6/2000) +utils/FastString_HC_OPTS = -fvia-C ifeq "$(alpha_HOST_ARCH)" "1" # "stbu" bug in alpha native code generator... -basicTypes/Unique_HC_OPTS = -fvia-C +basicTypes/Unique_HC_OPTS = endif # flags for PrimPacked: @@ -208,13 +207,13 @@ endif # because it contains a 'ccall strlen', which gets inlined by # gcc, causing a lack of registers. # -# -optC-funfolding-interface-threshold10 +# -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 -optC-funfolding-interface-threshold10 +utils/PrimPacked_HC_OPTS = -fvia-C -monly-3-regs -optC-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 @@ -232,11 +231,11 @@ SRC_C_OPTS += -O -I. -IcodeGen parser/hschooks.o : parser/hschooks.c @$(RM) $@ - $(HC) -c -o $@ -I$(GHC_INCLUDE_DIR) $(HC_OPTS) parser/hschooks.c + $(HC) -c -o $@ $(HC_OPTS) parser/hschooks.c # Interface-file parser uses Happy -SRC_HAPPY_OPTS += +RTS -K2m -H10m -RTS +SRC_HAPPY_OPTS += +RTS -K2m -H16m -RTS rename/ParseIface.hs : rename/ParseIface.y @$(RM) rename/ParseIface.hs rename/ParseIface.hinfo @@ -286,7 +285,8 @@ endif CLEAN_FILES += $(wildcard */*.$(way_)o */*.$(way_)hi) # Extra tidy, remove the .hc files (if you've got them). -MAINTAINER_CLEAN_FILES += $(wildcard */*.hc) +MAINTAINER_CLEAN_FILES += $(wildcard */*.hc) \ + parser/Parser.hs rename/ParseIface.hs #-----------------------------------------------------------------------------