X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=50c801efb0db5bcb68baf36a55be2324db0f6791;hb=980f56ed05fe6665e73d130cc99de6390095c2d7;hp=813dbfb6f4df4bc2c478be9c0845d1c65c673586;hpb=d9f244327ee88e6e71624b89f51982288059fe94;p=ghc-hetmet.git

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 813dbfb..1cf49d9 100644
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,305 +1,450 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.110 2000/11/07 14:01:53 simonmar Exp $
+# Main ghc/compiler Makefile
+
+# Targets:
+#
+#	all	builds stage1 compiler
+#
+#	boot stage=N   generate build dirs and dependencies for stage N.
+#		       NB. Must be done before 'make stageN'.
+#		       NB. Cannot 'make boot stage=2' until stage1 has
+#		           been built (similarly for stage3).
+#
+#	stage1  (or stage=1) builds stage1 compiler
+#	stage2  (or stage=2) builds stage2 compiler
+#	stage3  (or stage=3) builds stage3 compiler
+#
 
 TOP = ..
+
+# Use GHC for compiling C bits (NB. must be before boilerplate include)
+#
+UseGhcForCc = YES
+
 include $(TOP)/mk/boilerplate.mk
 
 #-----------------------------------------------------------------------------
+# Counting source code lines
+
+USER_SRCS = $(filter-out $(DERIVED_SRCS),$(SRCS))
+count :
+	./count_lines $(USER_SRCS)
+
+#-----------------------------------------------------------------------------
 # Building ghc different ways (default is just `normal' sequential)
+
 WAYS=$(GhcCompilerWays)
 
 # -----------------------------------------------------------------------------
-#		Set HS_PROG, LIBRARY
+# Bootstrapping
+
+# The stage1/stage2/stage3 business is quite delicate.  Here's how it works:
+# 
+#  - the variable $(stage) holds the current stage number.  To build a 
+#    particular stage, you say 'make stage=N' where N is 1, 2, or 3.
+#    N defaults to 1.
+#
+#  - for stage N, object files and .hi files are placed inside 
+#    the directory stageN, in subdirectories as per the sources.
+#
+#  - .hi-boot files are *linked* into the stageN tree, because in GHC 5.05+
+#    the .hi-boot file must reside in the same place as the .hi file.
+#
+#  - we use explicit -o and -ohi options to direct the output from C & 
+#    Haskell compilations.
+#
+#  - we generate a different .depend file for each build.  They need to be
+#    different, because each stage might include different files: stage1
+#    might not include GHCi, for example.  For each stage, a normal .depend
+#    file is generated, and then post-processed to add the correct stageN/
+#    prefix to each object and .hi filename.  The resulting .depend file
+#    is named .depend-$(stage).  See the end of this Makefile for details.
+#
+#  - normal implicit rules don't work any more, because they're of the form
+#
+#        %.o : %.hs 
+#
+#    whereas we really need 
+#
+#	 stageN/%.o : %.hs
+#
+#    so suffix.mk now defines the appropriate suffix rules when
+#    $(odir) is set to a non-empty value.  Here we set $(odir) to
+#    stage1, stage2, or stage3.
+#
+#  There are other plausible designs that might work, but each has different
+#  problems:
+#
+#  - using -odir and -hidir: GHC <= 4.08 doesn't support -hidir, and
+#    anyway -odir puts all the objects in one directory (strips off the
+#    subdirectory part), which eventually forces us to use VPATH to find
+#    the sources.  I have a really bad feeling about VPATH.
+#
+#  - invoke make in the stageN subdirectory.  This probably requires VPATH
+#    too.
+#
+#  - create a link tree.  The problem with requiring link trees is that 
+#    Windows doesn't support symbolic links.
+
+boot ::
+	$(MKDIRHIER) stage$(stage)
+	for i in $(ALL_DIRS); do \
+	    $(MKDIRHIER) stage$(stage)/$$i; \
+	done
+# On Windows, we can't use symbolic links for the -hi-boot files
+# because GHC itself is a Mingw program and does not understand
+# symbolic links.  So we have to copy the files instead of link them.
+# That means that if you modify a .hi-boot file in Windows, you
+# have to to say 'make boot' again.
+#
+# PS: 'ln -s foo baz' takes 'foo' relative to the path to 'baz'
+#     whereas 'cp foo baz' treats the two paths independently.
+#     Hence the "../.." in the ln command line
+ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+	for i in */*hi-boot*; do \
+	    cp -u -f $$i stage$(stage)/$$i; \
+	done
+else
+	for i in */*hi-boot*; do \
+	    $(LN_S) -f ../../$$i stage$(stage)/$$i || true ; \
+	done
+endif
+
+ifeq "$(stage)" ""
+stage=1
+endif
+
+ifeq "$(stage)" "1"
+HC=$(GHC)
+endif
+
+ifeq "$(stage)" "2"
+HC=$(GHC_STAGE1)
+endif
+
+ifeq "$(stage)" "3"
+HC=$(GHC_STAGE2)
+endif
+
+stage1 ::
+	$(MAKE) stage=1
+
+stage2 ::
+	$(MAKE) stage=2
+
+stage3 ::
+	$(MAKE) stage=3
+
+odir=stage$(stage)
+
+SRC_HC_OPTS += $(patsubst %, -i$(odir)/%, $(ALL_DIRS))
+
+HS_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(HS_SRCS))))
+C_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(C_SRCS))))
+
+CLEAN_FILES += $(odir)/*/*.hi
+
+ifeq "$(stage)" "1"
+mostlyclean clean distclean maintainer-clean ::
+	$(MAKE) $@ stage=2
+	$(MAKE) $@ stage=3
+endif
+
+# -----------------------------------------------------------------------------
+#		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 
 # the problem is that the environment is a bit too big, so a workaround could
-# be to do ` env PATH=$(PATH) make ghc '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).
 #
+ifneq "$(BuildPackageGHC)" "YES"
 ifneq "$(way)" "dll"
-HS_PROG=ghc$(_way)-$(ProjectVersion)
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+HS_PROG=$(odir)/ghc$(_way)-$(ProjectVersion)
 else
-HS_PROG=ghc-$(ProjectVersion)
+HS_PROG=$(odir)/ghc$(_way)
+endif
+else
+HS_PROG=$(odir)/ghc-$(ProjectVersion)
+endif
 endif
-
-LINK = ghc
 
 # -----------------------------------------------------------------------------
 # Create compiler configuration
+#
+# The 'echo' commands simply spit the values of various make variables
+# into Config.hs, whence they can be compiled and used by GHC itself
 
-CURRENT_DIR=ghc/compiler
-CONFIG_HS = main/Config.hs
+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 "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 "cProjectPatchLevel    = \"$(ProjectPatchLevel)\"" >> $(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 "cTARGETOS             = \"$(TargetOS_CPP)\"" >> $(CONFIG_HS)
+	@echo "cTARGETARCH           = \"$(TargetArch_CPP)\"" >> $(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_STATS            = \"$(GHC_STATS)\"" >> $(CONFIG_HS)
-	@echo "cGHC_SYSMAN           = \"$(GHC_SYSMAN)\"" >> $(CONFIG_HS)
+	@echo "cRAWCPP_FLAGS         = \"$(RAWCPP_FLAGS)\"" >> $(CONFIG_HS)
+	@echo "cGCC                  = \"$(WhatGccIsCalled)\"" >> $(CONFIG_HS)
+	@echo "cMKDLL                = \"$(BLD_DLL)\"" >> $(CONFIG_HS)
+	@echo "cPROJECT_DIR          = \"$(PROJECT_DIR)\"" >> $(CONFIG_HS)
+	@echo "cGHC_DRIVER_DIR_REL   = \"$(GHC_DRIVER_DIR_REL)\"" >> $(CONFIG_HS)
+	@echo "cGHC_TOUCHY_PGM       = \"$(GHC_TOUCHY_PGM)\"" >> $(CONFIG_HS)
+	@echo "cGHC_TOUCHY_DIR_REL   = \"$(GHC_TOUCHY_DIR_REL)\"" >> $(CONFIG_HS)
+	@echo "cGHC_UNLIT_PGM        = \"$(GHC_UNLIT_PGM)\"" >> $(CONFIG_HS)
+	@echo "cGHC_UNLIT_DIR_REL    = \"$(GHC_UNLIT_DIR_REL)\"" >> $(CONFIG_HS)
+	@echo "cGHC_MANGLER_PGM      = \"$(GHC_MANGLER_PGM)\"" >> $(CONFIG_HS)
+	@echo "cGHC_MANGLER_DIR_REL  = \"$(GHC_MANGLER_DIR_REL)\"" >> $(CONFIG_HS)
+	@echo "cGHC_SPLIT_PGM        = \"$(GHC_SPLIT_PGM)\"" >> $(CONFIG_HS)
+	@echo "cGHC_SPLIT_DIR_REL    = \"$(GHC_SPLIT_DIR_REL)\"" >> $(CONFIG_HS)
+	@echo "cGHC_SYSMAN_PGM       = \"$(GHC_SYSMAN)\"" >> $(CONFIG_HS)
+	@echo "cGHC_SYSMAN_DIR_REL   = \"$(GHC_SYSMAN_DIR)\"" >> $(CONFIG_HS)
+	@echo "cGHC_CP               = \"$(GHC_CP)\"" >> $(CONFIG_HS)
+	@echo "cGHC_PERL             = \"$(GHC_PERL)\"" >> $(CONFIG_HS)
+ifeq ($(GhcWithIlx),YES)
+	@echo "cILX2IL               = \"$(ILX2IL)\"" >> $(CONFIG_HS)
+	@echo "cILASM                = \"$(ILASM)\"" >> $(CONFIG_HS)
+endif
 	@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 "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.
 
 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
-#
-# First figure out DIRS, the source sub-directories
-# Then derive SRCS by looking in them
+# Set SRCS etc.
 #
+# First figure out ALL_DIRS, the source sub-directories
 
-DIRS = \
+ALL_DIRS = \
   utils basicTypes types hsSyn prelude rename typecheck deSugar coreSyn \
-  specialise simplCore stranal stgSyn simplStg codeGen absCSyn main \
-  profiling parser usageSP cprAnalysis javaGen compMan
+  specialise simplCore stranal stgSyn simplStg codeGen main \
+  profiling parser cprAnalysis compMan ndpFlatten iface cmm
+
+# Make sure we include Config.hs even if it doesn't exist yet...
+ALL_SRCS += $(CONFIG_HS)
+
+# HsGeneric.hs is not used just now
+EXCLUDED_SRCS += hsSyn/HsGeneric.hs
 
 ifeq ($(GhcWithNativeCodeGen),YES)
-DIRS += nativeGen
+ALL_DIRS += nativeGen
 else
 SRC_HC_OPTS += -DOMIT_NATIVE_CODEGEN
+endif
+
 ifeq ($(GhcWithIlx),YES)
-DIRS += ilxGen
+ALL_DIRS += ilxGen
 SRC_HC_OPTS += -DILX
 endif
+
+ifeq ($(GhcWithJavaGen),YES)
+ALL_DIRS += javaGen
+SRC_HC_OPTS += -DJAVA
 endif
 
-# Only include GHCi if we're bootstrapping with at least version 409
-ifeq "$(GhcWithInterpreter)" "YES"
-ghc_409_at_least = $(shell expr "$(GhcMinVersion)" \>= 9)
-ifeq "$(ghc_409_at_least)" "1"
-SRC_HC_OPTS += -DGHCI
-DIRS += ghci
+ifeq "$(BootingFromHc)" "YES"
+# HC files are always from a self-booted compiler
+bootstrapped = YES
+compiling_with_4xx=NO
+else
+ifneq "$(findstring $(stage), 2 3)" ""
+bootstrapped = YES
+compiling_with_4xx = NO
+else
+bootstrapped = $(shell if (test $(GhcCanonVersion) -ge $(ProjectVersionInt) -a $(GhcPatchLevel) -ge $(ProjectPatchLevel)); then echo YES; else echo NO; fi)
+compiling_with_4xx = $(shell if (test $(GhcCanonVersion) -lt 500); then echo YES; else echo NO; fi)
 endif
 endif
 
-HS_SRCS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.lhs) $(wildcard $(dir)/*.hs))
+# -----------------------------------------------------------------------------
+# Building a compiler with interpreter support
+#
+# The interpreter, GHCi interface, and Template Haskell are only
+# enabled when we are bootstrapping with the same version of GHC, and
+# the interpreter is supported on this platform.
 
-# ToDo: not clear why this is here -- messes up linking
-#ifneq "$(GhcWithHscBuiltViaC)" "YES"
-#HS_SRCS += rename/ParseIface.hs parser/Parser.hs
-#endif
+ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES"
 
-HCS      = $(patsubst %.lhs, %.hc, $(patsubst %.hs, %.hc, $(HS_SRCS)))
+# Yes, include the interepreter, readline, and Template Haskell extensions
+SRC_HC_OPTS += -DGHCI -package template-haskell
 
-# ParseIface.hs ain't part of HS_SRCS when this is on..
-ifeq "$(GhcWithHscBuiltViaC)" "YES"
-HCS      += rename/ParseIface.hc parser/Parser.hc
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+SRC_HC_OPTS += -package unix
 endif
 
-HS_OBJS  = \
-  $(patsubst %.hc, %.o, $(HCS)) \
-  parser/hschooks.o
-
-
-DESTDIR       = $(INSTALL_LIBRARY_DIR_GHC)
+ALL_DIRS += ghci
 
+# Enable readline if either:
+#   - we're building stage 1 and $(GhcHasReadline)="YES"
+#   - we're building stage 2/3, and we have built the readline package
 #
-# Add misc .c helper code (used by the frontend.)
+# But we don't enable readline on Windows, because readline is fairly
+# broken there.
 #
-C_SRCS += parser/hschooks.c
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+ifeq "$(stage)" "1"
+ifeq "$(GhcHasReadline)" "YES"
+SRC_HC_OPTS += -package readline -DUSE_READLINE
+endif
+else
+ifeq "$(GhcLibsWithReadline)" "YES"
+SRC_HC_OPTS += -package readline -DUSE_READLINE
+endif
+endif # stage=1
+endif # not windows
 
+else
+
+# No interpreter, so exclude Template Haskell modules
+EXCLUDED_SRCS += deSugar/DsMeta.hs typecheck/TcSplice.lhs hsSyn/Convert.lhs
+
+endif # bootstrapped with interpreter
+
+# -----------------------------------------------
+# mkdependC stuff
 #
 # 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
+# XXX not really correct, hschooks.c actually gets include files like
+# RtsFlags.c from the installed GHC, but we can't tell mkdependC about that.
+SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR)
 
 # -----------------------------------------------------------------------------
 # 		Haskell compilations
 
-#
-# Compiler to use for building ghc, use the build tree
-# driver when booting.
-#
-ifneq "$(GhcWithHscBuiltViaC)" "YES"
-HC=$(GHC)
-else
-HC=$(GHC_INPLACE)
-endif
-
-# magic from GNU make manual to convert a list of values
-# into a colon-separated list
-empty:=
-space:= $(empty) $(empty)
-
 SRC_HC_OPTS += \
-  -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
+  -cpp -fglasgow-exts -fno-generics -Rghc-timing \
+  -I. -IcodeGen -InativeGen -Iparser
+
+# Omitted: 	-I$(GHC_INCLUDE_DIR)
+# We should have -I$(GHC_INCLUDE_DIR) in SRC_HC_OPTS, 
+# to avoid the use of an explicit path in GHC source files
+#	(include "../includes/config.h"
+# But alas GHC 4.08 (and others for all I know) uses this very
+# same include path when compiling the .hc files it generates.
+# Disaster!  Then the hc file sees the GHC 5.02 (or whatever)
+# include files.   For the moment we've reverted to using
+# an explicit path in the .hs sources
+#
+# For the benefit of <5.00 compilers, do include GHC_INCLUDE_DIR
+# when generating dependencies. (=> it gets passed onto mkdependHS,
+# which needs it).
+SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR)
+
+# When bootstrapped, we don't make use of *any* packages
+# (except possibly readline if GHCi is enabled, see above)
+ifneq "$(bootstrapped)" "YES"
+ifneq "$(mingw32_HOST_OS)" "1"
+SRC_HC_OPTS += -package concurrent -package posix -package util
 else
-SRC_HC_OPTS += -package concurrent -package text
+SRC_HC_OPTS += -package concurrent -package util
 endif
-else
-SRC_HC_OPTS += -syslib concurrent -syslib posix -syslib misc
 endif
 
-SRC_CC_OPTS += -Iparser -I. -I$(TOP)/includes -O
+SRC_CC_OPTS += -Iparser -I. -O
+SRC_HC_OPTS += -recomp $(GhcHcOpts) $(GhcStage$(stage)HcOpts)
+SRC_HC_OPTS += -H16M
 
-SRC_HC_OPTS += -recomp $(GhcHcOpts)
+ifeq "$(BootingFromHc)" "YES"
+SRC_CC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt)
+endif
 
 # 	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
-
-basicTypes/IdInfo_HC_OPTS 	= -K2m
-codeGen/CgCase_HC_OPTS		= -fno-prune-tydecls
-hsSyn/HsExpr_HC_OPTS 		= -K2m
-main/Main_HC_OPTS 		= 
-
-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 -no-recomp
+# There used to be a -no-recomp flag on PrimOp, but why?
+# It's an expensive module to recompile!
+prelude/PrimOp_HC_OPTS 		= -H80m
 
 # 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 -K2m -fno-warn-incomplete-patterns
+main/ParsePkgConf_HC_OPTS	+= -fno-warn-incomplete-patterns
+# Use -fvia-C since the NCG can't handle the narrow16Int# (and intToInt16#?)
+# primops on all platforms.
+parser/Parser_HC_OPTS 		+= -fno-warn-incomplete-patterns -fvia-C
 
-parser/Parser_HC_OPTS 		+= -Onot -H80m -optCrts-M80m -K2m -fno-warn-incomplete-patterns
+# Careful optimisation of the parser: we don't want to throw everything
+# at it, because that takes too long and doesn't buy much, but we do want
+# to inline certain key external functions, so we instruct GHC not to
+# throw away inlinings as it would normally do in -Onot mode:
+parser/Parser_HC_OPTS		+= -Onot -fno-ignore-interface-pragmas
 
-ifeq "$(TARGETPLATFORM)" "hppa1.1-hp-hpux9"
+ifeq "$(HOSTPLATFORM)" "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/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
+basicTypes/SrcLoc_HC_OPTS	= -funbox-strict-fields
 
-ifeq "$(alpha_HOST_ARCH)" "1"
-# "stbu" bug in alpha native code generator...
-basicTypes/Unique_HC_OPTS	= 
+ifeq "$(bootstrapped)" "YES"
+utils/Binary_HC_OPTS		= -funbox-strict-fields
 endif
 
-# 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 -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
-# separate bugfix to the fixpoint finder.
-simplStg/UpdAnal_HC_OPTS	= -fno-strictness
-
-ghci/StgInterp_HC_OPTS		= -fvia-C
+# 4.08.2's NCG can't cope with Binary
+ifeq "$(compiling_with_4xx)" "YES"
+utils/Binary_HC_OPTS		+= -fvia-C
+endif
 
-# ----------------------------------------------------------------------------
-#		C compilations
+# ByteCodeItbls uses primops that the NCG doesn't support yet.
+ghci/ByteCodeItbls_HC_OPTS	+= -fvia-C
+ghci/ByteCodeLink_HC_OPTS	+= -fvia-C -monly-3-regs
+
+# BinIface and Binary take ages to both compile and run if you don's use -O
+main/BinIface_HC_OPTS		+= -O
+utils/Binary_HC_OPTS		+= -O
+utils/FastMutInt_HC_OPTS	+= -O
+
+
+# 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/SysTools_HC_OPTS		= -fno-cse
+
+# The #include is vital for the via-C route, else the C
+# compiler doesn't realise that the stcall foreign imports are indeed
+# stdcall, and doesn't generate the Foo@8 name for them
+ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+main/SysTools_HC_OPTS		+= '-\#include <windows.h>' '-\#include <process.h>'
+endif
 
-SRC_C_OPTS     += -O -I. -IcodeGen
+parser/Lexer_HC_OPTS += -funbox-strict-fields
 
+# ghc_strlen percolates through so many modules that it is easier to get its
+# prototype via a global option instead of a myriad of per-file OPTIONS
+SRC_HC_OPTS += '-\#include "hschooks.h"'
 
 # ----------------------------------------------------------------------------
 #		Generate supporting stuff for prelude/PrimOp.lhs 
@@ -316,12 +461,21 @@ PRIMOP_BITS=primop-data-decl.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
 
-prelude/PrimOp.o: $(PRIMOP_BITS)
+CLEAN_FILES += prelude/primops.txt
+CLEAN_FILES += $(PRIMOP_BITS)
+
+SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR)
+SRC_CPP_OPTS += ${GhcCppOpts}
+
+ifneq "$(BootingFromHc)" "YES"
+prelude/PrimOp.lhs $(odir)/prelude/PrimOp.o: $(PRIMOP_BITS)
+endif
 
+ifneq "$(BootingFromHc)" "YES"
 depend :: $(PRIMOP_BITS)
+endif
 
 primop-data-decl.hs-incl: prelude/primops.txt
 	$(GENPOC) --data-decl          < $< > $@
@@ -341,132 +495,156 @@ 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 < $< > $@
 
+# Usages aren't used any more; but the generator 
+# can still generate them if we want them back
+primop-usage.hs-incl: prelude/primops.txt
+	$(GENPOC) --usage              < $< > $@
 
 
-# ----------------------------------------------------------------------------
-#		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"
-SRC_LD_OPTS += -syslib misc -syslib exts
-endif
+# Include libghccompat in stage1.  In stage2 onwards, all these libraries
+# will be available from the main libraries.
+ifeq "$(stage)" "1"
+SRC_HC_OPTS += -i$(GHC_LIB_COMPAT_DIR)
+SRC_LD_OPTS += -L$(GHC_LIB_COMPAT_DIR) -lghccompat
+SRC_MKDEPENDHS_OPTS += -optdep--exclude-module=Compat.RawSystem
 endif
 
+SRC_LD_OPTS += -no-link-chk 
+
 # -----------------------------------------------------------------------------
 # create ghc-inplace, a convenient way to run ghc from the build tree...
 
-all :: ghc-inplace
+all :: $(odir)/ghc-inplace ghc-inplace
 
-ghc-inplace : ghc
+$(odir)/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)/ghc/compiler/$(HS_PROG) '-B$(subst \,\\,$(FPTOOLS_TOP_ABS_PLATFORM))' '"$$@"' >>$@
 	chmod 755 $@
 
-CLEAN_FILES += ghc-inplace
+ghc-inplace : stage1/ghc-inplace
+	$(LN_S) -f $< $@
 
-# -----------------------------------------------------------------------------
-# 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;
+CLEAN_FILES += $(odir)/ghc-inplace ghc-inplace
 
 #-----------------------------------------------------------------------------
 # 		install
 
 # 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
+# Also don't want any interface files installed
 
+DESTDIR = $(INSTALL_LIBRARY_DIR_GHC)
+
+ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+INSTALL_LIBEXECS += $(HS_PROG)
+else
 INSTALL_PROGS += $(HS_PROG)
+endif
+
+# ----------------------------------------------------------------------------
+# profiling.
+
+# rename/RnBinds_HC_OPTS += -auto-all
+# rename/RnEnv_HC_OPTS += -auto-all
+# rename/RnExpr_HC_OPTS += -auto-all
+# rename/RnHiFiles_HC_OPTS += -auto-all
+# rename/RnHsSyn_HC_OPTS += -auto-all
+# rename/Rename_HC_OPTS += -auto-all
+# rename/RnIfaces_HC_OPTS += -auto-all
+# rename/RnNames_HC_OPTS += -auto-all
+# rename/RnSource_HC_OPTS += -auto-all
+# rename/RnTypes_HC_OPTS += -auto-all
+# 
+# typecheck/Inst_HC_OPTS += -auto-all
+# typecheck/TcBinds_HC_OPTS += -auto-all
+# typecheck/TcClassDcl_HC_OPTS += -auto-all
+# typecheck/TcDefaults_HC_OPTS += -auto-all
+# typecheck/TcDeriv_HC_OPTS += -auto-all
+# typecheck/TcEnv_HC_OPTS += -auto-all
+# typecheck/TcExpr_HC_OPTS += -auto-all
+# typecheck/TcForeign_HC_OPTS += -auto-all
+# typecheck/TcGenDeriv_HC_OPTS += -auto-all
+# typecheck/TcHsSyn_HC_OPTS += -auto-all
+# typecheck/TcIfaceSig_HC_OPTS += -auto-all
+# typecheck/TcInstDcls_HC_OPTS += -auto-all
+# typecheck/TcMatches_HC_OPTS += -auto-all
+# typecheck/TcMonoType_HC_OPTS += -auto-all
+# typecheck/TcMType_HC_OPTS += -auto-all
+# typecheck/TcPat_HC_OPTS += -auto-all
+# typecheck/TcRnDriver_HC_OPTS += -auto-all
+# #typecheck/TcRnMonad_HC_OPTS += -auto-all
+# #typecheck/TcRnTypes_HC_OPTS += -auto-all
+# typecheck/TcRules_HC_OPTS += -auto-all
+# typecheck/TcSimplify_HC_OPTS += -auto-all
+# typecheck/TcSplice_HC_OPTS += -auto-all
+# typecheck/TcTyClsDecls_HC_OPTS += -auto-all
+# typecheck/TcTyDecls_HC_OPTS += -auto-all
+# typecheck/TcType_HC_OPTS += -auto-all
+# typecheck/TcUnify_HC_OPTS += -auto-all
+
+coreSyn/CorePrep_HC_OPTS += -auto-all
 
 #-----------------------------------------------------------------------------
-# 		depend
+# Building GHC package
 
-#
-# Before doing `make depend', need to build all derived Haskell source files
-#
-depend :: $(LOOPS)
+ifeq "$(BuildPackageGHC)" "YES"
+
+PACKAGE = ghc
+STANDALONE_PACKAGE = YES
+PACKAGE_DEPS =
 
-ifneq "$(GhcWithHscBuiltViaC)" "YES"
-depend :: rename/ParseIface.hs
 endif
 
 #-----------------------------------------------------------------------------
 # 		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.info rename/ParseIface.info \
-	parser/Parser.hs rename/ParseIface.hs
+MAINTAINER_CLEAN_FILES += parser/Parser.info main/ParsePkgConf.info
 
 #-----------------------------------------------------------------------------
-# 		TAGS setup
+# 		Include target-rule boilerplate
+
+# Don't use the default MKDEPENDHS stuff... we'll do our own, below
+MKDEPENDHS_SRCS =
+MKDEPENDC_SRCS =
+
+# Make doesn't work this out for itself, it seems
+parser/Parser.y : parser/Parser.y.pp
+EXTRA_SRCS += parser/Parser.y
 
-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
+# 		Source files for tags file generation
+#
+# We want to excluded derived sources, because they won't be in the source
+# tree, which is where we are going to move the TAGS file to.a
+
+TAGS_HS_SRCS = parser/Parser.y.pp $(filter-out $(DERIVED_SRCS) main/Config.hs parser/Parser.y, $(sort $(SRCS)))
+
 
 include $(TOP)/mk/target.mk
 
-parser/%.o : parser/%.c
+# -----------------------------------------------------------------------------
+# Dependencies
+
+MKDEPENDHS_HC_OPTS = $(patsubst -i$(odir)/%, -i%, $(HC_OPTS))
+
+MKDEPENDHS=$(HC)
+
+# Must do this *after* including target.mk, because $(HS_SRCS) isn't set yet.
+depend :: $(HS_SRCS) $(C_SRCS)
+	touch .depend-BASE
+ifneq "$(BootingFromHc)" "YES"
+	$(MKDEPENDHS) -M -optdep-f -optdep.depend-BASE $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-osuf $(obj)) $(MKDEPENDHS_OPTS) $(filter-out -split-objs, $(MKDEPENDHS_HC_OPTS)) $(HS_SRCS)
+endif
+	$(MKDEPENDC) -f .depend-BASE $(MKDEPENDC_OPTS) $(foreach way,$(WAYS),-s $(way)) -- $(CC_OPTS) -- $(C_SRCS) 
+	$(PERL) -pe 'binmode(stdin); binmode(stdout); s@^(\S*\.o)@stage$(stage)/$$1@g; s@(\S*\.hi)@stage$(stage)/$$1@g' <.depend-BASE >.depend-$(stage)
+# The binmode stuff tells perl not to add stupid ^M's to the output
 
+-include .depend-$(stage)