X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=d496a0899252c06fefab63f6a82f207636b9d6e4;hb=d0bf18ef6ff50e8764231537f1052a81ac65b229;hp=ace5c941803604fb02d8171a4ef668ebe501e998;hpb=4d0bafc27aec0065b180b715d8cf3a360c304da6;p=ghc-hetmet.git

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index ace5c94..d496a08 100644
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,7 +1,14 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.116 2000/11/22 10:01:45 sewardj Exp $
+# $Id: Makefile,v 1.213 2002/03/04 17:01:27 simonmar Exp $
 
 TOP = ..
+
+# Use GHC for compiling C bits (NB. must be before boilerplate include)
+#
+ifneq "$(BootingFromHc)" "YES"
+UseGhcForCc = YES
+endif
+
 include $(TOP)/mk/boilerplate.mk
 
 #-----------------------------------------------------------------------------
@@ -9,27 +16,31 @@ 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 
 # 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 "$(way)" "dll"
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 HS_PROG=ghc$(_way)-$(ProjectVersion)
 else
+HS_PROG=ghc$(_way)
+endif
+else
 HS_PROG=ghc-$(ProjectVersion)
 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
@@ -39,110 +50,108 @@ $(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 "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 "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, 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
+  profiling parser usageSP cprAnalysis compMan ndpFlatten
+
+# Make sure we include Config.hs even if it doesn't exist yet...
+ALL_SRCS += $(CONFIG_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
+
+ifeq "$(BootingFromHc)" "YES"
+# HC files are always from a self-booted compiler
+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)
+ghc_502_at_least = $(shell if (test $(GhcCanonVersion) -ge 502); then echo YES; else echo NO; fi)
 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 -optc-DGHCI
-DIRS += ghci
+ifeq "$(bootstrapped)" "YES"
+SRC_HC_OPTS += -DGHCI
+ALL_DIRS += ghci
 endif
 endif
 
-HS_SRCS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.lhs) $(wildcard $(dir)/*.hs))
-
-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
+# Enable code that assumes a MSDOSish subshell. See mk/config.mk.in
+# for explanatory comment as to what this does.
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+ghc_501_at_least = $(shell if (test $(GhcVanonVersion) -ge 5010); then echo YES; else echo NO; fi)
 endif
 
-HS_OBJS  = \
-  $(patsubst %.hc, %.o, $(HCS)) \
-  parser/hschooks.o
-
-
-DESTDIR       = $(INSTALL_LIBRARY_DIR_GHC)
-
-#
-# Add misc .c helper code (used by the frontend.)
-#
-C_SRCS += parser/hschooks.c
+# There are some C files to include in HS_PROG, so add these to HS_OBJS
+HS_OBJS	 += $(C_OBJS)
 
+# -----------------------------------------------
+# 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
+SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(GHC_INCLUDE_DIR)
 
 # -----------------------------------------------------------------------------
 # 		Haskell compilations
@@ -151,11 +160,7 @@ SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt)
 # 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
@@ -163,112 +168,70 @@ empty:=
 space:= $(empty) $(empty)
 
 SRC_HC_OPTS += \
-  -cpp -fglasgow-exts \
-  -Rghc-timing -I. -IcodeGen -InativeGen -Iparser \
-  -i$(subst $(space),:,$(DIRS)) -O -H32m -prof
+  -cpp -fglasgow-exts -Rghc-timing \
+  -I. -IcodeGen -InativeGen -Iparser \
+  -i$(subst $(space),:,$(ALL_DIRS)) 
+
+# 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)
 
-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 -package util
-else
-SRC_HC_OPTS += -package concurrent -package text -package util
-endif
+SRC_HC_OPTS += -package concurrent -package posix -package util
 else
-SRC_HC_OPTS += -syslib concurrent -syslib posix -syslib misc -syslib util
+SRC_HC_OPTS += -package concurrent -package util
 endif
 
 SRC_CC_OPTS += -Iparser -I. -I$(TOP)/includes -O
-
 SRC_HC_OPTS += -recomp $(GhcHcOpts)
+SRC_HC_OPTS += -H16M
+
+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
+# not sure if this is required --SDM
 main/Main_HC_OPTS 		= -fvia-C
 
-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
+prelude/PrimOp_HC_OPTS 		= -no-recomp -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
-
-parser/Parser_HC_OPTS 		+= -Onot -H80m -optCrts-M80m -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.
+rename/ParseIface_HC_OPTS 	+= -Onot -H45m -fno-warn-incomplete-patterns -fvia-C
+parser/Parser_HC_OPTS 		+= -Onot -fno-warn-incomplete-patterns -fvia-C
+
+# 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 "$(compiling_with_4xx)" "YES"
+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/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:
 #
@@ -276,26 +239,33 @@ 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 -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
-
-# ----------------------------------------------------------------------------
-#		C compilations
-
-SRC_C_OPTS     += -O -I. -IcodeGen
-
+utils/PrimPacked_HC_OPTS	= -fvia-C -monly-3-regs
+
+# 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
+
+# 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 "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+main/SysTools_HC_OPTS		+= '-\#include <windows.h>' '-\#include <process.h>'
+endif
 
 # ----------------------------------------------------------------------------
 #		Generate supporting stuff for prelude/PrimOp.lhs 
@@ -315,9 +285,19 @@ PRIMOP_BITS=primop-data-decl.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) -traditional
+SRC_CPP_OPTS += ${GhcCppOpts}
 
+ifneq "$(BootingFromHc)" "YES"
+prelude/PrimOp.lhs prelude/PrimOp.o: $(PRIMOP_BITS)
+endif
+
+ifneq "$(BootingFromHc)" "YES"
 depend :: $(PRIMOP_BITS)
+endif
 
 primop-data-decl.hs-incl: prelude/primops.txt
 	$(GENPOC) --data-decl          < $< > $@
@@ -347,120 +327,56 @@ 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"
-SRC_LD_OPTS += -syslib misc -syslib exts
-endif
-endif
 
 # -----------------------------------------------------------------------------
 # create ghc-inplace, a convenient way to run ghc from the build tree...
 
 all :: ghc-inplace
 
-ghc-inplace : ghc
+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
 
-# -----------------------------------------------------------------------------
-# 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;
-
 #-----------------------------------------------------------------------------
 # 		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
 
-INSTALL_PROGS += $(HS_PROG)
+DESTDIR = $(INSTALL_LIBRARY_DIR_GHC)
 
-#-----------------------------------------------------------------------------
-# 		depend
-
-#
-# Before doing `make depend', need to build all derived Haskell source files
-#
-ifneq "$(GhcWithHscBuiltViaC)" "YES"
-depend :: rename/ParseIface.hs parser/Parser.hs
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+INSTALL_LIBEXECS += $(HS_PROG)
+else
+INSTALL_PROGS += $(HS_PROG)
 endif
 
-#-----------------------------------------------------------------------------
-# 		clean
-
-CLEAN_FILES += $(wildcard */*.$(way_)o */*.$(way_)hi)
-CLEAN_FILES += $(PRIMOP_BITS)
+# ----------------------------------------------------------------------------
+# profiling.
 
-# 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
+rename/Rename_HC_OPTS += -auto-all
+rename/RnEnv_HC_OPTS += -auto-all
+rename/RnHiFiles_HC_OPTS += -auto-all
+rename/RnSource_HC_OPTS += -auto-all
 
 #-----------------------------------------------------------------------------
-# 		TAGS setup
+# 		clean
 
-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)))
+MAINTAINER_CLEAN_FILES += \
+	parser/Parser.info rename/ParseIface.info main/ParsePkgConf.info
 
 #-----------------------------------------------------------------------------
 # 		Include target-rule boilerplate
 
 include $(TOP)/mk/target.mk
-
-parser/%.o : parser/%.c
-