X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=13a5bf332f40c6f3c71c44f497c936527ef26a33;hb=c00120a25c064f01e272cd5d1972caa760809d94;hp=724cbbcddbb857ecdda956a885fbb0bd27f9d1ed;hpb=77a8c0dbd5c5ad90fe483cb9ddc2b6ef36d3f4d8;p=ghc-hetmet.git

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 724cbbc..13a5bf3 100644
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,34 +1,76 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.83 2000/07/14 08:17:36 simonpj Exp $
+# $Id: Makefile,v 1.151 2001/04/03 12:55:01 rrt Exp $
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
 
 #-----------------------------------------------------------------------------
-# Building hsc different ways (default is just `normal' sequential)
+# Building ghc different ways (default is just `normal' sequential)
 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 hsc with all its constituent object files. The likely source of 
+# when linking ghc with all its constituent object files. The likely source of 
 # the problem is that the environment is a bit too big, so a workaround could
-# be to do ` env PATH=$(PATH) make hsc 'to minimise the environment. (or the
+# be to do ` env PATH=$(PATH) make ghc 'to minimise the environment. (or the
 # equivalent of `env' if it doesn't exist locally).
 #
-HS_PROG=hsc$(_way)
-
+ifneq "$(way)" "dll"
+HS_PROG=ghc$(_way)-$(ProjectVersion)
+else
+HS_PROG=ghc-$(ProjectVersion)
+endif
 
 # -----------------------------------------------------------------------------
-#		Compilation history for Patrick
-
-# Make the sources first, because that's what the compilation history needs
-$(HS_PROG) :: $(HS_SRCS)
-
+# Create compiler configuration
+
+CURRENT_DIR	= ghc/compiler
+CONFIG_HS 	= main/Config.hs
+boot :: $(CONFIG_HS)
+
+$(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile
+	@$(RM) -f $(CONFIG_HS)
+	@echo -n "Creating $(CONFIG_HS) ... "
+	@echo "module Config where" >>$(CONFIG_HS)
+	@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)
+	@echo "cCURRENT_DIR          = \"$(CURRENT_DIR)\"" >> $(CONFIG_HS)
+	@echo "cGHC_LIB_DIR          = \"$(GHC_LIB_DIR)\"" >> $(CONFIG_HS)
+	@echo "cGHC_RUNTIME_DIR      = \"$(GHC_RUNTIME_DIR)\"" >> $(CONFIG_HS)
+	@echo "cGHC_UTILS_DIR        = \"$(GHC_UTILS_DIR)\"" >> $(CONFIG_HS)
+	@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)
+	@echo "cGHC_SPLIT            = \"$(GHC_SPLIT)\"" >> $(CONFIG_HS)
+	@echo "cGHC_SYSMAN           = \"$(GHC_SYSMAN)\"" >> $(CONFIG_HS)
+	@echo "cEnableWin32DLLs      = \"$(EnableWin32DLLs)\"" >> $(CONFIG_HS)
+	@echo "cCP                   = \"$(CP)\"" >> $(CONFIG_HS)
+	@echo "cRM                   = \"$(RM)\"" >> $(CONFIG_HS)
+	@echo "cCONTEXT_DIFF         = \"$(CONTEXT_DIFF)\"" >> $(CONFIG_HS)
+	@echo "cHaveLibGmp           = \"$(HaveLibGmp)\"" >> $(CONFIG_HS)
+	@echo "cUSER_WAY_NAMES       = \"$(USER_WAY_NAMES)\"" >> $(CONFIG_HS)
+	@echo "cUSER_WAY_OPTS        = \"$(USER_WAY_OPTS)\"" >> $(CONFIG_HS)
+	@echo "cDEFAULT_TMPDIR       = \"$(DEFAULT_TMPDIR)\"" >> $(CONFIG_HS)
+	@echo "cRAWCPP               = \"$(RAWCPP)\"" >> $(CONFIG_HS)
+	@echo done.
+
+CLEAN_FILES += $(CONFIG_HS)
 
 # -----------------------------------------------------------------------------
-# 		Set SRCS, LOOPS, HCS, OBJS
+# 		Set SRCS, HCS, OBJS
 #
 # First figure out DIRS, the source sub-directories
 # Then derive SRCS by looking in them
@@ -37,38 +79,52 @@ $(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 javaGen
-
+  profiling parser usageSP cprAnalysis javaGen compMan
 
 ifeq ($(GhcWithNativeCodeGen),YES)
 DIRS += nativeGen
 else
 SRC_HC_OPTS += -DOMIT_NATIVE_CODEGEN
+endif
+
 ifeq ($(GhcWithIlx),YES)
 DIRS += ilxGen
 SRC_HC_OPTS += -DILX
 endif
+
+ifeq "$(BootingFromHc)" "YES"
+# HC files are always from a self-booted compiler
+ghc_411_at_least = 1
+else
+ghc_411_at_least = $(shell expr "$(GhcMinVersion)" \>= 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
+DIRS += ghci
+endif
+endif
 
-HS_SRCS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.lhs))
+HS_SRCS := $(foreach dir,$(DIRS),$(wildcard $(dir)/*.lhs) $(wildcard $(dir)/*.hs))
+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)))
 
-# ParseIface.hs ain't part of HS_SRCS when this is on..
-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  = \
   $(patsubst %.hc, %.o, $(HCS)) \
   parser/hschooks.o
 
-
 DESTDIR       = $(INSTALL_LIBRARY_DIR_GHC)
 
 #
@@ -80,23 +136,25 @@ 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)
-
-# stuff you get for free in a source distribution
-# 
-# SRC_DIST_FILES += rename/ParseIface.hs rename/Parser.hs
+SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(GHC_INCLUDES)
 
 # -----------------------------------------------------------------------------
 # 		Haskell compilations
 
 #
-# Compiler to use for building hsc, use the build tree
+# Compiler to use for building ghc, use the build tree
 # driver when booting.
 #
-ifneq "$(GhcWithHscBuiltViaC)" "YES"
-HC=$(WithGhcHc)
+HC=$(GHC)
+
+#
+# Use GHC for compiling C bits
+#
+ifeq "$(BootingFromHc)" "YES"
+SRC_CC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt)
 else
-HC=$(GHC_INPLACE)
+CC = $(HC)
+CC_OPTS := $(addprefix -optc, $(CC_OPTS))
 endif
 
 # magic from GNU make manual to convert a list of values
@@ -109,97 +167,46 @@ SRC_HC_OPTS += \
   -I. -IcodeGen -InativeGen -Iparser \
   -i$(subst $(space),:,$(DIRS)) 
 
-SRC_CC_OPTS += -Iparser -I. -I$(TOP)/includes -O
+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
+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
+# not sure if this is required --SDM
+main/Main_HC_OPTS 		= -fvia-C
 
-basicTypes/IdInfo_HC_OPTS 	= -K2m
-codeGen/CgCase_HC_OPTS		= -fno-prune-tydecls
-hsSyn/HsExpr_HC_OPTS 		= -K2m
-main/Main_HC_OPTS 		= 
-main/Constants_HC_OPTS		= -DHscIfaceFileVersion=$(HscIfaceFileVersion)
+prelude/PrimOp_HC_OPTS 		= -no-recomp -H80m
 
-ifneq "$(GhcWithHscBuiltViaC)" "YES"
-ifeq "$(GhcReportCompiles)" "YES"
-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
+# because the NCG can't handle the 64-bit math in here
 prelude/PrelRules_HC_OPTS	= -fvia-C
 
-parser/Lex_HC_OPTS		= -fvia-C -K2m -H16m 
-parser/Ctype_HC_OPTS		= -K2m -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
 
-rename/ParseIface_HC_OPTS 	+= -Onot -H45m -K2m -fno-warn-incomplete-patterns
-rename/ParseIface_HAPPY_OPTS    += -g
-
-parser/Parser_HC_OPTS 		+= -Onot -H80m -optCrts-M80m -K2m -fno-warn-incomplete-patterns
-parser/Parser_HAPPY_OPTS    	+= -g
+# 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
-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/Argv_HC_OPTS 		= -fvia-C
-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  (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	= 
-endif
 
 # flags for PrimPacked:
 #
@@ -207,18 +214,15 @@ endif
 #	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
 
-utils/PrimPacked_HC_OPTS	= -fvia-C -monly-3-regs -optC-funfolding-interface-threshold7
+# ByteCodeItbls uses primops that the NCG doesn't support yet.
+ghci/ByteCodeItbls_HC_OPTS	= -fvia-C
 
-# 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
+# CSE interacts badly with the top-level IORefs in DriverState, 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 on this module.
+main/DriverState_HC_OPTS	= -fno-cse
 
 # ----------------------------------------------------------------------------
 #		C compilations
@@ -227,79 +231,100 @@ SRC_C_OPTS     += -O -I. -IcodeGen
 
 
 # ----------------------------------------------------------------------------
-#		Parsers/lexers
+#		Generate supporting stuff for prelude/PrimOp.lhs 
+#		from prelude/primops.txt
+
+GENPOC=$(TOP)/utils/genprimopcode/genprimopcode
+
+PRIMOP_BITS=primop-data-decl.hs-incl \
+            primop-tag.hs-incl  \
+            primop-list.hs-incl  \
+            primop-has-side-effects.hs-incl  \
+            primop-out-of-line.hs-incl  \
+            primop-commutable.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
+
+ifneq "$(BootingFromHc)" "YES"
+prelude/PrimOp.lhs prelude/PrimOp.o: $(PRIMOP_BITS)
+endif
 
-parser/hschooks.o : parser/hschooks.c
-	@$(RM) $@
-	$(HC) -c -o $@ $(HC_OPTS) parser/hschooks.c
+ifneq "$(BootingFromHc)" "YES"
+depend :: $(PRIMOP_BITS)
+endif
 
+primop-data-decl.hs-incl: prelude/primops.txt
+	$(GENPOC) --data-decl          < $< > $@
+primop-tag.hs-incl: prelude/primops.txt
+	$(GENPOC) --primop-tag         < $< > $@
+primop-list.hs-incl: prelude/primops.txt
+	$(GENPOC) --primop-list        < $< > $@
+primop-has-side-effects.hs-incl: prelude/primops.txt
+	$(GENPOC) --has-side-effects   < $< > $@
+primop-out-of-line.hs-incl: prelude/primops.txt
+	$(GENPOC) --out-of-line        < $< > $@
+primop-commutable.hs-incl: prelude/primops.txt
+	$(GENPOC) --commutable         < $< > $@
+primop-needs-wrapper.hs-incl: prelude/primops.txt
+	$(GENPOC) --needs-wrapper      < $< > $@
+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 < $< > $@
 
-# Interface-file parser uses Happy
-SRC_HAPPY_OPTS += +RTS -K2m -H16m -RTS
 
-rename/ParseIface.hs : rename/ParseIface.y
-	@$(RM) rename/ParseIface.hs rename/ParseIface.hinfo
-	$(HAPPY) $(HAPPY_OPTS) -g rename/ParseIface.y
-	@chmod 444 rename/ParseIface.hs
 
-parser/Parser.hs : parser/Parser.y
-	@$(RM) parser/Parser.hs parser/ParseIface.hinfo
-	$(HAPPY) $(HAPPY_OPTS) -g parser/Parser.y
-	@chmod 444 parser/Parser.hs
+# ----------------------------------------------------------------------------
+#		Parsers/lexers
+
+SRC_HAPPY_OPTS += +RTS -K2m -H16m -RTS  $(GHC_HAPPY_OPTS)
 
 #-----------------------------------------------------------------------------
 # 		Linking
 
-SRC_LD_OPTS += -no-link-chk
+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...
 
-#-----------------------------------------------------------------------------
-# 		install
+all :: ghc-inplace
 
-# We don't want hsc treated as an ordinary executable,
-# but put it together with the libraries.
-# Also don't want any interface files intstalled
+ghc-inplace : $(HS_PROG)
+	@$(RM) $@
+	echo '#!/bin/sh' >>$@
+	echo exec $(FPTOOLS_TOP_ABS_UNIX)/ghc/compiler/$(HS_PROG) -B$(FPTOOLS_TOP_ABS) '"$$@"' >>$@
+	chmod 755 $@
 
-INSTALL_LIBEXECS += hsc
+CLEAN_FILES += ghc-inplace
 
 #-----------------------------------------------------------------------------
-# 		depend
+# 		install
 
-#
-# Before doing `make depend', need to build all derived Haskell source files
-#
-depend :: $(LOOPS)
+# We don't want ghc treated as an ordinary executable,
+# but put it together with the libraries.
+# Also don't want any interface files intstalled
 
-ifneq "$(GhcWithHscBuiltViaC)" "YES"
-depend :: rename/ParseIface.hs
-endif
+INSTALL_LIBEXECS += $(HS_PROG)
 
 #-----------------------------------------------------------------------------
 # 		clean
 
 CLEAN_FILES += $(wildcard */*.$(way_)o */*.$(way_)hi)
+CLEAN_FILES += $(PRIMOP_BITS)
 
 # Extra tidy, remove the .hc files (if you've got them).
 MAINTAINER_CLEAN_FILES += $(wildcard */*.hc) \
-	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)))
+	parser/Parser.info rename/ParseIface.info main/ParsePkgConf.info \
+	parser/Parser.hs rename/ParseIface.hs main/ParsePkgConf.hs
 
 #-----------------------------------------------------------------------------
 # 		Include target-rule boilerplate
 
 include $(TOP)/mk/target.mk
-
-parser/%.o : parser/%.c
-