X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=0bb394c3854a4219865657074072740f12b97ec1;hb=33939049908879995854acac39c3c85e250d1f9a;hp=b0b54d0a9bf27698c6c2fd2fe23c161f4694812c;hpb=1fb1ab5d53a09607e7f6d2450806760688396387;p=ghc-hetmet.git

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index b0b54d0..0bb394c 100644
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.8 1997/03/14 07:55:43 simonpj Exp $
+# $Id: Makefile,v 1.38 1998/04/16 10:04:12 sof Exp $
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
@@ -21,10 +21,25 @@ endif
 # (included below) to kick in.
 
 LIBRARY=libhsp.a
+
+#
+# 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 
+# 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
+# equivalent of `env' if it doesn't exist locally).
+#
 HS_PROG=hsc
 
 
 # -----------------------------------------------------------------------------
+#		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
 #
 # First figure out DIRS, the source sub-directories
@@ -37,17 +52,8 @@ DIRS = \
   reader profiling parser
 
 
-ifeq ($(GhcWithDeforester),YES)
-  DIRS += deforest
-endif
-
 ifeq ($(GhcWithNativeCodeGen),YES)
-  ifeq ($(GhcWithHscBuiltViaC),YES)
-    # If building via C, we *assume* that it is the distributed C files,
-    # which do not have a native-code generator in them
-  else
-    DIRS += nativeGen
-  endif
+DIRS += nativeGen
 else
 SRC_HC_OPTS += -DOMIT_NATIVE_CODEGEN
 endif
@@ -55,21 +61,20 @@ endif
 
 HS_SRCS = $(SRCS_UGNHS) \
           $(foreach dir,$(DIRS),$(wildcard $(dir)/*.lhs)) \
-	  rename/ParseIface.hs rename/ParseType.hs rename/ParseUnfolding.hs \
-	  main/LoopHack.hc 
+	  rename/ParseIface.hs
 
 # NB: it's no good to include *.hs in the top-line wildcard, because the .hs files
 #     in parser/ may not have been created at that point.
 
-LOOPS   = $(patsubst %.lhi, %.hi, $(wildcard */*.lhi))
-HCS     = $(patsubst %.lhs, %.hc, $(patsubst %.hs, %.hc, $(HS_SRCS)))
+HCS      = $(patsubst %.lhs, %.hc, $(patsubst %.hs, %.hc, $(HS_SRCS)))
+
 
 HS_OBJS  = \
   $(patsubst %.hc, %.o, $(HCS)) \
   parser/hsclink.o parser/hschooks.o libhsp.a
 
 
-DESTDIR         = $(INSTALL_LIBRARY_DIR_GHC)
+DESTDIR       = $(INSTALL_LIBRARY_DIR_GHC)
 
 SRCS_UGN      = $(wildcard parser/*.ugn)
 SRCS_UGNC     = $(patsubst %.ugn, %.c, $(SRCS_UGN))
@@ -92,7 +97,6 @@ LIBOBJS = \
 # stuff you get for free in a source distribution
 # 
 SRC_DIST_FILES += rename/ParseIface.hs \
- rename/ParseType.hs rename/ParseUnfolding.hs \
  parser/U_tree.c parser/tree.h parser/tree.c \
  parser/hsparser.tab.c parser/hsparser.tab.h \
  parser/hslexer.c
@@ -100,42 +104,47 @@ SRC_DIST_FILES += rename/ParseIface.hs \
 # -----------------------------------------------------------------------------
 # 		Haskell compilations
 
-# Compiler to use for building hsc
 #
+# Compiler to use for building hsc, use the build tree
+# driver when booting.
+#
+ifneq "$(GhcWithHscBuiltViaC)" "YES"
 HC=$(WithGhcHc)
+else
+HC=$(GHC_DRIVER_DIR)/ghc
+endif
 
-SRC_HC_OPTS += \
-  -cpp -fhaskell-1.3 -syslib ghc \
-  -fglasgow-exts -DCOMPILING_GHC -Rghc-timing -I. -IcodeGen \
-  -InativeGen -Iparser $(foreach dir,$(DIRS),-i$(dir))
-
-# -syslib ghc just needed for utils/CharSeq.lhs use of PackedString.hPutPS
-
-
-SRC_CC_OPTS += -Iparser -I.
+# magic from GNU make manual to convert a list of values
+# into a colon-separated list
+empty:=
+space:= $(empty) $(empty)
 
-ifneq ($(Ghc2_0),NO)
-  SRC_HC_OPTS += -fomit-derived-read -fomit-reexported-instances
-endif
+SRC_HC_OPTS += \
+  -cpp -fglasgow-exts -Rghc-timing \
+  -I. -IcodeGen -InativeGen -Iparser \
+  -i$(subst $(space),:,$(DIRS))
 
-ifeq ($(GhcWithDeforester),NO)
-  SRC_HC_OPTS += -DOMIT_DEFORESTER
-endif
+SRC_CC_OPTS += -Iparser -I. -I$(TOP)/includes -O
 
-SRC_HC_OPTS += $(GhcHcOpts)
+SRC_HC_OPTS += -recomp $(GhcHcOpts)
 
 # 	Special flags for particular modules
 #	The standard suffix rule for compiling a Haskell file
 #	adds these flags to the command line
 
-absCSyn/AbsCSyn_HC_OPTS 	= -fno-omit-reexported-instances
+absCSyn/CStrings_HC_OPTS 	= -monly-3-regs
+
+# Was 6m with 2.10
+absCSyn/PprAbsC_HC_OPTS 	= -H10m
+
 basicTypes/IdInfo_HC_OPTS 	= -K2m
-coreSyn/AnnCoreSyn_HC_OPTS 	= -fno-omit-reexported-instances
 hsSyn/HsExpr_HC_OPTS 		= -K2m
-hsSyn/HsSyn_HC_OPTS 		= -fno-omit-reexported-instances
-main/Main_HC_OPTS 		= -fvia-C
+main/Main_HC_OPTS 		= -fvia-C -DPROJECTVERSION=$(GhcProjectVersion)
+main/MkIface_HC_OPTS            = -DPROJECTVERSION=$(GhcProjectVersionInt)
 main/CmdLineOpts_HC_OPTS 	= -fvia-C
 nativeGen/PprMach_HC_OPTS 	= -K2m
+nativeGen/MachMisc_HC_OPTS 	= -K2m -fvia-C
+nativeGen/MachCode_HC_OPTS 	= -H10m
 parser/UgenAll_HC_OPTS 		= -fvia-C '-\#include"hspincl.h"'
 parser/UgenUtil_HC_OPTS 	= -fvia-C '-\#include"hspincl.h"'
 parser/U_constr_HC_OPTS 	= -fvia-C '-\#include"hspincl.h"'
@@ -147,35 +156,49 @@ parser/U_literal_HC_OPTS 	= -fvia-C '-\#include"hspincl.h"'
 parser/U_maybe_HC_OPTS 		= -fvia-C '-\#include"hspincl.h"'
 parser/U_either_HC_OPTS 	= -fvia-C '-\#include"hspincl.h"'
 parser/U_qid_HC_OPTS 		= -fvia-C '-\#include"hspincl.h"'
-parser/U_tree_HC_OPTS 		= -fvia-C '-\#include"hspincl.h"'
+parser/U_tree_HC_OPTS 		= -H12m -fvia-C '-\#include"hspincl.h"'
 parser/U_ttype_HC_OPTS 		= -fvia-C '-\#include"hspincl.h"'
-prelude/PrimOp_HC_OPTS 		= -K3m
-reader/Lex_HC_OPTS		= -K2m
-reader/ReadPrefix_HC_OPTS 	= -fvia-C '-\#include"hspincl.h"'
-rename/ParseIface_HC_OPTS 	= -Onot -H16m
-rename/ParseType_HC_OPTS 	= -Onot -H16m
-rename/ParseUnfolding_HC_OPTS 	= -Onot -H16m
+prelude/PrimOp_HC_OPTS 		= -H12m -K3m
+reader/Lex_HC_OPTS		= -K2m -H16m -fvia-C -DPROJECTVERSION=$(GhcProjectVersionInt)
+
+# Heap was 6m with 2.10
+reader/ReadPrefix_HC_OPTS 	= -fvia-C '-\#include"hspincl.h"' -H10m
+
+rename/ParseIface_HC_OPTS 	+= -Onot -H30m -fno-warn-incomplete-patterns
+rename/ParseIface_HAPPY_OPTS    += -g
+
 ifeq "$(TARGETPLATFORM)" "hppa1.1-hp-hpux9"
 rename/RnMonad_HC_OPTS 		= -fvia-C -O2 -O2-for-C
 else
-rename/RnMonad_HC_OPTS 		= -fvia-C
 endif
 rename/RnEnv_HC_OPTS 		= -fvia-C
 rename/RnSource_HC_OPTS		= -H12m
 rename/RnIfaces_HC_OPTS		= -H8m -fvia-C
+rename/RnExpr_HC_OPTS		= -H10m
 rename/RnNames_HC_OPTS		= -H12m
+rename/RnMonad_HC_OPTS		= -fvia-C
 specialise/Specialise_HC_OPTS 	= -Onot -H12m
-stgSyn/StgSyn_HC_OPTS 		= -fno-omit-reexported-instances
-typecheck/TcMonad_HC_OPTS 	= -fvia-C
 typecheck/TcGenDeriv_HC_OPTS	= -H10m
-typecheck/TcExpr_HC_OPTS	= -H10m
-utils/Argv_HC_OPTS 		= -fvia-C
-utils/CharSeq_HC_OPTS 		= -fvia-C
+
+# Was 10m for 2.10
+typecheck/TcHsSyn_HC_OPTS	= -H15m	
+
+# Was 10m for 2.10
+typecheck/TcExpr_HC_OPTS	= -H15m
+
+typecheck/TcEnv_HC_OPTS		= -H10m
+utils/Argv_HC_OPTS 		= -fvia-C -monly-3-regs
 utils/SST_HC_OPTS 		= -fvia-C
 utils/PrimPacked_HC_OPTS	= -fvia-C -monly-3-regs
-utils/FastString_HC_OPTS	= -fvia-C
-utils/StringBuffer_HC_OPTS	= -fvia-C
+utils/FastString_HC_OPTS	= -fvia-C -monly-3-regs
+utils/StringBuffer_HC_OPTS	= -fvia-C -fno-prune-tydecls
+utils/Digraph_HC_OPTS		= -fglasgow-exts -fvia-C
+utils/Outputable_HC_OPTS	= -monly-3-regs
 
+# 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
 
 # ----------------------------------------------------------------------------
 #		C compilations
@@ -184,15 +207,17 @@ SRC_C_OPTS     += -O -Iparser -I. -IcodeGen
 
 
 # ----------------------------------------------------------------------------
-#		Parsers
+#		Parsers/lexers
 
 # Main parser uses Yacc/Bison
 SRC_YACC_OPTS  += -d -v
+# Suppress the generation of a default rule
+SRC_FLEX_OPTS += -s
 
 #
 # Want to keep the intermediate (included in src distribs).
 #
-.PRECIOUS: parser/%.tab.c parser/hslexer.c
+.PRECIOUS: %.tab.c %.tab.h parser/hslexer.c
 
 parser/hschooks.o : parser/hschooks.c
 	@$(RM) $@
@@ -207,16 +232,6 @@ rename/ParseIface.hs : rename/ParseIface.y
 	$(HAPPY) $(HAPPY_OPTS) -g rename/ParseIface.y
 	@chmod 444 rename/ParseIface.hs
 
-rename/ParseType.hs : rename/ParseType.y
-	@$(RM) rename/ParseType.hs rename/ParseType.hinfo
-	$(HAPPY) $(HAPPY_OPTS) -g rename/ParseType.y
-	@chmod 444 rename/ParseType.hs
-
-rename/ParseUnfolding.hs : rename/ParseUnfolding.y
-	@$(RM) rename/ParseUnfolding.hs rename/ParseUnfolding.hinfo
-	$(HAPPY) $(HAPPY_OPTS) -g rename/ParseUnfolding.y
-	@chmod 444 rename/ParseUnfolding.hs
-
 #----------------------------------------------------------------------
 #
 # Building the stand-alone parser
@@ -226,36 +241,13 @@ all :: hsp
 hsp: parser/printtree.o parser/main.o libhsp.a 
 	$(CC) -o $@ $(CC_OPTS) $^
 
-#-----------------------------------------------------------------------------
-# 		Interface files
-
-# LoopHack.lhc is an SLPJ addition to fix a profiling problem.  See comments
-# inside it. (compilation is handled by the suffix rules).
-
-#
-# Building the loop breakers from .lhi files
-#
-ifeq ($(Ghc2_0),YES)
-  %.hi : %_1_3.lhi
-	$(RM) $@
-	$(UNLIT) $<  $@ || ( $(RM) $@ && exit 1 )
-	@chmod 444 $@
-else
-  %.hi : %.lhi
-	$(RM) $@
-	$(UNLIT) $<  $@ || ( $(RM) $@ && exit 1 )
-	@chmod 444 $@
-endif
+CLEAN_FILES += hsp
 
 #-----------------------------------------------------------------------------
 # 		Linking
 
 SRC_LD_OPTS += -no-link-chk
 
-# Build-specific
-#SRC_LD_OPTS += "-pgml time gcc -B/projects/unsupported/gnu/sparc-sunos5/bin/g"
-
-
 #-----------------------------------------------------------------------------
 # 		install
 
@@ -268,34 +260,10 @@ INSTALL_LIBEXECS += hsc hsp
 #-----------------------------------------------------------------------------
 # 		depend
 
-# If we're using a 1.2 compiler to compile the compiler, need the old mkdepend stuff
-#
-# ToDo: define sep MKDEPENDHS_1.2 variable so that it can be readily overridden
-# in a build.mk file.
-#
-ifeq ($(Ghc2_0),NO)
-MKDEPENDHS      = $(MKDEPENDHS_1_2)
-endif
-
 #
 # Before doing `make depend', need to build all derived Haskell source files
 #
-depend :: $(LOOPS) $(SRCS_UGNHS) rename/ParseIface.hs rename/ParseUnfolding.hs rename/ParseType.hs
-
-ifeq ($(GhcWithDeforester),NO)
-  SRC_MKDEPENDHS_OPTS += -DOMIT_DEFORESTER
-endif
-
-ifeq ($(Ghc2_0),YES)
-SRC_MKDEPENDHS_OPTS += $(SRC_HC_OPTS)
-endif
-
-ifeq ($(GhcWithHscBuiltViaC),YES)
-  SRC_MKDEPENDHS_OPTS += -o .hc
-else
-  SRCS_MKDEPENDHS = $(SRCS_HC) # should add $(LOOPS) ?
-endif
-
+depend :: $(LOOPS) $(SRCS_UGNHS) rename/ParseIface.hs
 
 #-----------------------------------------------------------------------------
 # 		clean
@@ -310,16 +278,18 @@ MAINTAINER_CLEAN_FILES += $(wildcard */*.hc)
 
 
 #-----------------------------------------------------------------------------
-# 		TAGS
+# 		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
 
+
 #
 # Special extra dependencies for yukky ugen stuff
 #