1531 files changed, 626 insertions, 1150 deletions

diff --git a/ghc/ANNOUNCE b/ANNOUNCE
index c5cbae687f..c5cbae687f 100644
--- a/ghc/ANNOUNCE
+++ b/ANNOUNCE
diff --git a/ghc/HACKING b/HACKING
index 8b26ef40a1..cbff47d6db 100644
--- a/ghc/HACKING
+++ b/HACKING
@@ -175,6 +175,13 @@ A rough roadmap to the source tree:
 Resources
 ---------
 
+The GHC Developer's Wiki
+
+   The home for GHC Developers, with information on accessing the latest sources,
+   the bug tracker, and further documentation on the code.
+   http://hackage.haskell.org/trac/ghc
+
+
 The Building Guide
 
    Full documentation on the build system.
diff --git a/ghc/InstallShield/Component Definitions/Default.cdf b/InstallShield/Component Definitions/Default.cdf
index 011554a913..011554a913 100644
--- a/ghc/InstallShield/Component Definitions/Default.cdf
+++ b/InstallShield/Component Definitions/Default.cdf
diff --git a/ghc/InstallShield/Component Definitions/Default.fgl b/InstallShield/Component Definitions/Default.fgl
index 5b73147452..5b73147452 100644
--- a/ghc/InstallShield/Component Definitions/Default.fgl
+++ b/InstallShield/Component Definitions/Default.fgl
diff --git a/ghc/InstallShield/File Groups/Default.fdf b/InstallShield/File Groups/Default.fdf
index eddf00ec71..eddf00ec71 100644
--- a/ghc/InstallShield/File Groups/Default.fdf
+++ b/InstallShield/File Groups/Default.fdf
diff --git a/ghc/InstallShield/File Groups/HTML Help Files.fgl b/InstallShield/File Groups/HTML Help Files.fgl
index bf792474d5..bf792474d5 100644
--- a/ghc/InstallShield/File Groups/HTML Help Files.fgl
+++ b/InstallShield/File Groups/HTML Help Files.fgl
diff --git a/ghc/InstallShield/File Groups/PDF Help Files.fgl b/InstallShield/File Groups/PDF Help Files.fgl
index 32199b630f..32199b630f 100644
--- a/ghc/InstallShield/File Groups/PDF Help Files.fgl
+++ b/InstallShield/File Groups/PDF Help Files.fgl
diff --git a/ghc/InstallShield/File Groups/Profiling Libraries.fgl b/InstallShield/File Groups/Profiling Libraries.fgl
index 8614722c73..8614722c73 100644
--- a/ghc/InstallShield/File Groups/Profiling Libraries.fgl
+++ b/InstallShield/File Groups/Profiling Libraries.fgl
diff --git a/ghc/InstallShield/File Groups/Program Executable Files.fgl b/InstallShield/File Groups/Program Executable Files.fgl
index 14790cd555..14790cd555 100644
--- a/ghc/InstallShield/File Groups/Program Executable Files.fgl
+++ b/InstallShield/File Groups/Program Executable Files.fgl
diff --git a/ghc/InstallShield/Glasgow Haskell Compiler.ipr b/InstallShield/Glasgow Haskell Compiler.ipr
index e9412ec8fb..e9412ec8fb 100644
--- a/ghc/InstallShield/Glasgow Haskell Compiler.ipr
+++ b/InstallShield/Glasgow Haskell Compiler.ipr
diff --git a/ghc/InstallShield/README b/InstallShield/README
index 81a1c70357..81a1c70357 100644
--- a/ghc/InstallShield/README
+++ b/InstallShield/README
diff --git a/ghc/InstallShield/Registry Entries/Default.rge b/InstallShield/Registry Entries/Default.rge
index f73a93c2a4..f73a93c2a4 100644
--- a/ghc/InstallShield/Registry Entries/Default.rge
+++ b/InstallShield/Registry Entries/Default.rge
diff --git a/ghc/InstallShield/Script Files/Setup.Inx b/InstallShield/Script Files/Setup.Inx
index 4aef7fa618..4aef7fa618 100644
--- a/ghc/InstallShield/Script Files/Setup.Inx
+++ b/InstallShield/Script Files/Setup.Inx
diff --git a/ghc/InstallShield/Script Files/Setup.Obs b/InstallShield/Script Files/Setup.Obs
index 53425bdaea..53425bdaea 100644
--- a/ghc/InstallShield/Script Files/Setup.Obs
+++ b/InstallShield/Script Files/Setup.Obs
diff --git a/ghc/InstallShield/Script Files/Setup.dbg b/InstallShield/Script Files/Setup.dbg
index 7c86870878..7c86870878 100644
--- a/ghc/InstallShield/Script Files/Setup.dbg
+++ b/InstallShield/Script Files/Setup.dbg
diff --git a/ghc/InstallShield/Script Files/Setup.ino b/InstallShield/Script Files/Setup.ino
index 421984ed6b..421984ed6b 100644
--- a/ghc/InstallShield/Script Files/Setup.ino
+++ b/InstallShield/Script Files/Setup.ino
diff --git a/ghc/InstallShield/Script Files/Setup.ins b/InstallShield/Script Files/Setup.ins
index 156a8eecdc..156a8eecdc 100644
--- a/ghc/InstallShield/Script Files/Setup.ins
+++ b/InstallShield/Script Files/Setup.ins
diff --git a/ghc/InstallShield/Script Files/Setup.map b/InstallShield/Script Files/Setup.map
index 3039284bcd..3039284bcd 100644
--- a/ghc/InstallShield/Script Files/Setup.map
+++ b/InstallShield/Script Files/Setup.map
diff --git a/ghc/InstallShield/Script Files/setup.rul b/InstallShield/Script Files/setup.rul
index 28fc24aa2e..28fc24aa2e 100644
--- a/ghc/InstallShield/Script Files/setup.rul
+++ b/InstallShield/Script Files/setup.rul
diff --git a/ghc/InstallShield/Setup Files/Compressed Files/Language Independent/OS Independent/ANNOUNCE b/InstallShield/Setup Files/Compressed Files/Language Independent/OS Independent/ANNOUNCE
index 87417db348..87417db348 100644
--- a/ghc/InstallShield/Setup Files/Compressed Files/Language Independent/OS Independent/ANNOUNCE
+++ b/InstallShield/Setup Files/Compressed Files/Language Independent/OS Independent/ANNOUNCE
diff --git a/ghc/InstallShield/Setup Files/Compressed Files/Language Independent/OS Independent/_IsUser.dll b/InstallShield/Setup Files/Compressed Files/Language Independent/OS Independent/_IsUser.dll
index 836275022b..836275022b 100644
--- a/ghc/InstallShield/Setup Files/Compressed Files/Language Independent/OS Independent/_IsUser.dll
+++ b/InstallShield/Setup Files/Compressed Files/Language Independent/OS Independent/_IsUser.dll
diff --git a/ghc/InstallShield/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp b/InstallShield/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp
index 82459b0a38..82459b0a38 100644
--- a/ghc/InstallShield/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp
+++ b/InstallShield/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp
diff --git a/ghc/InstallShield/Shell Objects/Default.shl b/InstallShield/Shell Objects/Default.shl
index 8ba3176785..8ba3176785 100644
--- a/ghc/InstallShield/Shell Objects/Default.shl
+++ b/InstallShield/Shell Objects/Default.shl
diff --git a/ghc/InstallShield/String Tables/0009-English/value.shl b/InstallShield/String Tables/0009-English/value.shl
index 17ffc5217b..17ffc5217b 100644
--- a/ghc/InstallShield/String Tables/0009-English/value.shl
+++ b/InstallShield/String Tables/0009-English/value.shl
diff --git a/ghc/InstallShield/String Tables/Default.shl b/InstallShield/String Tables/Default.shl
index 2d5860379b..2d5860379b 100644
--- a/ghc/InstallShield/String Tables/Default.shl
+++ b/InstallShield/String Tables/Default.shl
diff --git a/ghc/InstallShield/Text Substitutions/Build.tsb b/InstallShield/Text Substitutions/Build.tsb
index 786d796baf..786d796baf 100644
--- a/ghc/InstallShield/Text Substitutions/Build.tsb
+++ b/InstallShield/Text Substitutions/Build.tsb
diff --git a/ghc/InstallShield/Text Substitutions/Setup.tsb b/InstallShield/Text Substitutions/Setup.tsb
index 41ab3803c7..41ab3803c7 100644
--- a/ghc/InstallShield/Text Substitutions/Setup.tsb
+++ b/InstallShield/Text Substitutions/Setup.tsb
diff --git a/ghc/InstallShield/decyg.pl b/InstallShield/decyg.pl
index 7bcfd7e285..7bcfd7e285 100644
--- a/ghc/InstallShield/decyg.pl
+++ b/InstallShield/decyg.pl
diff --git a/ghc/InstallShield/runexe.c b/InstallShield/runexe.c
index c1becfbcaa..c1becfbcaa 100644
--- a/ghc/InstallShield/runexe.c
+++ b/InstallShield/runexe.c
diff --git a/ghc/LICENSE b/LICENSE
index b5059b71f6..b5059b71f6 100644
--- a/ghc/LICENSE
+++ b/LICENSE
diff --git a/Makefile b/Makefile
index a8350fa24d..c1ff5a7f23 100644
--- a/Makefile
+++ b/Makefile
@@ -1,93 +1,100 @@
 ############################################################################
 #
-#			fptools/Makefile
+#		This is the top-level Makefile for GHC
 #
-#		This is the main Makefile for fptools.
+# Targets: 
+#
+# 	bootsrap (DEFAULT)
+#		Builds GHC, then builds the libraries,
+#		then uses this GHC ("stage 1") to build itself
+#		("stage 2").
+#
+#	bootstrap2
+#		Same as bootstrap
+#
+#	bootstrap3
+#		bootstrap2 + we build GHC one more time ("stage 3")
+#
+#	stage1
+#		Just build up to stage 1
+#
+#	stage2
+#		Just build stage 2 (stage 1 must be built)
+#
+#	stage3
+#		Just build stage 3 (stage 2 must be built)
+#
+#	all
+#		Same as bootstrap
+#
+#       install
+#		Install everything, including stage 2 compiler by default
+#		(override with stage=3, for example).
+#
+#	dist
+#		Make a source dist (WARNING: runs 'make distclean' first)
+#
+#	binary-dist
+#		Builds a binary distribution
+#
+#	hc-file-bundle
+#		Builds an HC-file bundle, for bootstrapping
+#
+#	clean, distclean, maintainer-clean
+#		Increasing levels of cleanliness
 #
 ############################################################################
 
 TOP=.
 include $(TOP)/mk/boilerplate.mk
 
-# find the projects that actually exist...
-ProjectsThatExist = $(filter $(patsubst %/, %, $(wildcard */)), $(AllProjects))
-
-# and filter only those that the user requested, if necessary
-ifeq "$(ProjectsToBuild)" ""
-SUBDIRS = $(ProjectsThatExist)
-else
-SUBDIRS = $(filter $(ProjectsToBuild), $(ProjectsThatExist))
-endif
-
-ifneq "$(Project)" ""
-   ifeq "$(Project)" "GreenCard"
-       ProjectDirectory=greencard
-   else
-	ifeq "$(Project)" "HaskellDirect"
-		ProjectDirectory=hdirect
-	else
-		ProjectDirectory=$(Project)
-	endif
-   endif
-   -include $(shell echo $(ProjectDirectory) | tr A-Z a-z)/mk/config.mk
-   -include $(shell echo $(ProjectDirectory) | tr A-Z a-z)/mk/version.mk
-endif
-
-# -----------------------------------------------------------------------------
-# Certain targets require that Project is set from the command line.
-
-CURRENT_TARGET = $(MAKECMDGOALS)
-project-check :
-	@if [ "$(Project)" = "" ]; then \
-		echo "	You need to set \"Project\" in order to make $(CURRENT_TARGET)"; \
-		echo "	eg. make $(CURRENT_TARGET) Project=Ghc"; \
-		exit 1; \
-	fi
-
-# -----------------------------------------------------------------------------
-# Targets: all, stage1, stage2, stage3
-
-DIST_CLEAN_FILES += config.cache config.status mk/config.h mk/stamp-h
-
-extraclean::
-	$(RM) -rf autom4te.cache
-
 #
-# If you've ended up using an in-place version of Happy,
-# make sure it gets built early on.
+# Order is important! It's e.g. necessary to descend into include/
+# before the rest to have a config.h, etc.
 #
-ifeq "$(HAPPY)" "$(FPTOOLS_TOP_ABS)/happy/src/happy-inplace"
-build :: $(FPTOOLS_TOP_ABS)/happy/src/happy-inplace
+# If we're booting from .hc files, swap the order
+# we descend into subdirs - to boot utils must be before driver.
+#
+.PHONY: stage1 stage2 stage3 bootstrap bootstrap2 bootstrap3
 
-$(FPTOOLS_TOP_ABS)/happy/src/happy-inplace : glafp-utils
-	$(MAKE) -C happy boot all
+# We can't 'make boot' in libraries until stage1 is built
+ifeq "$(BootingFromHc)" "YES"
+SUBDIRS_NOLIB = includes rts docs compiler compat utils driver
+else
+SUBDIRS_NOLIB = includes compat utils driver docs compiler rts
 endif
 
-# Build all projects that we know about
-build ::
+SUBDIRS = $(SUBDIRS_NOLIB) libraries
+
+stage1 :
+	$(MAKE) -C utils/mkdependC boot
 	@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
-	for i in $(SUBDIRS); do \
-	   if [ -d $$i ]; then \
-	      $(MAKE) -C $$i boot; \
-	      if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
-	      $(MAKE) -C $$i all; \
-	      if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
-	      fi; \
+	for i in $(SUBDIRS_NOLIB); do \
+	  echo "------------------------------------------------------------------------"; \
+	  echo "== $(MAKE) boot $(MFLAGS);"; \
+	  echo " in $(shell pwd)/$$i"; \
+	  echo "------------------------------------------------------------------------"; \
+	  $(MAKE) --no-print-directory -C $$i $(MFLAGS) boot; \
+	  if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
+	done; \
+	for i in $(SUBDIRS_NOLIB); do \
+	  echo "------------------------------------------------------------------------"; \
+	  echo "== $(MAKE) all $(MFLAGS);"; \
+	  echo " in $(shell pwd)/$$i"; \
+	  echo "------------------------------------------------------------------------"; \
+	  $(MAKE) --no-print-directory -C $$i $(MFLAGS) all; \
+	  if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
 	done
-
-ifeq "$(findstring ghc, $(SUBDIRS))" "ghc"
-
-.PHONY: stage1 stage2 stage3 bootstrap bootstrap2 bootstrap3
-
-stage1 : build
+	@$(MAKE) -C libraries boot
+	@$(MAKE) -C libraries all
 
 stage2 :
-	$(MAKE) -C ghc/compiler boot stage=2
-	$(MAKE) -C ghc/compiler stage=2
+	$(MAKE) -C compiler boot stage=2
+	$(MAKE) -C compiler stage=2
 
 stage3 :
-	$(MAKE) -C ghc/compiler boot stage=3
-	$(MAKE) -C ghc/compiler stage=3
+	$(MAKE) -C compiler boot stage=3
+	$(MAKE) -C compiler stage=3
 
 bootstrap  : bootstrap2
 
@@ -99,6 +106,9 @@ bootstrap3 : bootstrap2
 
 all :: bootstrap
 
+# -----------------------------------------------------------------------------
+# Installing
+
 # We want to install the stage 2 bootstrapped compiler by default, but we let
 # the user override this by saying 'make install stage=1', for example.
 ifeq "$(stage)" ""
@@ -107,27 +117,25 @@ else
 INSTALL_STAGE =
 endif
 
-else # Not building GHC
-
-all :: build
-
-INSTALL_STAGE =
-
-endif
-
-boot ::
-	@echo "Please use \`make all' only from the top-level, or \`make boot' followed"
-	@echo "by \`make all' in an individual project subdirectory (ghc, hslibs etc.)."
-
+# Same as default rule, but we pass $(INSTALL_STAGE) to $(MAKE) too
 install ::
 	@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
-	for i in $(filter-out $(ProjectsDontInstall), $(SUBDIRS)); do \
-	   if [ -d $$i ]; then \
-	      $(MAKE) -C $$i $(INSTALL_STAGE) install; \
-	      if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
-	      fi; \
+	for i in $(SUBDIRS); do \
+	  echo "------------------------------------------------------------------------"; \
+	  echo "== $(MAKE) $@ $(MFLAGS);"; \
+	  echo " in $(shell pwd)/$$i"; \
+	  echo "------------------------------------------------------------------------"; \
+	  $(MAKE) --no-print-directory -C $$i $(INSTALL_STAGE) $(MFLAGS) $@; \
+	  if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
 	done
 
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+# These files need to be in the InstallShield
+# INSTALL_DATAS rather than INSTALL_DOCS is used so these files go
+# in the top-level directory of the distribution
+INSTALL_DATAS += ANNOUNCE LICENSE README VERSION
+endif
+
 # If installing on Windows with MinGW32, copy the gcc compiler, headers and libs
 # and the perl interpreter and dll into the GHC prefix directory.
 # Gcc and Perl source locations derived from configuration data.
@@ -152,11 +160,13 @@ endif
 
 install-docs ::
 	@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
-	for i in $(filter-out $(ProjectsDontInstall), $(SUBDIRS)); do \
-	   if [ -d $$i ]; then \
-	      $(MAKE) -C $$i $(INSTALL_STAGE) install-docs; \
-	      if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
-	      fi; \
+	for i in $(SUBDIRS); do \
+	  echo "------------------------------------------------------------------------"; \
+	  echo "== $(MAKE) $@ $(MFLAGS);"; \
+	  echo " in $(shell pwd)/$$i"; \
+	  echo "------------------------------------------------------------------------"; \
+	  $(MAKE) --no-print-directory -C $$i $(INSTALL_STAGE) $(MFLAGS) $@; \
+	  if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
 	done
 
 # -----------------------------------------------------------------------------
@@ -185,7 +195,18 @@ install-docs ::
 #	binary-dist is an FPtools addition for binary distributions
 # 
 
-binary-dist :: project-check
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+GhcBinDistShScripts = ghc-$(ProjectVersion) ghci-$(ProjectVersion) ghc-pkg-$(ProjectVersion) hsc2hs
+else
+GhcBinDistShScripts =
+endif
+
+GhcBinDistPrlScripts = ghcprof
+GhcBinDistLibPrlScripts = ghc-asm ghc-split
+GhcBinDistBins = hp2ps runghc
+GhcBinDistOptBins = runhaskell
+GhcBinDistLinks = ghc ghci ghc-pkg
+GhcBinDistLibSplicedFiles = package.conf
 
 BIN_DIST_TMPDIR=$(FPTOOLS_TOP_ABS)
 BIN_DIST_NAME=$(ProjectNameShort)-$(ProjectVersion)
@@ -391,7 +412,7 @@ binary-dist::
 # Do it like this: 
 #
 #	$ make
-#	$ make dist Project=Ghc
+#	$ make dist
 #
 # WARNING: `make dist' calls `make distclean' before tarring up the tree.
 #
@@ -453,30 +474,42 @@ dist-package-zip ::
 hc-file-bundle : project-check
 	$(RM) -r $(ProjectNameShort)-$(ProjectVersion)
 	$(LN_S) . $(ProjectNameShort)-$(ProjectVersion)
-	$(FIND) $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler \
-	     $(ProjectNameShort)-$(ProjectVersion)/ghc/utils \
-	     $(ProjectNameShort)-$(ProjectVersion)/ghc/lib \
+	$(FIND) $(ProjectNameShort)-$(ProjectVersion)/compiler \
+	     $(ProjectNameShort)-$(ProjectVersion)/utils \
+	     $(ProjectNameShort)-$(ProjectVersion)/compat \
 	     $(ProjectNameShort)-$(ProjectVersion)/libraries -follow \
 	  \( -name "*.hc" -o -name "*_hsc.[ch]" -o -name "*_stub.[ch]" \) -print > hc-files-to-go
-	for f in `$(FIND) $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler $(ProjectNameShort)-$(ProjectVersion)/ghc/utils $(ProjectNameShort)-$(ProjectVersion)/libraries -name "*.hsc" -follow -print` ""; do \
+	for f in `$(FIND) $(ProjectNameShort)-$(ProjectVersion)/compiler $(ProjectNameShort)-$(ProjectVersion)/utils $(ProjectNameShort)-$(ProjectVersion)/libraries -name "*.hsc" -follow -print` ""; do \
 	     if test "x$$f" != "x" && test -e `echo "$$f" | sed 's/hsc$$/hs/g'`; then \
 	        echo `echo "$$f" | sed 's/hsc$$/hs/g' ` >> hc-files-to-go ; \
 	     fi; \
 	done;
-	for f in `$(FIND) $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler $(ProjectNameShort)-$(ProjectVersion)/ghc/rts -name "*.cmm" -follow -print` ""; do \
+	for f in `$(FIND) $(ProjectNameShort)-$(ProjectVersion)/compiler $(ProjectNameShort)-$(ProjectVersion)/rts -name "*.cmm" -follow -print` ""; do \
 	     if test "x$$f" != "x"; then \
 	        echo `echo "$$f" | sed 's/cmm$$/hc/g' ` >> hc-files-to-go ; \
 	     fi; \
 	done;
 	echo $(ProjectNameShort)-$(ProjectVersion)/libraries/base/GHC/PrimopWrappers.hs >> hc-files-to-go
-	echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/parser/Parser.hs >> hc-files-to-go
-	echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/parser/ParserCore.hs >> hc-files-to-go
-	echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/main/ParsePkgConf.hs >> hc-files-to-go
+	echo $(ProjectNameShort)-$(ProjectVersion)/compiler/parser/Parser.hs >> hc-files-to-go
+	echo $(ProjectNameShort)-$(ProjectVersion)/compiler/parser/ParserCore.hs >> hc-files-to-go
+	echo $(ProjectNameShort)-$(ProjectVersion)/compiler/main/ParsePkgConf.hs >> hc-files-to-go
 	echo $(ProjectNameShort)-$(ProjectVersion)/libraries/haskell-src/Language/Haskell/Parser.hs >> hc-files-to-go
 	tar czf $(ProjectNameShort)-$(ProjectVersion)-$(TARGETPLATFORM)-hc.tar.gz `cat hc-files-to-go`
 
+# -----------------------------------------------------------------------------
+# Cleaning
+
 CLEAN_FILES += hc-files-to-go *-hc.tar.gz
 
+DIST_CLEAN_FILES += config.cache config.status mk/config.h mk/stamp-h \
+	ghc.spec docs/users_guide/ug-book.xml
+
+# don't clean config.mk: it's needed when cleaning stuff later on
+LATE_DIST_CLEAN_FILES += mk/config.mk 
+
+extraclean::
+	$(RM) -rf autom4te.cache
+
 # -----------------------------------------------------------------------------
 
 # Turn off target.mk's rules for 'all', 'boot' and 'install'.
diff --git a/README b/README
index b1b408a7aa..c2967fcfda 100644
--- a/README
+++ b/README
@@ -1,60 +1,67 @@
-GHC build system
-================
+The Glasgow Haskell Compiler
+============================
 
-This is the top-level directory of the fptools build system.  Several
-packages are part of this build system; if you got this as part of a
-source distribution (eg. for GHC), then you will have one or more of
-the following directories:
+This is the source tree for GHC, a compiler and interactive
+environment for the Haskell functional programming language.
 
-    ghc		  The Glasgow Haskell Compiler
-    hslibs	  A Collection of Haskell libraries
-    haddock	  A Haskell documentation tool
-    haggis	  The Haggis GUI toolkit
-    happy	  The Happy Haskell parser generator
-    hdirect       Haskell interop tool
-    greencard	  A foreign function interface pre-processor for Haskell.
-    libraries	  Haskell libraries (reqd. by ghc)
-    nofib	  The NoFib Haskell benchmarking suite
+For more information, visit GHC's web site:
 
-Additional documentation for each project can be found in its
-respective directory.
+  http://www.haskell.org/ghc/
 
-In addition, the following directories contain project-independent bits:
+Information for developers of GHC can be found here:
 
-    mk	          GNU make setup used by all of fptools
-    glafp-utils   Shared utility programs
-    docs          Documentation on the installing and using
-                  the fptools build system.
-    distrib	  Tools and additional bits for building distributions
+  http://hackage.haskell.org/trac/ghc/
 
-Quick start:  the following is *supposed* to work
 
+Building & Installing
+=====================
+
+NB. you need GHC installed in order to build GHC, because the compiler
+is itself written in Haskell.  It is possible to build GHC using just
+a C compiler, but we don't recommend this as the normal route.  If you
+*really* want to do it this way, then see the Building Guide (link
+below).
+
+You also need a few other tools installed: Happy [4], Alex [5], and
+Haddock [6] (for building library documentation), and a good DocBook
+XML toolchain if you want to build the compiler documentation. 
+
+Quick start:  the following gives you a default build:
+
+	$ autoreconf
 	$ ./configure
 	$ make
 	$ make install
 
-where 'make' is whatever GNU make is called on your system (GNU make
-is *required*).  If there are any other tools required for the build,
-then the configure script will detect them and tell you if any are
-missing.  For example, a working GHC installation is required for
-building most of the tools (including GHC itself).
+The autoreconf step is only necessary if this is a tree checked out
+from darcs.  For source distributions downloaded from GHC's web site,
+this step has already been performed.
+
+These steps give you the default build, which includes everything
+optimised and built in various ways (eg. profiling libs are built).
+It can take a long time.  To customise the build, see the file
+HACKING.
+
+For full information on building GHC, see the GHC Building Guide [3],
+which is also available in source form (DocBook XML) in docs/building.
 
-The configuration script is a standard GNU autoconf script which
-accepts all the normal arguments, eg. --prefix=<blah> to install the
-package somewhere other than /usr/local.  Try ./configure --help to
-get a full list of the options.
 
-There is usually an ANNOUNCE* file with any distribution.  Please
-consult that, or the <piece>/README file, to find out how to proceed.
+References
+==========
 
-Full documentation for the fptools build system can be found in the 
-Building Guide:
+ [1] http://www.haskell.org/ghc/		GHC Home Page
+ [2] http://hackage.haskell.org/trac/ghc	GHC Developer's Wiki
+ [3] http://www.haskell.org/ghc/docs/latest/html/building/index.html
+						Building Guide
 
-	http://www.haskell.org/ghc/docs/latest/html/building/building-guide.html
+ [4] http://www.haskell.org/happy/		Happy
+ [5] http://www.haskell.org/alex/		Alex
+ [6] http://www.haskell.org/haddock/		Haddock
 
-More information about GHC can be found here:
 
-	http://www.haskell.org/ghc/
+Contributors
+============
 
---
-The GHC Team,  glasgow-haskell-users@haskell.org
+Please see
+  
+   http://www.haskell.org/ghc/contributors.html
diff --git a/ghc/WindowsInstaller/Glasgow Haskell Compiler.ism b/WindowsInstaller/Glasgow Haskell Compiler.ism
index 97d6ea3293..97d6ea3293 100644
--- a/ghc/WindowsInstaller/Glasgow Haskell Compiler.ism
+++ b/WindowsInstaller/Glasgow Haskell Compiler.ism
diff --git a/ghc/WindowsInstaller/License.rtf b/WindowsInstaller/License.rtf
index e8b159a9c7..e8b159a9c7 100644
--- a/ghc/WindowsInstaller/License.rtf
+++ b/WindowsInstaller/License.rtf
diff --git a/ghc/WindowsInstaller/MakeInstaller.txt b/WindowsInstaller/MakeInstaller.txt
index 6347ed4350..6347ed4350 100644
--- a/ghc/WindowsInstaller/MakeInstaller.txt
+++ b/WindowsInstaller/MakeInstaller.txt
diff --git a/ghc/WindowsInstaller/announce.rtf b/WindowsInstaller/announce.rtf
index b44a9fbae9..b44a9fbae9 100644
--- a/ghc/WindowsInstaller/announce.rtf
+++ b/WindowsInstaller/announce.rtf
diff --git a/aclocal.m4 b/aclocal.m4
index 6cf12d69f8..139a262601 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1055,4 +1055,65 @@ else
   GhcPkgCmd=$fp_cv_matching_ghc_pkg
 fi])# FP_PROG_GHC_PKG
 
+
+# FP_GHC_HAS_READLINE
+# -------------------
+AC_DEFUN([FP_GHC_HAS_READLINE],
+[AC_REQUIRE([FP_PROG_GHC_PKG])
+AC_CACHE_CHECK([whether ghc has readline package], [fp_cv_ghc_has_readline],
+[if "${GhcPkgCmd-ghc-pkg}" --show-package readline >/dev/null 2>&1; then
+  fp_cv_ghc_has_readline=yes
+else
+  fp_cv_ghc_has_readline=no
+ fi])
+AC_SUBST([GhcHasReadline], [`echo $fp_cv_ghc_has_readline | sed 'y/yesno/YESNO/'`])
+])# FP_GHC_HAS_READLINE
+
+
+# FP_GCC_NEEDS_NO_OMIT_LFPTR
+# --------------------------
+# Some OSs (Mandrake Linux, in particular) configure GCC with
+# -momit-leaf-frame-pointer on by default. If this is the case, we need to turn
+# it off for mangling to work. The test is currently a bit crude, using only the
+# version number of gcc. Defines HAVE_GCC_MNO_OMIT_LFPTR.
+AC_DEFUN([FP_GCC_NEEDS_NO_OMIT_LFPTR],
+[AC_REQUIRE([FP_HAVE_GCC])
+AC_CACHE_CHECK([whether gcc needs -mno-omit-leaf-frame-pointer], [fp_cv_gcc_needs_no_omit_lfptr],
+[FP_COMPARE_VERSIONS([$gcc_version_str], [-ge], [3.2],
+  [fp_cv_gcc_needs_no_omit_lfptr=yes],
+  [fp_cv_gcc_needs_no_omit_lfptr=no])])
+if test "$fp_cv_gcc_needs_no_omit_lfptr" = "yes"; then
+   AC_DEFINE([HAVE_GCC_MNO_OMIT_LFPTR], [1], [Define to 1 if gcc supports -mno-omit-leaf-frame-pointer.])
+fi])# FP_GCC_NEEDS_NO_OMIT_LFPTR
+
+
+# FP_SETUP_PROJECT_VERSION
+# ---------------------
+AC_DEFUN([FP_SETUP_PROJECT_VERSION],
+[# Some renamings
+AC_SUBST([ProjectVersion], [$PACKAGE_VERSION])
+
+# Split PACKAGE_VERSION into (possibly empty) parts
+VERSION_MAJOR=`echo $PACKAGE_VERSION | sed 's/^\(@<:@^.@:>@*\)\(\.\{0,1\}\(.*\)\)$/\1'/`
+VERSION_TMP=`echo $PACKAGE_VERSION | sed 's/^\(@<:@^.@:>@*\)\(\.\{0,1\}\(.*\)\)$/\3'/`
+VERSION_MINOR=`echo $VERSION_TMP | sed 's/^\(@<:@^.@:>@*\)\(\.\{0,1\}\(.*\)\)$/\1'/`
+ProjectPatchLevel=`echo $VERSION_TMP | sed 's/^\(@<:@^.@:>@*\)\(\.\{0,1\}\(.*\)\)$/\3'/`
+
+# Calculate project version as an integer, using 2 digits for minor version
+case $VERSION_MINOR in
+  ?) ProjectVersionInt=${VERSION_MAJOR}0${VERSION_MINOR} ;;
+  ??) ProjectVersionInt=${VERSION_MAJOR}${VERSION_MINOR} ;;
+  *) AC_MSG_ERROR([bad minor version in $PACKAGE_VERSION]) ;;
+esac
+AC_SUBST([ProjectVersionInt])
+
+# The project patchlevel is zero unless stated otherwise
+test -z "$ProjectPatchLevel" && ProjectPatchLevel=0
+
+# Remove dots from the patch level; this allows us to have versions like 6.4.1.20050508
+ProjectPatchLevel=`echo $ProjectPatchLevel | sed 's/\.//'`
+
+AC_SUBST([ProjectPatchLevel])
+])# FP_SETUP_PROJECT_INFO
+
 # LocalWords:  fi
diff --git a/ghc/lib/compat/Compat/Directory.hs b/compat/Compat/Directory.hs
index e6e4cd4a2c..e6e4cd4a2c 100644
--- a/ghc/lib/compat/Compat/Directory.hs
+++ b/compat/Compat/Directory.hs
diff --git a/ghc/lib/compat/Compat/RawSystem.hs b/compat/Compat/RawSystem.hs
index f0f8aa3ac7..f0f8aa3ac7 100644
--- a/ghc/lib/compat/Compat/RawSystem.hs
+++ b/compat/Compat/RawSystem.hs
diff --git a/ghc/lib/compat/Compat/Unicode.hs b/compat/Compat/Unicode.hs
index 2637fac818..2637fac818 100644
--- a/ghc/lib/compat/Compat/Unicode.hs
+++ b/compat/Compat/Unicode.hs
diff --git a/ghc/lib/compat/Distribution/Compat/FilePath.hs b/compat/Distribution/Compat/FilePath.hs
index 2dbd337b67..2dbd337b67 100644
--- a/ghc/lib/compat/Distribution/Compat/FilePath.hs
+++ b/compat/Distribution/Compat/FilePath.hs
diff --git a/ghc/lib/compat/Distribution/Compat/ReadP.hs b/compat/Distribution/Compat/ReadP.hs
index 5fc69da3da..5fc69da3da 100644
--- a/ghc/lib/compat/Distribution/Compat/ReadP.hs
+++ b/compat/Distribution/Compat/ReadP.hs
diff --git a/ghc/lib/compat/Distribution/Compiler.hs b/compat/Distribution/Compiler.hs
index b5a2f68f1e..b5a2f68f1e 100644
--- a/ghc/lib/compat/Distribution/Compiler.hs
+++ b/compat/Distribution/Compiler.hs
diff --git a/ghc/lib/compat/Distribution/GetOpt.hs b/compat/Distribution/GetOpt.hs
index 7da2e30431..7da2e30431 100644
--- a/ghc/lib/compat/Distribution/GetOpt.hs
+++ b/compat/Distribution/GetOpt.hs
diff --git a/ghc/lib/compat/Distribution/InstalledPackageInfo.hs b/compat/Distribution/InstalledPackageInfo.hs
index 03f509216a..03f509216a 100644
--- a/ghc/lib/compat/Distribution/InstalledPackageInfo.hs
+++ b/compat/Distribution/InstalledPackageInfo.hs
diff --git a/ghc/lib/compat/Distribution/License.hs b/compat/Distribution/License.hs
index 31b1b271a6..31b1b271a6 100644
--- a/ghc/lib/compat/Distribution/License.hs
+++ b/compat/Distribution/License.hs
diff --git a/ghc/lib/compat/Distribution/Package.hs b/compat/Distribution/Package.hs
index d40171eec5..d40171eec5 100644
--- a/ghc/lib/compat/Distribution/Package.hs
+++ b/compat/Distribution/Package.hs
diff --git a/ghc/lib/compat/Distribution/ParseUtils.hs b/compat/Distribution/ParseUtils.hs
index f5bf266a95..f5bf266a95 100644
--- a/ghc/lib/compat/Distribution/ParseUtils.hs
+++ b/compat/Distribution/ParseUtils.hs
diff --git a/ghc/lib/compat/Distribution/Version.hs b/compat/Distribution/Version.hs
index 1140c03cbd..1140c03cbd 100644
--- a/ghc/lib/compat/Distribution/Version.hs
+++ b/compat/Distribution/Version.hs
diff --git a/ghc/lib/compat/Language/Haskell/Extension.hs b/compat/Language/Haskell/Extension.hs
index 410a07b4d6..410a07b4d6 100644
--- a/ghc/lib/compat/Language/Haskell/Extension.hs
+++ b/compat/Language/Haskell/Extension.hs
diff --git a/ghc/lib/compat/Makefile b/compat/Makefile
index 7637c94115..b4e18c9bbc 100644
--- a/ghc/lib/compat/Makefile
+++ b/compat/Makefile
@@ -1,4 +1,4 @@
-TOP=../..
+TOP=..
 include $(TOP)/mk/boilerplate.mk
 
 ALL_DIRS = \
diff --git a/ghc/lib/compat/README b/compat/README
index 8d0697beb4..8d0697beb4 100644
--- a/ghc/lib/compat/README
+++ b/compat/README
diff --git a/ghc/lib/compat/System/Directory/Internals.hs b/compat/System/Directory/Internals.hs
index 5ac8e3ba24..5ac8e3ba24 100644
--- a/ghc/lib/compat/System/Directory/Internals.hs
+++ b/compat/System/Directory/Internals.hs
diff --git a/ghc/lib/compat/cbits/directory.c b/compat/cbits/directory.c
index 79d6cd4d44..79d6cd4d44 100644
--- a/ghc/lib/compat/cbits/directory.c
+++ b/compat/cbits/directory.c
diff --git a/ghc/lib/compat/cbits/rawSystem.c b/compat/cbits/rawSystem.c
index 00b8c49cc1..00b8c49cc1 100644
--- a/ghc/lib/compat/cbits/rawSystem.c
+++ b/compat/cbits/rawSystem.c
diff --git a/ghc/lib/compat/cbits/unicode.c b/compat/cbits/unicode.c
index c744cc9436..c744cc9436 100644
--- a/ghc/lib/compat/cbits/unicode.c
+++ b/compat/cbits/unicode.c
diff --git a/ghc/lib/compat/compat.mk b/compat/compat.mk
index 156f03378e..48b2bea76d 100644
--- a/ghc/lib/compat/compat.mk
+++ b/compat/compat.mk
@@ -1,14 +1,14 @@
 # Settings for using the libghccompat.a library elsewhere in the build
 # tree: this file is just included into Makefiles, see 
-# ghc/utils/ghc-pkg/Makefile for example.
+# utils/ghc-pkg/Makefile for example.
 #
 # This is a poor-mans package, but simpler because we don't
 # have to deal with variations in the package support of different
 # versions of GHC.
 
 # Use libghccompat.a:
-SRC_HC_OPTS += -i$(GHC_LIB_COMPAT_DIR)
-SRC_LD_OPTS += -L$(GHC_LIB_COMPAT_DIR) -lghccompat
+SRC_HC_OPTS += -i$(GHC_COMPAT_DIR)
+SRC_LD_OPTS += -L$(GHC_COMPAT_DIR) -lghccompat
 
 # Do *not* use the installed Cabal:
 ifeq "$(ghc_ge_603)" "YES"
@@ -16,7 +16,7 @@ SRC_HC_OPTS += -ignore-package Cabal
 endif
 
 # And similarly for when booting from .hc files:
-HC_BOOT_LD_OPTS += -L$(GHC_LIB_COMPAT_DIR)
+HC_BOOT_LD_OPTS += -L$(GHC_COMPAT_DIR)
 HC_BOOT_LIBS += -lghccompat
 
 ifeq "$(Windows)" "YES"
@@ -30,6 +30,7 @@ endif
 SRC_MKDEPENDHS_OPTS += \
 	-optdep--exclude-module=Compat.RawSystem \
 	-optdep--exclude-module=Compat.Directory \
+	-optdep--exclude-module=Compat.Unicode \
 	-optdep--exclude-module=Distribution.Compat.FilePath \
 	-optdep--exclude-module=Distribution.Compat.ReadP \
 	-optdep--exclude-module=Distribution.Extension \
diff --git a/ghc/lib/compat/include/directory.h b/compat/include/directory.h
index 2e26c3d5a1..2e26c3d5a1 100644
--- a/ghc/lib/compat/include/directory.h
+++ b/compat/include/directory.h
diff --git a/ghc/compiler/DEPEND-NOTES b/compiler/DEPEND-NOTES
index f2ba244315..f2ba244315 100644
--- a/ghc/compiler/DEPEND-NOTES
+++ b/compiler/DEPEND-NOTES
diff --git a/ghc/compiler/DLL-NOTES b/compiler/DLL-NOTES
index c710b14251..c710b14251 100644
--- a/ghc/compiler/DLL-NOTES
+++ b/compiler/DLL-NOTES
diff --git a/ghc/compiler/HsVersions.h b/compiler/HsVersions.h
index dd80922e0b..dd80922e0b 100644
--- a/ghc/compiler/HsVersions.h
+++ b/compiler/HsVersions.h
diff --git a/ghc/compiler/Makefile b/compiler/Makefile
index c1819f2cd2..a7ed0355ff 100644
--- a/ghc/compiler/Makefile
+++ b/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Main ghc/compiler Makefile
+# Main compiler Makefile
 
 # Targets:
 #
@@ -602,8 +602,6 @@ SRC_HC_OPTS += '-\#include "hschooks.h"'
 #		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  \
@@ -630,30 +628,30 @@ depend :: $(PRIMOP_BITS)
 endif
 
 primop-data-decl.hs-incl: prelude/primops.txt
-	$(GENPOC) --data-decl          < $< > $@
+	$(GENPRIMOP) --data-decl          < $< > $@
 primop-tag.hs-incl: prelude/primops.txt
-	$(GENPOC) --primop-tag         < $< > $@
+	$(GENPRIMOP) --primop-tag         < $< > $@
 primop-list.hs-incl: prelude/primops.txt
-	$(GENPOC) --primop-list        < $< > $@
+	$(GENPRIMOP) --primop-list        < $< > $@
 primop-has-side-effects.hs-incl: prelude/primops.txt
-	$(GENPOC) --has-side-effects   < $< > $@
+	$(GENPRIMOP) --has-side-effects   < $< > $@
 primop-out-of-line.hs-incl: prelude/primops.txt
-	$(GENPOC) --out-of-line        < $< > $@
+	$(GENPRIMOP) --out-of-line        < $< > $@
 primop-commutable.hs-incl: prelude/primops.txt
-	$(GENPOC) --commutable         < $< > $@
+	$(GENPRIMOP) --commutable         < $< > $@
 primop-needs-wrapper.hs-incl: prelude/primops.txt
-	$(GENPOC) --needs-wrapper      < $< > $@
+	$(GENPRIMOP) --needs-wrapper      < $< > $@
 primop-can-fail.hs-incl: prelude/primops.txt
-	$(GENPOC) --can-fail           < $< > $@
+	$(GENPRIMOP) --can-fail           < $< > $@
 primop-strictness.hs-incl: prelude/primops.txt
-	$(GENPOC) --strictness         < $< > $@
+	$(GENPRIMOP) --strictness         < $< > $@
 primop-primop-info.hs-incl: prelude/primops.txt
-	$(GENPOC) --primop-primop-info < $< > $@
+	$(GENPRIMOP) --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              < $< > $@
+	$(GENPRIMOP) --usage              < $< > $@
 
 
 #-----------------------------------------------------------------------------
@@ -663,7 +661,7 @@ primop-usage.hs-incl: prelude/primops.txt
 # libraries will be available from the main libraries.
 
 ifeq "$(stage)" "1"
-include $(GHC_LIB_COMPAT_DIR)/compat.mk
+include $(GHC_COMPAT_DIR)/compat.mk
 endif
 
 SRC_LD_OPTS += -no-link-chk
@@ -676,7 +674,7 @@ all :: $(odir)/ghc-inplace ghc-inplace
 $(odir)/ghc-inplace : $(HS_PROG)
 	@$(RM) $@
 	echo '#!/bin/sh' >>$@
-	echo exec $(FPTOOLS_TOP_ABS)/ghc/compiler/$(HS_PROG) '-B$(subst \,\\,$(FPTOOLS_TOP_ABS_PLATFORM))' '"$$@"' >>$@
+	echo exec $(GHC_COMPILER_DIR_ABS)/$(HS_PROG) '-B$(subst \,\\,$(FPTOOLS_TOP_ABS_PLATFORM))' '"$$@"' >>$@
 	chmod 755 $@
 
 ghc-inplace : stage1/ghc-inplace
@@ -765,7 +763,7 @@ PACKAGE_CPP_OPTS += -DPKG_DEPENDS='$(PKG_DEPENDS)'
 LIBOBJS = $(filter-out $(odir)/main/Main.o $(odir)/parser/hschooks.o, $(OBJS))
 
 # disable splitting: it won't really help with GHC, and the specialised
-# build system for ghc/compiler isn't set up to handle it.
+# build system for compiler/ isn't set up to handle it.
 SplitObjs = NO
 
 # the package build system likes to set WAYS=$(GhcLibWays), but we don't 
diff --git a/ghc/compiler/NOTES b/compiler/NOTES
index 8c62750008..8c62750008 100644
--- a/ghc/compiler/NOTES
+++ b/compiler/NOTES
diff --git a/ghc/compiler/README b/compiler/README
index ca619cdde0..ca619cdde0 100644
--- a/ghc/compiler/README
+++ b/compiler/README
diff --git a/ghc/compiler/Simon-log b/compiler/Simon-log
index 9d60ccc6eb..9d60ccc6eb 100644
--- a/ghc/compiler/Simon-log
+++ b/compiler/Simon-log
diff --git a/ghc/compiler/basicTypes/BasicTypes.lhs b/compiler/basicTypes/BasicTypes.lhs
index 6b662bd6a6..6b662bd6a6 100644
--- a/ghc/compiler/basicTypes/BasicTypes.lhs
+++ b/compiler/basicTypes/BasicTypes.lhs
diff --git a/ghc/compiler/basicTypes/DataCon.hi-boot-5 b/compiler/basicTypes/DataCon.hi-boot-5
index f5a8a2d6a8..f5a8a2d6a8 100644
--- a/ghc/compiler/basicTypes/DataCon.hi-boot-5
+++ b/compiler/basicTypes/DataCon.hi-boot-5
diff --git a/ghc/compiler/basicTypes/DataCon.hi-boot-6 b/compiler/basicTypes/DataCon.hi-boot-6
index 7882469bce..7882469bce 100644
--- a/ghc/compiler/basicTypes/DataCon.hi-boot-6
+++ b/compiler/basicTypes/DataCon.hi-boot-6
diff --git a/ghc/compiler/basicTypes/DataCon.lhs b/compiler/basicTypes/DataCon.lhs
index 805ef73c59..805ef73c59 100644
--- a/ghc/compiler/basicTypes/DataCon.lhs
+++ b/compiler/basicTypes/DataCon.lhs
diff --git a/ghc/compiler/basicTypes/DataCon.lhs-boot b/compiler/basicTypes/DataCon.lhs-boot
index c5e05c9ecd..c5e05c9ecd 100644
--- a/ghc/compiler/basicTypes/DataCon.lhs-boot
+++ b/compiler/basicTypes/DataCon.lhs-boot
diff --git a/ghc/compiler/basicTypes/Demand.lhs b/compiler/basicTypes/Demand.lhs
index 50bb0c6ffa..50bb0c6ffa 100644
--- a/ghc/compiler/basicTypes/Demand.lhs
+++ b/compiler/basicTypes/Demand.lhs
diff --git a/ghc/compiler/basicTypes/FieldLabel.lhs b/compiler/basicTypes/FieldLabel.lhs
index b388d378d7..b388d378d7 100644
--- a/ghc/compiler/basicTypes/FieldLabel.lhs
+++ b/compiler/basicTypes/FieldLabel.lhs
diff --git a/ghc/compiler/basicTypes/Id.lhs b/compiler/basicTypes/Id.lhs
index c7ce818adb..c7ce818adb 100644
--- a/ghc/compiler/basicTypes/Id.lhs
+++ b/compiler/basicTypes/Id.lhs
diff --git a/ghc/compiler/basicTypes/IdInfo.hi-boot-5 b/compiler/basicTypes/IdInfo.hi-boot-5
index 4a326cad6f..4a326cad6f 100644
--- a/ghc/compiler/basicTypes/IdInfo.hi-boot-5
+++ b/compiler/basicTypes/IdInfo.hi-boot-5
diff --git a/ghc/compiler/basicTypes/IdInfo.hi-boot-6 b/compiler/basicTypes/IdInfo.hi-boot-6
index e090800d61..e090800d61 100644
--- a/ghc/compiler/basicTypes/IdInfo.hi-boot-6
+++ b/compiler/basicTypes/IdInfo.hi-boot-6
diff --git a/ghc/compiler/basicTypes/IdInfo.lhs b/compiler/basicTypes/IdInfo.lhs
index d53bf5627d..d53bf5627d 100644
--- a/ghc/compiler/basicTypes/IdInfo.lhs
+++ b/compiler/basicTypes/IdInfo.lhs
diff --git a/ghc/compiler/basicTypes/IdInfo.lhs-boot b/compiler/basicTypes/IdInfo.lhs-boot
index 90cf36f90b..90cf36f90b 100644
--- a/ghc/compiler/basicTypes/IdInfo.lhs-boot
+++ b/compiler/basicTypes/IdInfo.lhs-boot
diff --git a/ghc/compiler/basicTypes/Literal.lhs b/compiler/basicTypes/Literal.lhs
index e83ea9db74..e83ea9db74 100644
--- a/ghc/compiler/basicTypes/Literal.lhs
+++ b/compiler/basicTypes/Literal.lhs
diff --git a/ghc/compiler/basicTypes/MkId.hi-boot-5 b/compiler/basicTypes/MkId.hi-boot-5
index ff901a5840..ff901a5840 100644
--- a/ghc/compiler/basicTypes/MkId.hi-boot-5
+++ b/compiler/basicTypes/MkId.hi-boot-5
diff --git a/ghc/compiler/basicTypes/MkId.hi-boot-6 b/compiler/basicTypes/MkId.hi-boot-6
index d3f22527f3..d3f22527f3 100644
--- a/ghc/compiler/basicTypes/MkId.hi-boot-6
+++ b/compiler/basicTypes/MkId.hi-boot-6
diff --git a/ghc/compiler/basicTypes/MkId.lhs b/compiler/basicTypes/MkId.lhs
index 84b3546e62..84b3546e62 100644
--- a/ghc/compiler/basicTypes/MkId.lhs
+++ b/compiler/basicTypes/MkId.lhs
diff --git a/ghc/compiler/basicTypes/MkId.lhs-boot b/compiler/basicTypes/MkId.lhs-boot
index 4f9615a061..4f9615a061 100644
--- a/ghc/compiler/basicTypes/MkId.lhs-boot
+++ b/compiler/basicTypes/MkId.lhs-boot
diff --git a/ghc/compiler/basicTypes/Module.hi-boot-5 b/compiler/basicTypes/Module.hi-boot-5
index cdc5fbf581..cdc5fbf581 100644
--- a/ghc/compiler/basicTypes/Module.hi-boot-5
+++ b/compiler/basicTypes/Module.hi-boot-5
diff --git a/ghc/compiler/basicTypes/Module.hi-boot-6 b/compiler/basicTypes/Module.hi-boot-6
index c4d4b5d474..c4d4b5d474 100644
--- a/ghc/compiler/basicTypes/Module.hi-boot-6
+++ b/compiler/basicTypes/Module.hi-boot-6
diff --git a/ghc/compiler/basicTypes/Module.lhs b/compiler/basicTypes/Module.lhs
index 69521625b0..69521625b0 100644
--- a/ghc/compiler/basicTypes/Module.lhs
+++ b/compiler/basicTypes/Module.lhs
diff --git a/ghc/compiler/basicTypes/Module.lhs-boot b/compiler/basicTypes/Module.lhs-boot
index d75c032d45..d75c032d45 100644
--- a/ghc/compiler/basicTypes/Module.lhs-boot
+++ b/compiler/basicTypes/Module.lhs-boot
diff --git a/ghc/compiler/basicTypes/Name.hi-boot-5 b/compiler/basicTypes/Name.hi-boot-5
index 634d95433c..634d95433c 100644
--- a/ghc/compiler/basicTypes/Name.hi-boot-5
+++ b/compiler/basicTypes/Name.hi-boot-5
diff --git a/ghc/compiler/basicTypes/Name.hi-boot-6 b/compiler/basicTypes/Name.hi-boot-6
index c4eeca4d68..c4eeca4d68 100644
--- a/ghc/compiler/basicTypes/Name.hi-boot-6
+++ b/compiler/basicTypes/Name.hi-boot-6
diff --git a/ghc/compiler/basicTypes/Name.lhs b/compiler/basicTypes/Name.lhs
index 1e1fb31f84..1e1fb31f84 100644
--- a/ghc/compiler/basicTypes/Name.lhs
+++ b/compiler/basicTypes/Name.lhs
diff --git a/ghc/compiler/basicTypes/Name.lhs-boot b/compiler/basicTypes/Name.lhs-boot
index 167ce4242d..167ce4242d 100644
--- a/ghc/compiler/basicTypes/Name.lhs-boot
+++ b/compiler/basicTypes/Name.lhs-boot
diff --git a/ghc/compiler/basicTypes/NameEnv.lhs b/compiler/basicTypes/NameEnv.lhs
index ff637010aa..ff637010aa 100644
--- a/ghc/compiler/basicTypes/NameEnv.lhs
+++ b/compiler/basicTypes/NameEnv.lhs
diff --git a/ghc/compiler/basicTypes/NameSet.lhs b/compiler/basicTypes/NameSet.lhs
index d0e55dec68..d0e55dec68 100644
--- a/ghc/compiler/basicTypes/NameSet.lhs
+++ b/compiler/basicTypes/NameSet.lhs
diff --git a/ghc/compiler/basicTypes/NewDemand.lhs b/compiler/basicTypes/NewDemand.lhs
index 8e68fd87d2..8e68fd87d2 100644
--- a/ghc/compiler/basicTypes/NewDemand.lhs
+++ b/compiler/basicTypes/NewDemand.lhs
diff --git a/ghc/compiler/basicTypes/OccName.hi-boot-6 b/compiler/basicTypes/OccName.hi-boot-6
index 705f9b1bd0..705f9b1bd0 100644
--- a/ghc/compiler/basicTypes/OccName.hi-boot-6
+++ b/compiler/basicTypes/OccName.hi-boot-6
diff --git a/ghc/compiler/basicTypes/OccName.lhs b/compiler/basicTypes/OccName.lhs
index a3661a9ab0..a3661a9ab0 100644
--- a/ghc/compiler/basicTypes/OccName.lhs
+++ b/compiler/basicTypes/OccName.lhs
diff --git a/ghc/compiler/basicTypes/OccName.lhs-boot b/compiler/basicTypes/OccName.lhs-boot
index d9c7fcd141..d9c7fcd141 100644
--- a/ghc/compiler/basicTypes/OccName.lhs-boot
+++ b/compiler/basicTypes/OccName.lhs-boot
diff --git a/ghc/compiler/basicTypes/RdrName.lhs b/compiler/basicTypes/RdrName.lhs
index 030aa1f609..030aa1f609 100644
--- a/ghc/compiler/basicTypes/RdrName.lhs
+++ b/compiler/basicTypes/RdrName.lhs
diff --git a/ghc/compiler/basicTypes/SrcLoc.lhs b/compiler/basicTypes/SrcLoc.lhs
index 51d4318b0b..51d4318b0b 100644
--- a/ghc/compiler/basicTypes/SrcLoc.lhs
+++ b/compiler/basicTypes/SrcLoc.lhs
diff --git a/ghc/compiler/basicTypes/UniqSupply.lhs b/compiler/basicTypes/UniqSupply.lhs
index 41ad5c0f60..41ad5c0f60 100644
--- a/ghc/compiler/basicTypes/UniqSupply.lhs
+++ b/compiler/basicTypes/UniqSupply.lhs
diff --git a/ghc/compiler/basicTypes/Unique.lhs b/compiler/basicTypes/Unique.lhs
index 874328863e..874328863e 100644
--- a/ghc/compiler/basicTypes/Unique.lhs
+++ b/compiler/basicTypes/Unique.lhs
diff --git a/ghc/compiler/basicTypes/Var.lhs b/compiler/basicTypes/Var.lhs
index 60fdf3831c..60fdf3831c 100644
--- a/ghc/compiler/basicTypes/Var.lhs
+++ b/compiler/basicTypes/Var.lhs
diff --git a/ghc/compiler/basicTypes/VarEnv.lhs b/compiler/basicTypes/VarEnv.lhs
index bfeecdc923..bfeecdc923 100644
--- a/ghc/compiler/basicTypes/VarEnv.lhs
+++ b/compiler/basicTypes/VarEnv.lhs
diff --git a/ghc/compiler/basicTypes/VarSet.lhs b/compiler/basicTypes/VarSet.lhs
index 55e82a8515..55e82a8515 100644
--- a/ghc/compiler/basicTypes/VarSet.lhs
+++ b/compiler/basicTypes/VarSet.lhs
diff --git a/ghc/compiler/cbits/rawSystem.c b/compiler/cbits/rawSystem.c
index d103f4808b..d103f4808b 100644
--- a/ghc/compiler/cbits/rawSystem.c
+++ b/compiler/cbits/rawSystem.c
diff --git a/ghc/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs
index e42b92db5a..e42b92db5a 100644
--- a/ghc/compiler/cmm/CLabel.hs
+++ b/compiler/cmm/CLabel.hs
diff --git a/ghc/compiler/cmm/Cmm.hs b/compiler/cmm/Cmm.hs
index 13961c15d3..13961c15d3 100644
--- a/ghc/compiler/cmm/Cmm.hs
+++ b/compiler/cmm/Cmm.hs
diff --git a/ghc/compiler/cmm/CmmLex.x b/compiler/cmm/CmmLex.x
index c2efd17710..c2efd17710 100644
--- a/ghc/compiler/cmm/CmmLex.x
+++ b/compiler/cmm/CmmLex.x
diff --git a/ghc/compiler/cmm/CmmLint.hs b/compiler/cmm/CmmLint.hs
index fbfb14c165..fbfb14c165 100644
--- a/ghc/compiler/cmm/CmmLint.hs
+++ b/compiler/cmm/CmmLint.hs
diff --git a/ghc/compiler/cmm/CmmOpt.hs b/compiler/cmm/CmmOpt.hs
index c454ff4c6a..c454ff4c6a 100644
--- a/ghc/compiler/cmm/CmmOpt.hs
+++ b/compiler/cmm/CmmOpt.hs
diff --git a/ghc/compiler/cmm/CmmParse.y b/compiler/cmm/CmmParse.y
index 73618bc35b..73618bc35b 100644
--- a/ghc/compiler/cmm/CmmParse.y
+++ b/compiler/cmm/CmmParse.y
diff --git a/ghc/compiler/cmm/CmmUtils.hs b/compiler/cmm/CmmUtils.hs
index a04935b279..a04935b279 100644
--- a/ghc/compiler/cmm/CmmUtils.hs
+++ b/compiler/cmm/CmmUtils.hs
diff --git a/ghc/compiler/cmm/MachOp.hs b/compiler/cmm/MachOp.hs
index 5bbff6de78..5bbff6de78 100644
--- a/ghc/compiler/cmm/MachOp.hs
+++ b/compiler/cmm/MachOp.hs
diff --git a/ghc/compiler/cmm/PprC.hs b/compiler/cmm/PprC.hs
index a8d30668b7..a8d30668b7 100644
--- a/ghc/compiler/cmm/PprC.hs
+++ b/compiler/cmm/PprC.hs
diff --git a/ghc/compiler/cmm/PprCmm.hs b/compiler/cmm/PprCmm.hs
index 6e8367d662..6e8367d662 100644
--- a/ghc/compiler/cmm/PprCmm.hs
+++ b/compiler/cmm/PprCmm.hs
diff --git a/ghc/compiler/codeGen/Bitmap.hs b/compiler/codeGen/Bitmap.hs
index c0b490978c..c0b490978c 100644
--- a/ghc/compiler/codeGen/Bitmap.hs
+++ b/compiler/codeGen/Bitmap.hs
diff --git a/ghc/compiler/codeGen/CgBindery.hi-boot-5 b/compiler/codeGen/CgBindery.hi-boot-5
index f375fcc6e1..f375fcc6e1 100644
--- a/ghc/compiler/codeGen/CgBindery.hi-boot-5
+++ b/compiler/codeGen/CgBindery.hi-boot-5
diff --git a/ghc/compiler/codeGen/CgBindery.hi-boot-6 b/compiler/codeGen/CgBindery.hi-boot-6
index 7d1f300a86..7d1f300a86 100644
--- a/ghc/compiler/codeGen/CgBindery.hi-boot-6
+++ b/compiler/codeGen/CgBindery.hi-boot-6
diff --git a/ghc/compiler/codeGen/CgBindery.lhs b/compiler/codeGen/CgBindery.lhs
index f78edda655..f78edda655 100644
--- a/ghc/compiler/codeGen/CgBindery.lhs
+++ b/compiler/codeGen/CgBindery.lhs
diff --git a/ghc/compiler/codeGen/CgBindery.lhs-boot b/compiler/codeGen/CgBindery.lhs-boot
index e504a6a9ba..e504a6a9ba 100644
--- a/ghc/compiler/codeGen/CgBindery.lhs-boot
+++ b/compiler/codeGen/CgBindery.lhs-boot
diff --git a/ghc/compiler/codeGen/CgCallConv.hs b/compiler/codeGen/CgCallConv.hs
index f463255807..f463255807 100644
--- a/ghc/compiler/codeGen/CgCallConv.hs
+++ b/compiler/codeGen/CgCallConv.hs
diff --git a/ghc/compiler/codeGen/CgCase.lhs b/compiler/codeGen/CgCase.lhs
index e7c08940c5..e7c08940c5 100644
--- a/ghc/compiler/codeGen/CgCase.lhs
+++ b/compiler/codeGen/CgCase.lhs
diff --git a/ghc/compiler/codeGen/CgClosure.lhs b/compiler/codeGen/CgClosure.lhs
index 1a2cbc5202..1a2cbc5202 100644
--- a/ghc/compiler/codeGen/CgClosure.lhs
+++ b/compiler/codeGen/CgClosure.lhs
diff --git a/ghc/compiler/codeGen/CgCon.lhs b/compiler/codeGen/CgCon.lhs
index bfb55bf46e..bfb55bf46e 100644
--- a/ghc/compiler/codeGen/CgCon.lhs
+++ b/compiler/codeGen/CgCon.lhs
diff --git a/ghc/compiler/codeGen/CgExpr.hi-boot-5 b/compiler/codeGen/CgExpr.hi-boot-5
index 588e63f8f1..588e63f8f1 100644
--- a/ghc/compiler/codeGen/CgExpr.hi-boot-5
+++ b/compiler/codeGen/CgExpr.hi-boot-5
diff --git a/ghc/compiler/codeGen/CgExpr.hi-boot-6 b/compiler/codeGen/CgExpr.hi-boot-6
index dc2d75cefe..dc2d75cefe 100644
--- a/ghc/compiler/codeGen/CgExpr.hi-boot-6
+++ b/compiler/codeGen/CgExpr.hi-boot-6
diff --git a/ghc/compiler/codeGen/CgExpr.lhs b/compiler/codeGen/CgExpr.lhs
index 33d72f1608..33d72f1608 100644
--- a/ghc/compiler/codeGen/CgExpr.lhs
+++ b/compiler/codeGen/CgExpr.lhs
diff --git a/ghc/compiler/codeGen/CgExpr.lhs-boot b/compiler/codeGen/CgExpr.lhs-boot
index 29cdc3a605..29cdc3a605 100644
--- a/ghc/compiler/codeGen/CgExpr.lhs-boot
+++ b/compiler/codeGen/CgExpr.lhs-boot
diff --git a/ghc/compiler/codeGen/CgForeignCall.hs b/compiler/codeGen/CgForeignCall.hs
index 10f41bdf8b..10f41bdf8b 100644
--- a/ghc/compiler/codeGen/CgForeignCall.hs
+++ b/compiler/codeGen/CgForeignCall.hs
diff --git a/ghc/compiler/codeGen/CgHeapery.lhs b/compiler/codeGen/CgHeapery.lhs
index 184af904df..184af904df 100644
--- a/ghc/compiler/codeGen/CgHeapery.lhs
+++ b/compiler/codeGen/CgHeapery.lhs
diff --git a/ghc/compiler/codeGen/CgInfoTbls.hs b/compiler/codeGen/CgInfoTbls.hs
index b769950d87..b769950d87 100644
--- a/ghc/compiler/codeGen/CgInfoTbls.hs
+++ b/compiler/codeGen/CgInfoTbls.hs
diff --git a/ghc/compiler/codeGen/CgLetNoEscape.lhs b/compiler/codeGen/CgLetNoEscape.lhs
index 39860f4ee0..39860f4ee0 100644
--- a/ghc/compiler/codeGen/CgLetNoEscape.lhs
+++ b/compiler/codeGen/CgLetNoEscape.lhs
diff --git a/ghc/compiler/codeGen/CgMonad.lhs b/compiler/codeGen/CgMonad.lhs
index 4f95c9b36a..4f95c9b36a 100644
--- a/ghc/compiler/codeGen/CgMonad.lhs
+++ b/compiler/codeGen/CgMonad.lhs
diff --git a/ghc/compiler/codeGen/CgParallel.hs b/compiler/codeGen/CgParallel.hs
index b826a33cba..b826a33cba 100644
--- a/ghc/compiler/codeGen/CgParallel.hs
+++ b/compiler/codeGen/CgParallel.hs
diff --git a/ghc/compiler/codeGen/CgPrimOp.hs b/compiler/codeGen/CgPrimOp.hs
index bc7c9140ed..bc7c9140ed 100644
--- a/ghc/compiler/codeGen/CgPrimOp.hs
+++ b/compiler/codeGen/CgPrimOp.hs
diff --git a/ghc/compiler/codeGen/CgProf.hs b/compiler/codeGen/CgProf.hs
index 1488e34956..1488e34956 100644
--- a/ghc/compiler/codeGen/CgProf.hs
+++ b/compiler/codeGen/CgProf.hs
diff --git a/ghc/compiler/codeGen/CgStackery.lhs b/compiler/codeGen/CgStackery.lhs
index 7cb310d521..7cb310d521 100644
--- a/ghc/compiler/codeGen/CgStackery.lhs
+++ b/compiler/codeGen/CgStackery.lhs
diff --git a/ghc/compiler/codeGen/CgTailCall.lhs b/compiler/codeGen/CgTailCall.lhs
index dd7327b745..dd7327b745 100644
--- a/ghc/compiler/codeGen/CgTailCall.lhs
+++ b/compiler/codeGen/CgTailCall.lhs
diff --git a/ghc/compiler/codeGen/CgTicky.hs b/compiler/codeGen/CgTicky.hs
index 3e72981c50..3e72981c50 100644
--- a/ghc/compiler/codeGen/CgTicky.hs
+++ b/compiler/codeGen/CgTicky.hs
diff --git a/ghc/compiler/codeGen/CgUsages.hi-boot-5 b/compiler/codeGen/CgUsages.hi-boot-5
index abb98cec1a..abb98cec1a 100644
--- a/ghc/compiler/codeGen/CgUsages.hi-boot-5
+++ b/compiler/codeGen/CgUsages.hi-boot-5
diff --git a/ghc/compiler/codeGen/CgUsages.hi-boot-6 b/compiler/codeGen/CgUsages.hi-boot-6
index 9640603cfb..9640603cfb 100644
--- a/ghc/compiler/codeGen/CgUsages.hi-boot-6
+++ b/compiler/codeGen/CgUsages.hi-boot-6
diff --git a/ghc/compiler/codeGen/CgUtils.hs b/compiler/codeGen/CgUtils.hs
index 2f69927db0..2f69927db0 100644
--- a/ghc/compiler/codeGen/CgUtils.hs
+++ b/compiler/codeGen/CgUtils.hs
diff --git a/ghc/compiler/codeGen/ClosureInfo.hi-boot-5 b/compiler/codeGen/ClosureInfo.hi-boot-5
index 2291f93cc6..2291f93cc6 100644
--- a/ghc/compiler/codeGen/ClosureInfo.hi-boot-5
+++ b/compiler/codeGen/ClosureInfo.hi-boot-5
diff --git a/ghc/compiler/codeGen/ClosureInfo.hi-boot-6 b/compiler/codeGen/ClosureInfo.hi-boot-6
index d313ccde80..d313ccde80 100644
--- a/ghc/compiler/codeGen/ClosureInfo.hi-boot-6
+++ b/compiler/codeGen/ClosureInfo.hi-boot-6
diff --git a/ghc/compiler/codeGen/ClosureInfo.lhs b/compiler/codeGen/ClosureInfo.lhs
index 84d9dd95ef..84d9dd95ef 100644
--- a/ghc/compiler/codeGen/ClosureInfo.lhs
+++ b/compiler/codeGen/ClosureInfo.lhs
diff --git a/ghc/compiler/codeGen/ClosureInfo.lhs-boot b/compiler/codeGen/ClosureInfo.lhs-boot
index b069905d3e..b069905d3e 100644
--- a/ghc/compiler/codeGen/ClosureInfo.lhs-boot
+++ b/compiler/codeGen/ClosureInfo.lhs-boot
diff --git a/ghc/compiler/codeGen/CodeGen.lhs b/compiler/codeGen/CodeGen.lhs
index e8d83a5a43..e8d83a5a43 100644
--- a/ghc/compiler/codeGen/CodeGen.lhs
+++ b/compiler/codeGen/CodeGen.lhs
diff --git a/ghc/compiler/codeGen/SMRep.lhs b/compiler/codeGen/SMRep.lhs
index c807703b13..c807703b13 100644
--- a/ghc/compiler/codeGen/SMRep.lhs
+++ b/compiler/codeGen/SMRep.lhs
diff --git a/ghc/compiler/coreSyn/CoreFVs.lhs b/compiler/coreSyn/CoreFVs.lhs
index fb6017eabf..fb6017eabf 100644
--- a/ghc/compiler/coreSyn/CoreFVs.lhs
+++ b/compiler/coreSyn/CoreFVs.lhs
diff --git a/ghc/compiler/coreSyn/CoreLint.lhs b/compiler/coreSyn/CoreLint.lhs
index dda8290bf4..dda8290bf4 100644
--- a/ghc/compiler/coreSyn/CoreLint.lhs
+++ b/compiler/coreSyn/CoreLint.lhs
diff --git a/ghc/compiler/coreSyn/CorePrep.lhs b/compiler/coreSyn/CorePrep.lhs
index e5165f0ebe..e5165f0ebe 100644
--- a/ghc/compiler/coreSyn/CorePrep.lhs
+++ b/compiler/coreSyn/CorePrep.lhs
diff --git a/ghc/compiler/coreSyn/CoreSubst.lhs b/compiler/coreSyn/CoreSubst.lhs
index c432d55f94..c432d55f94 100644
--- a/ghc/compiler/coreSyn/CoreSubst.lhs
+++ b/compiler/coreSyn/CoreSubst.lhs
diff --git a/ghc/compiler/coreSyn/CoreSyn.hi-boot-5 b/compiler/coreSyn/CoreSyn.hi-boot-5
index 6031131f33..6031131f33 100644
--- a/ghc/compiler/coreSyn/CoreSyn.hi-boot-5
+++ b/compiler/coreSyn/CoreSyn.hi-boot-5
diff --git a/ghc/compiler/coreSyn/CoreSyn.hi-boot-6 b/compiler/coreSyn/CoreSyn.hi-boot-6
index 38dc8c7f7e..38dc8c7f7e 100644
--- a/ghc/compiler/coreSyn/CoreSyn.hi-boot-6
+++ b/compiler/coreSyn/CoreSyn.hi-boot-6
diff --git a/ghc/compiler/coreSyn/CoreSyn.lhs b/compiler/coreSyn/CoreSyn.lhs
index 201d866834..201d866834 100644
--- a/ghc/compiler/coreSyn/CoreSyn.lhs
+++ b/compiler/coreSyn/CoreSyn.lhs
diff --git a/ghc/compiler/coreSyn/CoreTidy.lhs b/compiler/coreSyn/CoreTidy.lhs
index ba604667e7..ba604667e7 100644
--- a/ghc/compiler/coreSyn/CoreTidy.lhs
+++ b/compiler/coreSyn/CoreTidy.lhs
diff --git a/ghc/compiler/coreSyn/CoreUnfold.lhs b/compiler/coreSyn/CoreUnfold.lhs
index d57f1886fc..d57f1886fc 100644
--- a/ghc/compiler/coreSyn/CoreUnfold.lhs
+++ b/compiler/coreSyn/CoreUnfold.lhs
diff --git a/ghc/compiler/coreSyn/CoreUtils.lhs b/compiler/coreSyn/CoreUtils.lhs
index e358be4439..e358be4439 100644
--- a/ghc/compiler/coreSyn/CoreUtils.lhs
+++ b/compiler/coreSyn/CoreUtils.lhs
diff --git a/ghc/compiler/coreSyn/ExternalCore.lhs b/compiler/coreSyn/ExternalCore.lhs
index 09a6e7f7da..09a6e7f7da 100644
--- a/ghc/compiler/coreSyn/ExternalCore.lhs
+++ b/compiler/coreSyn/ExternalCore.lhs
diff --git a/ghc/compiler/coreSyn/MkExternalCore.lhs b/compiler/coreSyn/MkExternalCore.lhs
index 291b16e823..291b16e823 100644
--- a/ghc/compiler/coreSyn/MkExternalCore.lhs
+++ b/compiler/coreSyn/MkExternalCore.lhs
diff --git a/ghc/compiler/coreSyn/PprCore.lhs b/compiler/coreSyn/PprCore.lhs
index 864f4bdcb0..864f4bdcb0 100644
--- a/ghc/compiler/coreSyn/PprCore.lhs
+++ b/compiler/coreSyn/PprCore.lhs
diff --git a/ghc/compiler/coreSyn/PprExternalCore.lhs b/compiler/coreSyn/PprExternalCore.lhs
index 26c89cce48..26c89cce48 100644
--- a/ghc/compiler/coreSyn/PprExternalCore.lhs
+++ b/compiler/coreSyn/PprExternalCore.lhs
diff --git a/ghc/compiler/count_bytes b/compiler/count_bytes
index bf6240228f..bf6240228f 100644
--- a/ghc/compiler/count_bytes
+++ b/compiler/count_bytes
diff --git a/ghc/compiler/count_lines b/compiler/count_lines
index 43ca79e68a..43ca79e68a 100644
--- a/ghc/compiler/count_lines
+++ b/compiler/count_lines
diff --git a/ghc/compiler/cprAnalysis/CprAnalyse.lhs b/compiler/cprAnalysis/CprAnalyse.lhs
index dad6ccbaee..dad6ccbaee 100644
--- a/ghc/compiler/cprAnalysis/CprAnalyse.lhs
+++ b/compiler/cprAnalysis/CprAnalyse.lhs
diff --git a/ghc/compiler/deSugar/Check.lhs b/compiler/deSugar/Check.lhs
index 9aac5ce777..9aac5ce777 100644
--- a/ghc/compiler/deSugar/Check.lhs
+++ b/compiler/deSugar/Check.lhs
diff --git a/ghc/compiler/deSugar/Desugar.lhs b/compiler/deSugar/Desugar.lhs
index 45dc113cc1..45dc113cc1 100644
--- a/ghc/compiler/deSugar/Desugar.lhs
+++ b/compiler/deSugar/Desugar.lhs
diff --git a/ghc/compiler/deSugar/DsArrows.lhs b/compiler/deSugar/DsArrows.lhs
index 111e0bccd0..111e0bccd0 100644
--- a/ghc/compiler/deSugar/DsArrows.lhs
+++ b/compiler/deSugar/DsArrows.lhs
diff --git a/ghc/compiler/deSugar/DsBinds.lhs b/compiler/deSugar/DsBinds.lhs
index 8f3006d0f3..8f3006d0f3 100644
--- a/ghc/compiler/deSugar/DsBinds.lhs
+++ b/compiler/deSugar/DsBinds.lhs
diff --git a/ghc/compiler/deSugar/DsCCall.lhs b/compiler/deSugar/DsCCall.lhs
index 3554197fb8..3554197fb8 100644
--- a/ghc/compiler/deSugar/DsCCall.lhs
+++ b/compiler/deSugar/DsCCall.lhs
diff --git a/ghc/compiler/deSugar/DsExpr.hi-boot-5 b/compiler/deSugar/DsExpr.hi-boot-5
index 7e5bbaab7f..7e5bbaab7f 100644
--- a/ghc/compiler/deSugar/DsExpr.hi-boot-5
+++ b/compiler/deSugar/DsExpr.hi-boot-5
diff --git a/ghc/compiler/deSugar/DsExpr.hi-boot-6 b/compiler/deSugar/DsExpr.hi-boot-6
index c7ddb2ddfd..c7ddb2ddfd 100644
--- a/ghc/compiler/deSugar/DsExpr.hi-boot-6
+++ b/compiler/deSugar/DsExpr.hi-boot-6
diff --git a/ghc/compiler/deSugar/DsExpr.lhs b/compiler/deSugar/DsExpr.lhs
index e8e9e7b370..e8e9e7b370 100644
--- a/ghc/compiler/deSugar/DsExpr.lhs
+++ b/compiler/deSugar/DsExpr.lhs
diff --git a/ghc/compiler/deSugar/DsExpr.lhs-boot b/compiler/deSugar/DsExpr.lhs-boot
index c65e99d80d..c65e99d80d 100644
--- a/ghc/compiler/deSugar/DsExpr.lhs-boot
+++ b/compiler/deSugar/DsExpr.lhs-boot
diff --git a/ghc/compiler/deSugar/DsForeign.lhs b/compiler/deSugar/DsForeign.lhs
index 52956a09ff..52956a09ff 100644
--- a/ghc/compiler/deSugar/DsForeign.lhs
+++ b/compiler/deSugar/DsForeign.lhs
diff --git a/ghc/compiler/deSugar/DsGRHSs.lhs b/compiler/deSugar/DsGRHSs.lhs
index eea61bafb2..eea61bafb2 100644
--- a/ghc/compiler/deSugar/DsGRHSs.lhs
+++ b/compiler/deSugar/DsGRHSs.lhs
diff --git a/ghc/compiler/deSugar/DsListComp.lhs b/compiler/deSugar/DsListComp.lhs
index 6bb41a92e4..6bb41a92e4 100644
--- a/ghc/compiler/deSugar/DsListComp.lhs
+++ b/compiler/deSugar/DsListComp.lhs
diff --git a/ghc/compiler/deSugar/DsMeta.hs b/compiler/deSugar/DsMeta.hs
index 88b0ba9c8e..88b0ba9c8e 100644
--- a/ghc/compiler/deSugar/DsMeta.hs
+++ b/compiler/deSugar/DsMeta.hs
diff --git a/ghc/compiler/deSugar/DsMonad.lhs b/compiler/deSugar/DsMonad.lhs
index f24dee4905..f24dee4905 100644
--- a/ghc/compiler/deSugar/DsMonad.lhs
+++ b/compiler/deSugar/DsMonad.lhs
diff --git a/ghc/compiler/deSugar/DsUtils.lhs b/compiler/deSugar/DsUtils.lhs
index 29e7773bb8..29e7773bb8 100644
--- a/ghc/compiler/deSugar/DsUtils.lhs
+++ b/compiler/deSugar/DsUtils.lhs
diff --git a/ghc/compiler/deSugar/Match.hi-boot-5 b/compiler/deSugar/Match.hi-boot-5
index 42c200fbff..42c200fbff 100644
--- a/ghc/compiler/deSugar/Match.hi-boot-5
+++ b/compiler/deSugar/Match.hi-boot-5
diff --git a/ghc/compiler/deSugar/Match.hi-boot-6 b/compiler/deSugar/Match.hi-boot-6
index df806ec644..df806ec644 100644
--- a/ghc/compiler/deSugar/Match.hi-boot-6
+++ b/compiler/deSugar/Match.hi-boot-6
diff --git a/ghc/compiler/deSugar/Match.lhs b/compiler/deSugar/Match.lhs
index d72d6adf17..d72d6adf17 100644
--- a/ghc/compiler/deSugar/Match.lhs
+++ b/compiler/deSugar/Match.lhs
diff --git a/ghc/compiler/deSugar/Match.lhs-boot b/compiler/deSugar/Match.lhs-boot
index 5f99f5cc1a..5f99f5cc1a 100644
--- a/ghc/compiler/deSugar/Match.lhs-boot
+++ b/compiler/deSugar/Match.lhs-boot
diff --git a/ghc/compiler/deSugar/MatchCon.lhs b/compiler/deSugar/MatchCon.lhs
index 6ff502a8ae..6ff502a8ae 100644
--- a/ghc/compiler/deSugar/MatchCon.lhs
+++ b/compiler/deSugar/MatchCon.lhs
diff --git a/ghc/compiler/deSugar/MatchLit.lhs b/compiler/deSugar/MatchLit.lhs
index 0b7907b22e..0b7907b22e 100644
--- a/ghc/compiler/deSugar/MatchLit.lhs
+++ b/compiler/deSugar/MatchLit.lhs
diff --git a/ghc/compiler/deSugar/deSugar.tex b/compiler/deSugar/deSugar.tex
index 02cb285742..02cb285742 100644
--- a/ghc/compiler/deSugar/deSugar.tex
+++ b/compiler/deSugar/deSugar.tex
diff --git a/ghc/compiler/ghci/ByteCodeAsm.lhs b/compiler/ghci/ByteCodeAsm.lhs
index e332413dae..e332413dae 100644
--- a/ghc/compiler/ghci/ByteCodeAsm.lhs
+++ b/compiler/ghci/ByteCodeAsm.lhs
diff --git a/ghc/compiler/ghci/ByteCodeFFI.lhs b/compiler/ghci/ByteCodeFFI.lhs
index 61e70d64e4..61e70d64e4 100644
--- a/ghc/compiler/ghci/ByteCodeFFI.lhs
+++ b/compiler/ghci/ByteCodeFFI.lhs
diff --git a/ghc/compiler/ghci/ByteCodeGen.lhs b/compiler/ghci/ByteCodeGen.lhs
index 19db7af16b..19db7af16b 100644
--- a/ghc/compiler/ghci/ByteCodeGen.lhs
+++ b/compiler/ghci/ByteCodeGen.lhs
diff --git a/ghc/compiler/ghci/ByteCodeInstr.lhs b/compiler/ghci/ByteCodeInstr.lhs
index 7bd4408fff..7bd4408fff 100644
--- a/ghc/compiler/ghci/ByteCodeInstr.lhs
+++ b/compiler/ghci/ByteCodeInstr.lhs
diff --git a/ghc/compiler/ghci/ByteCodeItbls.lhs b/compiler/ghci/ByteCodeItbls.lhs
index 74346c6218..74346c6218 100644
--- a/ghc/compiler/ghci/ByteCodeItbls.lhs
+++ b/compiler/ghci/ByteCodeItbls.lhs
diff --git a/ghc/compiler/ghci/ByteCodeLink.lhs b/compiler/ghci/ByteCodeLink.lhs
index 875f1d6331..875f1d6331 100644
--- a/ghc/compiler/ghci/ByteCodeLink.lhs
+++ b/compiler/ghci/ByteCodeLink.lhs
diff --git a/ghc/compiler/ghci/InteractiveUI.hs b/compiler/ghci/InteractiveUI.hs
index 9e9c262052..9e9c262052 100644
--- a/ghc/compiler/ghci/InteractiveUI.hs
+++ b/compiler/ghci/InteractiveUI.hs
diff --git a/ghc/compiler/ghci/Linker.lhs b/compiler/ghci/Linker.lhs
index 3a5ecf8a6d..3a5ecf8a6d 100644
--- a/ghc/compiler/ghci/Linker.lhs
+++ b/compiler/ghci/Linker.lhs
diff --git a/ghc/compiler/ghci/ObjLink.lhs b/compiler/ghci/ObjLink.lhs
index 057938a45e..057938a45e 100644
--- a/ghc/compiler/ghci/ObjLink.lhs
+++ b/compiler/ghci/ObjLink.lhs
diff --git a/ghc/compiler/ghci/keepCAFsForGHCi.c b/compiler/ghci/keepCAFsForGHCi.c
index 0aabbedea0..0aabbedea0 100644
--- a/ghc/compiler/ghci/keepCAFsForGHCi.c
+++ b/compiler/ghci/keepCAFsForGHCi.c
diff --git a/ghc/compiler/hsSyn/Convert.lhs b/compiler/hsSyn/Convert.lhs
index 6c14c11893..6c14c11893 100644
--- a/ghc/compiler/hsSyn/Convert.lhs
+++ b/compiler/hsSyn/Convert.lhs
diff --git a/ghc/compiler/hsSyn/HsBinds.lhs b/compiler/hsSyn/HsBinds.lhs
index b5c21792af..b5c21792af 100644
--- a/ghc/compiler/hsSyn/HsBinds.lhs
+++ b/compiler/hsSyn/HsBinds.lhs
diff --git a/ghc/compiler/hsSyn/HsDecls.lhs b/compiler/hsSyn/HsDecls.lhs
index 8ff39857c6..8ff39857c6 100644
--- a/ghc/compiler/hsSyn/HsDecls.lhs
+++ b/compiler/hsSyn/HsDecls.lhs
diff --git a/ghc/compiler/hsSyn/HsExpr.hi-boot-5 b/compiler/hsSyn/HsExpr.hi-boot-5
index 05e2eb5394..05e2eb5394 100644
--- a/ghc/compiler/hsSyn/HsExpr.hi-boot-5
+++ b/compiler/hsSyn/HsExpr.hi-boot-5
diff --git a/ghc/compiler/hsSyn/HsExpr.hi-boot-6 b/compiler/hsSyn/HsExpr.hi-boot-6
index 40e18ef971..40e18ef971 100644
--- a/ghc/compiler/hsSyn/HsExpr.hi-boot-6
+++ b/compiler/hsSyn/HsExpr.hi-boot-6
diff --git a/ghc/compiler/hsSyn/HsExpr.lhs b/compiler/hsSyn/HsExpr.lhs
index dbdd24c3c5..dbdd24c3c5 100644
--- a/ghc/compiler/hsSyn/HsExpr.lhs
+++ b/compiler/hsSyn/HsExpr.lhs
diff --git a/ghc/compiler/hsSyn/HsExpr.lhs-boot b/compiler/hsSyn/HsExpr.lhs-boot
index 503701bf66..503701bf66 100644
--- a/ghc/compiler/hsSyn/HsExpr.lhs-boot
+++ b/compiler/hsSyn/HsExpr.lhs-boot
diff --git a/ghc/compiler/hsSyn/HsImpExp.lhs b/compiler/hsSyn/HsImpExp.lhs
index 220afb7499..220afb7499 100644
--- a/ghc/compiler/hsSyn/HsImpExp.lhs
+++ b/compiler/hsSyn/HsImpExp.lhs
diff --git a/ghc/compiler/hsSyn/HsLit.lhs b/compiler/hsSyn/HsLit.lhs
index c6d7e5dbea..c6d7e5dbea 100644
--- a/ghc/compiler/hsSyn/HsLit.lhs
+++ b/compiler/hsSyn/HsLit.lhs
diff --git a/ghc/compiler/hsSyn/HsPat.hi-boot-5 b/compiler/hsSyn/HsPat.hi-boot-5
index 1f02ce3d47..1f02ce3d47 100644
--- a/ghc/compiler/hsSyn/HsPat.hi-boot-5
+++ b/compiler/hsSyn/HsPat.hi-boot-5
diff --git a/ghc/compiler/hsSyn/HsPat.hi-boot-6 b/compiler/hsSyn/HsPat.hi-boot-6
index 593caf2d17..593caf2d17 100644
--- a/ghc/compiler/hsSyn/HsPat.hi-boot-6
+++ b/compiler/hsSyn/HsPat.hi-boot-6
diff --git a/ghc/compiler/hsSyn/HsPat.lhs b/compiler/hsSyn/HsPat.lhs
index 953d228942..953d228942 100644
--- a/ghc/compiler/hsSyn/HsPat.lhs
+++ b/compiler/hsSyn/HsPat.lhs
diff --git a/ghc/compiler/hsSyn/HsPat.lhs-boot b/compiler/hsSyn/HsPat.lhs-boot
index d5b685c1f1..d5b685c1f1 100644
--- a/ghc/compiler/hsSyn/HsPat.lhs-boot
+++ b/compiler/hsSyn/HsPat.lhs-boot
diff --git a/ghc/compiler/hsSyn/HsSyn.lhs b/compiler/hsSyn/HsSyn.lhs
index a9982a630a..a9982a630a 100644
--- a/ghc/compiler/hsSyn/HsSyn.lhs
+++ b/compiler/hsSyn/HsSyn.lhs
diff --git a/ghc/compiler/hsSyn/HsTypes.lhs b/compiler/hsSyn/HsTypes.lhs
index f1343a39ef..f1343a39ef 100644
--- a/ghc/compiler/hsSyn/HsTypes.lhs
+++ b/compiler/hsSyn/HsTypes.lhs
diff --git a/ghc/compiler/hsSyn/HsUtils.lhs b/compiler/hsSyn/HsUtils.lhs
index d9c45e6529..d9c45e6529 100644
--- a/ghc/compiler/hsSyn/HsUtils.lhs
+++ b/compiler/hsSyn/HsUtils.lhs
diff --git a/ghc/compiler/iface/BinIface.hs b/compiler/iface/BinIface.hs
index 6d02fe00c7..6d02fe00c7 100644
--- a/ghc/compiler/iface/BinIface.hs
+++ b/compiler/iface/BinIface.hs
diff --git a/ghc/compiler/iface/BuildTyCl.lhs b/compiler/iface/BuildTyCl.lhs
index f81f2e7d07..f81f2e7d07 100644
--- a/ghc/compiler/iface/BuildTyCl.lhs
+++ b/compiler/iface/BuildTyCl.lhs
diff --git a/ghc/compiler/iface/IfaceEnv.lhs b/compiler/iface/IfaceEnv.lhs
index 40b7d31f13..40b7d31f13 100644
--- a/ghc/compiler/iface/IfaceEnv.lhs
+++ b/compiler/iface/IfaceEnv.lhs
diff --git a/ghc/compiler/iface/IfaceSyn.lhs b/compiler/iface/IfaceSyn.lhs
index 99501a5b68..99501a5b68 100644
--- a/ghc/compiler/iface/IfaceSyn.lhs
+++ b/compiler/iface/IfaceSyn.lhs
diff --git a/ghc/compiler/iface/IfaceType.lhs b/compiler/iface/IfaceType.lhs
index 76438ddb23..76438ddb23 100644
--- a/ghc/compiler/iface/IfaceType.lhs
+++ b/compiler/iface/IfaceType.lhs
diff --git a/ghc/compiler/iface/LoadIface.lhs b/compiler/iface/LoadIface.lhs
index 8c496f76ef..8c496f76ef 100644
--- a/ghc/compiler/iface/LoadIface.lhs
+++ b/compiler/iface/LoadIface.lhs
diff --git a/ghc/compiler/iface/MkIface.lhs b/compiler/iface/MkIface.lhs
index cafb6b6692..cafb6b6692 100644
--- a/ghc/compiler/iface/MkIface.lhs
+++ b/compiler/iface/MkIface.lhs
diff --git a/ghc/compiler/iface/TcIface.hi-boot-5 b/compiler/iface/TcIface.hi-boot-5
index 3647edfa22..3647edfa22 100644
--- a/ghc/compiler/iface/TcIface.hi-boot-5
+++ b/compiler/iface/TcIface.hi-boot-5
diff --git a/ghc/compiler/iface/TcIface.hi-boot-6 b/compiler/iface/TcIface.hi-boot-6
index b03830c03d..b03830c03d 100644
--- a/ghc/compiler/iface/TcIface.hi-boot-6
+++ b/compiler/iface/TcIface.hi-boot-6
diff --git a/ghc/compiler/iface/TcIface.lhs b/compiler/iface/TcIface.lhs
index b902c8c5fe..b902c8c5fe 100644
--- a/ghc/compiler/iface/TcIface.lhs
+++ b/compiler/iface/TcIface.lhs
diff --git a/ghc/compiler/iface/TcIface.lhs-boot b/compiler/iface/TcIface.lhs-boot
index 25191fcaae..25191fcaae 100644
--- a/ghc/compiler/iface/TcIface.lhs-boot
+++ b/compiler/iface/TcIface.lhs-boot
diff --git a/ghc/compiler/ilxGen/Entry.ilx b/compiler/ilxGen/Entry.ilx
index 674c83141a..674c83141a 100644
--- a/ghc/compiler/ilxGen/Entry.ilx
+++ b/compiler/ilxGen/Entry.ilx
diff --git a/ghc/compiler/ilxGen/IlxGen.lhs b/compiler/ilxGen/IlxGen.lhs
index 19e9f76ecf..19e9f76ecf 100644
--- a/ghc/compiler/ilxGen/IlxGen.lhs
+++ b/compiler/ilxGen/IlxGen.lhs
diff --git a/ghc/compiler/ilxGen/Makefile.stdlib b/compiler/ilxGen/Makefile.stdlib
index bab993346e..bab993346e 100644
--- a/ghc/compiler/ilxGen/Makefile.stdlib
+++ b/compiler/ilxGen/Makefile.stdlib
diff --git a/ghc/compiler/ilxGen/tests/Makefile b/compiler/ilxGen/tests/Makefile
index 423839c9e8..423839c9e8 100644
--- a/ghc/compiler/ilxGen/tests/Makefile
+++ b/compiler/ilxGen/tests/Makefile
diff --git a/ghc/compiler/ilxGen/tests/PrelNum.hs b/compiler/ilxGen/tests/PrelNum.hs
index ca23e149ff..ca23e149ff 100644
--- a/ghc/compiler/ilxGen/tests/PrelNum.hs
+++ b/compiler/ilxGen/tests/PrelNum.hs
diff --git a/ghc/compiler/ilxGen/tests/build.mk b/compiler/ilxGen/tests/build.mk
index 285fd5de4e..285fd5de4e 100644
--- a/ghc/compiler/ilxGen/tests/build.mk
+++ b/compiler/ilxGen/tests/build.mk
diff --git a/ghc/compiler/ilxGen/tests/foo.hs b/compiler/ilxGen/tests/foo.hs
index d66608ba22..d66608ba22 100644
--- a/ghc/compiler/ilxGen/tests/foo.hs
+++ b/compiler/ilxGen/tests/foo.hs
diff --git a/ghc/compiler/ilxGen/tests/life.hs b/compiler/ilxGen/tests/life.hs
index d6bcd16f9f..d6bcd16f9f 100644
--- a/ghc/compiler/ilxGen/tests/life.hs
+++ b/compiler/ilxGen/tests/life.hs
diff --git a/ghc/compiler/ilxGen/tests/reduce.ml b/compiler/ilxGen/tests/reduce.ml
index cad379b522..cad379b522 100644
--- a/ghc/compiler/ilxGen/tests/reduce.ml
+++ b/compiler/ilxGen/tests/reduce.ml
diff --git a/ghc/compiler/ilxGen/tests/test1-nostdlib.hs b/compiler/ilxGen/tests/test1-nostdlib.hs
index 1e9053ea41..1e9053ea41 100644
--- a/ghc/compiler/ilxGen/tests/test1-nostdlib.hs
+++ b/compiler/ilxGen/tests/test1-nostdlib.hs
diff --git a/ghc/compiler/ilxGen/tests/test1.hs b/compiler/ilxGen/tests/test1.hs
index 10f307e08e..10f307e08e 100644
--- a/ghc/compiler/ilxGen/tests/test1.hs
+++ b/compiler/ilxGen/tests/test1.hs
diff --git a/ghc/compiler/ilxGen/tests/test10.hs b/compiler/ilxGen/tests/test10.hs
index 46c384d9e0..46c384d9e0 100644
--- a/ghc/compiler/ilxGen/tests/test10.hs
+++ b/compiler/ilxGen/tests/test10.hs
diff --git a/ghc/compiler/ilxGen/tests/test11.hs b/compiler/ilxGen/tests/test11.hs
index ce53f71389..ce53f71389 100644
--- a/ghc/compiler/ilxGen/tests/test11.hs
+++ b/compiler/ilxGen/tests/test11.hs
diff --git a/ghc/compiler/ilxGen/tests/test12.hs b/compiler/ilxGen/tests/test12.hs
index 216c792f32..216c792f32 100644
--- a/ghc/compiler/ilxGen/tests/test12.hs
+++ b/compiler/ilxGen/tests/test12.hs
diff --git a/ghc/compiler/ilxGen/tests/test13.hs b/compiler/ilxGen/tests/test13.hs
index 559c8674fa..559c8674fa 100644
--- a/ghc/compiler/ilxGen/tests/test13.hs
+++ b/compiler/ilxGen/tests/test13.hs
diff --git a/ghc/compiler/ilxGen/tests/test14.hs b/compiler/ilxGen/tests/test14.hs
index 86b5d1c821..86b5d1c821 100644
--- a/ghc/compiler/ilxGen/tests/test14.hs
+++ b/compiler/ilxGen/tests/test14.hs
diff --git a/ghc/compiler/ilxGen/tests/test15.hs b/compiler/ilxGen/tests/test15.hs
index 3e522d757c..3e522d757c 100644
--- a/ghc/compiler/ilxGen/tests/test15.hs
+++ b/compiler/ilxGen/tests/test15.hs
diff --git a/ghc/compiler/ilxGen/tests/test16.hs b/compiler/ilxGen/tests/test16.hs
index 0e8b9974a9..0e8b9974a9 100644
--- a/ghc/compiler/ilxGen/tests/test16.hs
+++ b/compiler/ilxGen/tests/test16.hs
diff --git a/ghc/compiler/ilxGen/tests/test17.hs b/compiler/ilxGen/tests/test17.hs
index 5e551b2dcd..5e551b2dcd 100644
--- a/ghc/compiler/ilxGen/tests/test17.hs
+++ b/compiler/ilxGen/tests/test17.hs
diff --git a/ghc/compiler/ilxGen/tests/test18.hs b/compiler/ilxGen/tests/test18.hs
index 12ca7413f1..12ca7413f1 100644
--- a/ghc/compiler/ilxGen/tests/test18.hs
+++ b/compiler/ilxGen/tests/test18.hs
diff --git a/ghc/compiler/ilxGen/tests/test19.hs b/compiler/ilxGen/tests/test19.hs
index a292599031..a292599031 100644
--- a/ghc/compiler/ilxGen/tests/test19.hs
+++ b/compiler/ilxGen/tests/test19.hs
diff --git a/ghc/compiler/ilxGen/tests/test1b.hs b/compiler/ilxGen/tests/test1b.hs
index c4b2336df1..c4b2336df1 100644
--- a/ghc/compiler/ilxGen/tests/test1b.hs
+++ b/compiler/ilxGen/tests/test1b.hs
diff --git a/ghc/compiler/ilxGen/tests/test2.hs b/compiler/ilxGen/tests/test2.hs
index 8b1f5b5eb6..8b1f5b5eb6 100644
--- a/ghc/compiler/ilxGen/tests/test2.hs
+++ b/compiler/ilxGen/tests/test2.hs
diff --git a/ghc/compiler/ilxGen/tests/test20.hs b/compiler/ilxGen/tests/test20.hs
index 157a16da1d..157a16da1d 100644
--- a/ghc/compiler/ilxGen/tests/test20.hs
+++ b/compiler/ilxGen/tests/test20.hs
diff --git a/ghc/compiler/ilxGen/tests/test21.hs b/compiler/ilxGen/tests/test21.hs
index 1870f22b97..1870f22b97 100644
--- a/ghc/compiler/ilxGen/tests/test21.hs
+++ b/compiler/ilxGen/tests/test21.hs
diff --git a/ghc/compiler/ilxGen/tests/test2b.hs b/compiler/ilxGen/tests/test2b.hs
index 08a391f799..08a391f799 100644
--- a/ghc/compiler/ilxGen/tests/test2b.hs
+++ b/compiler/ilxGen/tests/test2b.hs
diff --git a/ghc/compiler/ilxGen/tests/test2c.hs b/compiler/ilxGen/tests/test2c.hs
index d01df051f8..d01df051f8 100644
--- a/ghc/compiler/ilxGen/tests/test2c.hs
+++ b/compiler/ilxGen/tests/test2c.hs
diff --git a/ghc/compiler/ilxGen/tests/test2d.hs b/compiler/ilxGen/tests/test2d.hs
index 8126127a32..8126127a32 100644
--- a/ghc/compiler/ilxGen/tests/test2d.hs
+++ b/compiler/ilxGen/tests/test2d.hs
diff --git a/ghc/compiler/ilxGen/tests/test3.hs b/compiler/ilxGen/tests/test3.hs
index 0254ee41c4..0254ee41c4 100644
--- a/ghc/compiler/ilxGen/tests/test3.hs
+++ b/compiler/ilxGen/tests/test3.hs
diff --git a/ghc/compiler/ilxGen/tests/test4.hs b/compiler/ilxGen/tests/test4.hs
index 080c6521e3..080c6521e3 100644
--- a/ghc/compiler/ilxGen/tests/test4.hs
+++ b/compiler/ilxGen/tests/test4.hs
diff --git a/ghc/compiler/ilxGen/tests/test5.hs b/compiler/ilxGen/tests/test5.hs
index 13d6028c02..13d6028c02 100644
--- a/ghc/compiler/ilxGen/tests/test5.hs
+++ b/compiler/ilxGen/tests/test5.hs
diff --git a/ghc/compiler/ilxGen/tests/test6.hs b/compiler/ilxGen/tests/test6.hs
index 17e51ab51d..17e51ab51d 100644
--- a/ghc/compiler/ilxGen/tests/test6.hs
+++ b/compiler/ilxGen/tests/test6.hs
diff --git a/ghc/compiler/ilxGen/tests/test7.hs b/compiler/ilxGen/tests/test7.hs
index c146038052..c146038052 100644
--- a/ghc/compiler/ilxGen/tests/test7.hs
+++ b/compiler/ilxGen/tests/test7.hs
diff --git a/ghc/compiler/ilxGen/tests/test8.hs b/compiler/ilxGen/tests/test8.hs
index 94a7e1f83d..94a7e1f83d 100644
--- a/ghc/compiler/ilxGen/tests/test8.hs
+++ b/compiler/ilxGen/tests/test8.hs
diff --git a/ghc/compiler/ilxGen/tests/test9.hs b/compiler/ilxGen/tests/test9.hs
index 311b65c4e1..311b65c4e1 100644
--- a/ghc/compiler/ilxGen/tests/test9.hs
+++ b/compiler/ilxGen/tests/test9.hs
diff --git a/ghc/compiler/ilxGen/tests/yes.hs b/compiler/ilxGen/tests/yes.hs
index 1dc4f085fd..1dc4f085fd 100644
--- a/ghc/compiler/ilxGen/tests/yes.hs
+++ b/compiler/ilxGen/tests/yes.hs
diff --git a/ghc/compiler/ilxGen/tests/yes2.hs b/compiler/ilxGen/tests/yes2.hs
index 7fa20c5b7d..7fa20c5b7d 100644
--- a/ghc/compiler/ilxGen/tests/yes2.hs
+++ b/compiler/ilxGen/tests/yes2.hs
diff --git a/ghc/compiler/javaGen/Java.lhs b/compiler/javaGen/Java.lhs
index 368be03fc1..368be03fc1 100644
--- a/ghc/compiler/javaGen/Java.lhs
+++ b/compiler/javaGen/Java.lhs
diff --git a/ghc/compiler/javaGen/JavaGen.lhs b/compiler/javaGen/JavaGen.lhs
index a3925b18e8..a3925b18e8 100644
--- a/ghc/compiler/javaGen/JavaGen.lhs
+++ b/compiler/javaGen/JavaGen.lhs
diff --git a/ghc/compiler/javaGen/PrintJava.lhs b/compiler/javaGen/PrintJava.lhs
index eb2811d38f..eb2811d38f 100644
--- a/ghc/compiler/javaGen/PrintJava.lhs
+++ b/compiler/javaGen/PrintJava.lhs
diff --git a/ghc/compiler/main/CmdLineParser.hs b/compiler/main/CmdLineParser.hs
index e34b8c0857..e34b8c0857 100644
--- a/ghc/compiler/main/CmdLineParser.hs
+++ b/compiler/main/CmdLineParser.hs
diff --git a/ghc/compiler/main/CodeOutput.lhs b/compiler/main/CodeOutput.lhs
index d1b293353a..d1b293353a 100644
--- a/ghc/compiler/main/CodeOutput.lhs
+++ b/compiler/main/CodeOutput.lhs
diff --git a/ghc/compiler/main/Constants.lhs b/compiler/main/Constants.lhs
index 43db93249a..43db93249a 100644
--- a/ghc/compiler/main/Constants.lhs
+++ b/compiler/main/Constants.lhs
diff --git a/ghc/compiler/main/DriverMkDepend.hs b/compiler/main/DriverMkDepend.hs
index 80d906c4a7..80d906c4a7 100644
--- a/ghc/compiler/main/DriverMkDepend.hs
+++ b/compiler/main/DriverMkDepend.hs
diff --git a/ghc/compiler/main/DriverPhases.hs b/compiler/main/DriverPhases.hs
index 6e945314cb..6e945314cb 100644
--- a/ghc/compiler/main/DriverPhases.hs
+++ b/compiler/main/DriverPhases.hs
diff --git a/ghc/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index e20bc56940..e20bc56940 100644
--- a/ghc/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
diff --git a/ghc/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 78acb98375..78acb98375 100644
--- a/ghc/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
diff --git a/ghc/compiler/main/ErrUtils.hi-boot-6 b/compiler/main/ErrUtils.hi-boot-6
index fd98ca3950..fd98ca3950 100644
--- a/ghc/compiler/main/ErrUtils.hi-boot-6
+++ b/compiler/main/ErrUtils.hi-boot-6
diff --git a/ghc/compiler/main/ErrUtils.lhs b/compiler/main/ErrUtils.lhs
index 90e5dc87b6..90e5dc87b6 100644
--- a/ghc/compiler/main/ErrUtils.lhs
+++ b/compiler/main/ErrUtils.lhs
diff --git a/ghc/compiler/main/ErrUtils.lhs-boot b/compiler/main/ErrUtils.lhs-boot
index 77d6cfdb4a..77d6cfdb4a 100644
--- a/ghc/compiler/main/ErrUtils.lhs-boot
+++ b/compiler/main/ErrUtils.lhs-boot
diff --git a/ghc/compiler/main/Finder.lhs b/compiler/main/Finder.lhs
index fbde40f6ea..fbde40f6ea 100644
--- a/ghc/compiler/main/Finder.lhs
+++ b/compiler/main/Finder.lhs
diff --git a/ghc/compiler/main/GHC.hs b/compiler/main/GHC.hs
index 3f91af6cc4..3f91af6cc4 100644
--- a/ghc/compiler/main/GHC.hs
+++ b/compiler/main/GHC.hs
diff --git a/ghc/compiler/main/HeaderInfo.hs b/compiler/main/HeaderInfo.hs
index 913ac33a33..913ac33a33 100644
--- a/ghc/compiler/main/HeaderInfo.hs
+++ b/compiler/main/HeaderInfo.hs
diff --git a/ghc/compiler/main/HscMain.lhs b/compiler/main/HscMain.lhs
index e170f8fa31..e170f8fa31 100644
--- a/ghc/compiler/main/HscMain.lhs
+++ b/compiler/main/HscMain.lhs
diff --git a/ghc/compiler/main/HscStats.lhs b/compiler/main/HscStats.lhs
index 750744af44..750744af44 100644
--- a/ghc/compiler/main/HscStats.lhs
+++ b/compiler/main/HscStats.lhs
diff --git a/ghc/compiler/main/HscTypes.lhs b/compiler/main/HscTypes.lhs
index ee5438b319..ee5438b319 100644
--- a/ghc/compiler/main/HscTypes.lhs
+++ b/compiler/main/HscTypes.lhs
diff --git a/ghc/compiler/main/Main.hs b/compiler/main/Main.hs
index ec5a116894..ec5a116894 100644
--- a/ghc/compiler/main/Main.hs
+++ b/compiler/main/Main.hs
diff --git a/ghc/compiler/main/PackageConfig.hs b/compiler/main/PackageConfig.hs
index e19a10dbc5..e19a10dbc5 100644
--- a/ghc/compiler/main/PackageConfig.hs
+++ b/compiler/main/PackageConfig.hs
diff --git a/ghc/compiler/main/Packages.hi-boot-5 b/compiler/main/Packages.hi-boot-5
index 62f020cddb..62f020cddb 100644
--- a/ghc/compiler/main/Packages.hi-boot-5
+++ b/compiler/main/Packages.hi-boot-5
diff --git a/ghc/compiler/main/Packages.hi-boot-6 b/compiler/main/Packages.hi-boot-6
index 6b12f1496e..6b12f1496e 100644
--- a/ghc/compiler/main/Packages.hi-boot-6
+++ b/compiler/main/Packages.hi-boot-6
diff --git a/ghc/compiler/main/Packages.lhs b/compiler/main/Packages.lhs
index ae6b18863e..ae6b18863e 100644
--- a/ghc/compiler/main/Packages.lhs
+++ b/compiler/main/Packages.lhs
diff --git a/ghc/compiler/main/Packages.lhs-boot b/compiler/main/Packages.lhs-boot
index 3a1712e2da..3a1712e2da 100644
--- a/ghc/compiler/main/Packages.lhs-boot
+++ b/compiler/main/Packages.lhs-boot
diff --git a/ghc/compiler/main/ParsePkgConf.y b/compiler/main/ParsePkgConf.y
index 901a5bc943..901a5bc943 100644
--- a/ghc/compiler/main/ParsePkgConf.y
+++ b/compiler/main/ParsePkgConf.y
diff --git a/ghc/compiler/main/PprTyThing.hs b/compiler/main/PprTyThing.hs
index 2763b052fd..2763b052fd 100644
--- a/ghc/compiler/main/PprTyThing.hs
+++ b/compiler/main/PprTyThing.hs
diff --git a/ghc/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs
index 3067063f7b..3067063f7b 100644
--- a/ghc/compiler/main/StaticFlags.hs
+++ b/compiler/main/StaticFlags.hs
diff --git a/ghc/compiler/main/SysTools.lhs b/compiler/main/SysTools.lhs
index eee3e1a383..eee3e1a383 100644
--- a/ghc/compiler/main/SysTools.lhs
+++ b/compiler/main/SysTools.lhs
diff --git a/ghc/compiler/main/TidyPgm.lhs b/compiler/main/TidyPgm.lhs
index 86e55f9e06..86e55f9e06 100644
--- a/ghc/compiler/main/TidyPgm.lhs
+++ b/compiler/main/TidyPgm.lhs
diff --git a/ghc/compiler/nativeGen/AsmCodeGen.lhs b/compiler/nativeGen/AsmCodeGen.lhs
index 1576162167..1576162167 100644
--- a/ghc/compiler/nativeGen/AsmCodeGen.lhs
+++ b/compiler/nativeGen/AsmCodeGen.lhs
diff --git a/ghc/compiler/nativeGen/MachCodeGen.hs b/compiler/nativeGen/MachCodeGen.hs
index 90ce6b5bf8..90ce6b5bf8 100644
--- a/ghc/compiler/nativeGen/MachCodeGen.hs
+++ b/compiler/nativeGen/MachCodeGen.hs
diff --git a/ghc/compiler/nativeGen/MachInstrs.hs b/compiler/nativeGen/MachInstrs.hs
index 0f718d3cea..0f718d3cea 100644
--- a/ghc/compiler/nativeGen/MachInstrs.hs
+++ b/compiler/nativeGen/MachInstrs.hs
diff --git a/ghc/compiler/nativeGen/MachRegs.lhs b/compiler/nativeGen/MachRegs.lhs
index bffb723d1b..bffb723d1b 100644
--- a/ghc/compiler/nativeGen/MachRegs.lhs
+++ b/compiler/nativeGen/MachRegs.lhs
diff --git a/ghc/compiler/nativeGen/NCG.h b/compiler/nativeGen/NCG.h
index b17f682e71..b17f682e71 100644
--- a/ghc/compiler/nativeGen/NCG.h
+++ b/compiler/nativeGen/NCG.h
diff --git a/ghc/compiler/nativeGen/NCGMonad.hs b/compiler/nativeGen/NCGMonad.hs
index 8fdcd44024..8fdcd44024 100644
--- a/ghc/compiler/nativeGen/NCGMonad.hs
+++ b/compiler/nativeGen/NCGMonad.hs
diff --git a/ghc/compiler/nativeGen/NOTES b/compiler/nativeGen/NOTES
index 9068a7fc2c..9068a7fc2c 100644
--- a/ghc/compiler/nativeGen/NOTES
+++ b/compiler/nativeGen/NOTES
diff --git a/ghc/compiler/nativeGen/PositionIndependentCode.hs b/compiler/nativeGen/PositionIndependentCode.hs
index 0daccb6530..0daccb6530 100644
--- a/ghc/compiler/nativeGen/PositionIndependentCode.hs
+++ b/compiler/nativeGen/PositionIndependentCode.hs
diff --git a/ghc/compiler/nativeGen/PprMach.hs b/compiler/nativeGen/PprMach.hs
index afa5bcd872..afa5bcd872 100644
--- a/ghc/compiler/nativeGen/PprMach.hs
+++ b/compiler/nativeGen/PprMach.hs
diff --git a/ghc/compiler/nativeGen/RegAllocInfo.hs b/compiler/nativeGen/RegAllocInfo.hs
index 98c4e2dfe0..98c4e2dfe0 100644
--- a/ghc/compiler/nativeGen/RegAllocInfo.hs
+++ b/compiler/nativeGen/RegAllocInfo.hs
diff --git a/ghc/compiler/nativeGen/RegisterAlloc.hs b/compiler/nativeGen/RegisterAlloc.hs
index 7d2ab1b6d6..7d2ab1b6d6 100644
--- a/ghc/compiler/nativeGen/RegisterAlloc.hs
+++ b/compiler/nativeGen/RegisterAlloc.hs
diff --git a/ghc/compiler/ndpFlatten/FlattenInfo.hs b/compiler/ndpFlatten/FlattenInfo.hs
index f759242455..f759242455 100644
--- a/ghc/compiler/ndpFlatten/FlattenInfo.hs
+++ b/compiler/ndpFlatten/FlattenInfo.hs
diff --git a/ghc/compiler/ndpFlatten/FlattenMonad.hs b/compiler/ndpFlatten/FlattenMonad.hs
index 45405088fc..45405088fc 100644
--- a/ghc/compiler/ndpFlatten/FlattenMonad.hs
+++ b/compiler/ndpFlatten/FlattenMonad.hs
diff --git a/ghc/compiler/ndpFlatten/Flattening.hs b/compiler/ndpFlatten/Flattening.hs
index 18daaa6323..18daaa6323 100644
--- a/ghc/compiler/ndpFlatten/Flattening.hs
+++ b/compiler/ndpFlatten/Flattening.hs
diff --git a/ghc/compiler/ndpFlatten/NDPCoreUtils.hs b/compiler/ndpFlatten/NDPCoreUtils.hs
index 6e6b94f175..6e6b94f175 100644
--- a/ghc/compiler/ndpFlatten/NDPCoreUtils.hs
+++ b/compiler/ndpFlatten/NDPCoreUtils.hs
diff --git a/ghc/compiler/ndpFlatten/PArrAnal.hs b/compiler/ndpFlatten/PArrAnal.hs
index 2db56221b2..2db56221b2 100644
--- a/ghc/compiler/ndpFlatten/PArrAnal.hs
+++ b/compiler/ndpFlatten/PArrAnal.hs
diff --git a/ghc/compiler/ndpFlatten/TODO b/compiler/ndpFlatten/TODO
index e596609205..e596609205 100644
--- a/ghc/compiler/ndpFlatten/TODO
+++ b/compiler/ndpFlatten/TODO
diff --git a/ghc/compiler/package.conf.in b/compiler/package.conf.in
index b356e90000..b356e90000 100644
--- a/ghc/compiler/package.conf.in
+++ b/compiler/package.conf.in
diff --git a/ghc/compiler/parser/Ctype.lhs b/compiler/parser/Ctype.lhs
index dbe4e9f1b0..dbe4e9f1b0 100644
--- a/ghc/compiler/parser/Ctype.lhs
+++ b/compiler/parser/Ctype.lhs
diff --git a/ghc/compiler/parser/LexCore.hs b/compiler/parser/LexCore.hs
index 1a545a3e43..1a545a3e43 100644
--- a/ghc/compiler/parser/LexCore.hs
+++ b/compiler/parser/LexCore.hs
diff --git a/ghc/compiler/parser/Lexer.x b/compiler/parser/Lexer.x
index 4c1b48efc0..4c1b48efc0 100644
--- a/ghc/compiler/parser/Lexer.x
+++ b/compiler/parser/Lexer.x
diff --git a/ghc/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp
index 3066a0f876..3066a0f876 100644
--- a/ghc/compiler/parser/Parser.y.pp
+++ b/compiler/parser/Parser.y.pp
diff --git a/ghc/compiler/parser/ParserCore.y b/compiler/parser/ParserCore.y
index 3210583f96..3210583f96 100644
--- a/ghc/compiler/parser/ParserCore.y
+++ b/compiler/parser/ParserCore.y
diff --git a/ghc/compiler/parser/ParserCoreUtils.hs b/compiler/parser/ParserCoreUtils.hs
index a590fb5c93..a590fb5c93 100644
--- a/ghc/compiler/parser/ParserCoreUtils.hs
+++ b/compiler/parser/ParserCoreUtils.hs
diff --git a/ghc/compiler/parser/RdrHsSyn.lhs b/compiler/parser/RdrHsSyn.lhs
index 8d59e2b22c..8d59e2b22c 100644
--- a/ghc/compiler/parser/RdrHsSyn.lhs
+++ b/compiler/parser/RdrHsSyn.lhs
diff --git a/ghc/compiler/parser/cutils.c b/compiler/parser/cutils.c
index 08832f298d..08832f298d 100644
--- a/ghc/compiler/parser/cutils.c
+++ b/compiler/parser/cutils.c
diff --git a/ghc/compiler/parser/cutils.h b/compiler/parser/cutils.h
index c7c1867ded..c7c1867ded 100644
--- a/ghc/compiler/parser/cutils.h
+++ b/compiler/parser/cutils.h
diff --git a/ghc/compiler/parser/hschooks.c b/compiler/parser/hschooks.c
index f3e7447a49..f3e7447a49 100644
--- a/ghc/compiler/parser/hschooks.c
+++ b/compiler/parser/hschooks.c
diff --git a/ghc/compiler/parser/hschooks.h b/compiler/parser/hschooks.h
index 4ce1c0f93d..4ce1c0f93d 100644
--- a/ghc/compiler/parser/hschooks.h
+++ b/compiler/parser/hschooks.h
diff --git a/ghc/compiler/prelude/ForeignCall.lhs b/compiler/prelude/ForeignCall.lhs
index 2c90a7dc6e..2c90a7dc6e 100644
--- a/ghc/compiler/prelude/ForeignCall.lhs
+++ b/compiler/prelude/ForeignCall.lhs
diff --git a/ghc/compiler/prelude/PrelInfo.lhs b/compiler/prelude/PrelInfo.lhs
index 31457b2b63..31457b2b63 100644
--- a/ghc/compiler/prelude/PrelInfo.lhs
+++ b/compiler/prelude/PrelInfo.lhs
diff --git a/ghc/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs
index d656fbf18e..d656fbf18e 100644
--- a/ghc/compiler/prelude/PrelNames.lhs
+++ b/compiler/prelude/PrelNames.lhs
diff --git a/ghc/compiler/prelude/PrelRules.lhs b/compiler/prelude/PrelRules.lhs
index 9cdddc9065..9cdddc9065 100644
--- a/ghc/compiler/prelude/PrelRules.lhs
+++ b/compiler/prelude/PrelRules.lhs
diff --git a/ghc/compiler/prelude/PrimOp.lhs b/compiler/prelude/PrimOp.lhs
index a650352280..a650352280 100644
--- a/ghc/compiler/prelude/PrimOp.lhs
+++ b/compiler/prelude/PrimOp.lhs
diff --git a/ghc/compiler/prelude/TysPrim.lhs b/compiler/prelude/TysPrim.lhs
index 2f6168bafb..2f6168bafb 100644
--- a/ghc/compiler/prelude/TysPrim.lhs
+++ b/compiler/prelude/TysPrim.lhs
diff --git a/ghc/compiler/prelude/TysWiredIn.lhs b/compiler/prelude/TysWiredIn.lhs
index ceb4df550a..ceb4df550a 100644
--- a/ghc/compiler/prelude/TysWiredIn.lhs
+++ b/compiler/prelude/TysWiredIn.lhs
diff --git a/ghc/compiler/prelude/primops.txt.pp b/compiler/prelude/primops.txt.pp
index 13b4b6c97d..13b4b6c97d 100644
--- a/ghc/compiler/prelude/primops.txt.pp
+++ b/compiler/prelude/primops.txt.pp
diff --git a/ghc/compiler/profiling/CostCentre.lhs b/compiler/profiling/CostCentre.lhs
index 3ee46a88db..3ee46a88db 100644
--- a/ghc/compiler/profiling/CostCentre.lhs
+++ b/compiler/profiling/CostCentre.lhs
diff --git a/ghc/compiler/profiling/NOTES b/compiler/profiling/NOTES
index c50cf562e3..c50cf562e3 100644
--- a/ghc/compiler/profiling/NOTES
+++ b/compiler/profiling/NOTES
diff --git a/ghc/compiler/profiling/SCCfinal.lhs b/compiler/profiling/SCCfinal.lhs
index c95db9c358..c95db9c358 100644
--- a/ghc/compiler/profiling/SCCfinal.lhs
+++ b/compiler/profiling/SCCfinal.lhs
diff --git a/ghc/compiler/rename/RnBinds.lhs b/compiler/rename/RnBinds.lhs
index 13035e72e2..13035e72e2 100644
--- a/ghc/compiler/rename/RnBinds.lhs
+++ b/compiler/rename/RnBinds.lhs
diff --git a/ghc/compiler/rename/RnEnv.lhs b/compiler/rename/RnEnv.lhs
index 2be3bfd5c0..2be3bfd5c0 100644
--- a/ghc/compiler/rename/RnEnv.lhs
+++ b/compiler/rename/RnEnv.lhs
diff --git a/ghc/compiler/rename/RnExpr.hi-boot-6 b/compiler/rename/RnExpr.hi-boot-6
index 8f6c7f154b..8f6c7f154b 100644
--- a/ghc/compiler/rename/RnExpr.hi-boot-6
+++ b/compiler/rename/RnExpr.hi-boot-6
diff --git a/ghc/compiler/rename/RnExpr.lhs b/compiler/rename/RnExpr.lhs
index 716a85a3b3..716a85a3b3 100644
--- a/ghc/compiler/rename/RnExpr.lhs
+++ b/compiler/rename/RnExpr.lhs
diff --git a/ghc/compiler/rename/RnExpr.lhs-boot b/compiler/rename/RnExpr.lhs-boot
index b03f50a890..b03f50a890 100644
--- a/ghc/compiler/rename/RnExpr.lhs-boot
+++ b/compiler/rename/RnExpr.lhs-boot
diff --git a/ghc/compiler/rename/RnHsSyn.lhs b/compiler/rename/RnHsSyn.lhs
index 6752218b29..6752218b29 100644
--- a/ghc/compiler/rename/RnHsSyn.lhs
+++ b/compiler/rename/RnHsSyn.lhs
diff --git a/ghc/compiler/rename/RnNames.lhs b/compiler/rename/RnNames.lhs
index 654c101cd5..654c101cd5 100644
--- a/ghc/compiler/rename/RnNames.lhs
+++ b/compiler/rename/RnNames.lhs
diff --git a/ghc/compiler/rename/RnSource.hi-boot-5 b/compiler/rename/RnSource.hi-boot-5
index 1ec4d52522..1ec4d52522 100644
--- a/ghc/compiler/rename/RnSource.hi-boot-5
+++ b/compiler/rename/RnSource.hi-boot-5
diff --git a/ghc/compiler/rename/RnSource.lhs b/compiler/rename/RnSource.lhs
index 9150440aee..9150440aee 100644
--- a/ghc/compiler/rename/RnSource.lhs
+++ b/compiler/rename/RnSource.lhs
diff --git a/ghc/compiler/rename/RnTypes.lhs b/compiler/rename/RnTypes.lhs
index d7d435ce97..d7d435ce97 100644
--- a/ghc/compiler/rename/RnTypes.lhs
+++ b/compiler/rename/RnTypes.lhs
diff --git a/ghc/compiler/rename/rename.tex b/compiler/rename/rename.tex
index b3f8e1d770..b3f8e1d770 100644
--- a/ghc/compiler/rename/rename.tex
+++ b/compiler/rename/rename.tex
diff --git a/ghc/compiler/simplCore/CSE.lhs b/compiler/simplCore/CSE.lhs
index 2e8489a295..2e8489a295 100644
--- a/ghc/compiler/simplCore/CSE.lhs
+++ b/compiler/simplCore/CSE.lhs
diff --git a/ghc/compiler/simplCore/FloatIn.lhs b/compiler/simplCore/FloatIn.lhs
index 0e8edb5930..0e8edb5930 100644
--- a/ghc/compiler/simplCore/FloatIn.lhs
+++ b/compiler/simplCore/FloatIn.lhs
diff --git a/ghc/compiler/simplCore/FloatOut.lhs b/compiler/simplCore/FloatOut.lhs
index 988bd53015..988bd53015 100644
--- a/ghc/compiler/simplCore/FloatOut.lhs
+++ b/compiler/simplCore/FloatOut.lhs
diff --git a/ghc/compiler/simplCore/LiberateCase.lhs b/compiler/simplCore/LiberateCase.lhs
index c29a5b9c68..c29a5b9c68 100644
--- a/ghc/compiler/simplCore/LiberateCase.lhs
+++ b/compiler/simplCore/LiberateCase.lhs
diff --git a/ghc/compiler/simplCore/OccurAnal.lhs b/compiler/simplCore/OccurAnal.lhs
index 90a565f4dd..90a565f4dd 100644
--- a/ghc/compiler/simplCore/OccurAnal.lhs
+++ b/compiler/simplCore/OccurAnal.lhs
diff --git a/ghc/compiler/simplCore/SAT.lhs b/compiler/simplCore/SAT.lhs
index 81f3c4c406..81f3c4c406 100644
--- a/ghc/compiler/simplCore/SAT.lhs
+++ b/compiler/simplCore/SAT.lhs
diff --git a/ghc/compiler/simplCore/SATMonad.lhs b/compiler/simplCore/SATMonad.lhs
index 9786f448af..9786f448af 100644
--- a/ghc/compiler/simplCore/SATMonad.lhs
+++ b/compiler/simplCore/SATMonad.lhs
diff --git a/ghc/compiler/simplCore/SetLevels.lhs b/compiler/simplCore/SetLevels.lhs
index f8ab29dcd5..f8ab29dcd5 100644
--- a/ghc/compiler/simplCore/SetLevels.lhs
+++ b/compiler/simplCore/SetLevels.lhs
diff --git a/ghc/compiler/simplCore/SimplCore.lhs b/compiler/simplCore/SimplCore.lhs
index a386a3d6b0..a386a3d6b0 100644
--- a/ghc/compiler/simplCore/SimplCore.lhs
+++ b/compiler/simplCore/SimplCore.lhs
diff --git a/ghc/compiler/simplCore/SimplEnv.lhs b/compiler/simplCore/SimplEnv.lhs
index 00f035e513..00f035e513 100644
--- a/ghc/compiler/simplCore/SimplEnv.lhs
+++ b/compiler/simplCore/SimplEnv.lhs
diff --git a/ghc/compiler/simplCore/SimplMonad.lhs b/compiler/simplCore/SimplMonad.lhs
index bc09e1128c..bc09e1128c 100644
--- a/ghc/compiler/simplCore/SimplMonad.lhs
+++ b/compiler/simplCore/SimplMonad.lhs
diff --git a/ghc/compiler/simplCore/SimplUtils.lhs b/compiler/simplCore/SimplUtils.lhs
index 9e616b5df1..9e616b5df1 100644
--- a/ghc/compiler/simplCore/SimplUtils.lhs
+++ b/compiler/simplCore/SimplUtils.lhs
diff --git a/ghc/compiler/simplCore/Simplify.lhs b/compiler/simplCore/Simplify.lhs
index 5ea0a91007..5ea0a91007 100644
--- a/ghc/compiler/simplCore/Simplify.lhs
+++ b/compiler/simplCore/Simplify.lhs
diff --git a/ghc/compiler/simplCore/simplifier.tib b/compiler/simplCore/simplifier.tib
index 18acd27943..18acd27943 100644
--- a/ghc/compiler/simplCore/simplifier.tib
+++ b/compiler/simplCore/simplifier.tib
diff --git a/ghc/compiler/simplStg/SRT.lhs b/compiler/simplStg/SRT.lhs
index cd118d7092..cd118d7092 100644
--- a/ghc/compiler/simplStg/SRT.lhs
+++ b/compiler/simplStg/SRT.lhs
diff --git a/ghc/compiler/simplStg/SimplStg.lhs b/compiler/simplStg/SimplStg.lhs
index e87877cb4c..e87877cb4c 100644
--- a/ghc/compiler/simplStg/SimplStg.lhs
+++ b/compiler/simplStg/SimplStg.lhs
diff --git a/ghc/compiler/simplStg/StgStats.lhs b/compiler/simplStg/StgStats.lhs
index a91873971c..a91873971c 100644
--- a/ghc/compiler/simplStg/StgStats.lhs
+++ b/compiler/simplStg/StgStats.lhs
diff --git a/ghc/compiler/specialise/Rules.lhs b/compiler/specialise/Rules.lhs
index 4d743140ea..4d743140ea 100644
--- a/ghc/compiler/specialise/Rules.lhs
+++ b/compiler/specialise/Rules.lhs
diff --git a/ghc/compiler/specialise/SpecConstr.lhs b/compiler/specialise/SpecConstr.lhs
index 74944da983..74944da983 100644
--- a/ghc/compiler/specialise/SpecConstr.lhs
+++ b/compiler/specialise/SpecConstr.lhs
diff --git a/ghc/compiler/specialise/Specialise.lhs b/compiler/specialise/Specialise.lhs
index 0e66b0bc78..0e66b0bc78 100644
--- a/ghc/compiler/specialise/Specialise.lhs
+++ b/compiler/specialise/Specialise.lhs
diff --git a/ghc/compiler/stgSyn/CoreToStg.lhs b/compiler/stgSyn/CoreToStg.lhs
index 824cabaacb..824cabaacb 100644
--- a/ghc/compiler/stgSyn/CoreToStg.lhs
+++ b/compiler/stgSyn/CoreToStg.lhs
diff --git a/ghc/compiler/stgSyn/StgLint.lhs b/compiler/stgSyn/StgLint.lhs
index 326cd44578..326cd44578 100644
--- a/ghc/compiler/stgSyn/StgLint.lhs
+++ b/compiler/stgSyn/StgLint.lhs
diff --git a/ghc/compiler/stgSyn/StgSyn.lhs b/compiler/stgSyn/StgSyn.lhs
index f1c50cc8fd..f1c50cc8fd 100644
--- a/ghc/compiler/stgSyn/StgSyn.lhs
+++ b/compiler/stgSyn/StgSyn.lhs
diff --git a/ghc/compiler/stranal/DmdAnal.lhs b/compiler/stranal/DmdAnal.lhs
index c5cfb7b4bd..c5cfb7b4bd 100644
--- a/ghc/compiler/stranal/DmdAnal.lhs
+++ b/compiler/stranal/DmdAnal.lhs
diff --git a/ghc/compiler/stranal/SaAbsInt.lhs b/compiler/stranal/SaAbsInt.lhs
index a6a79ec166..a6a79ec166 100644
--- a/ghc/compiler/stranal/SaAbsInt.lhs
+++ b/compiler/stranal/SaAbsInt.lhs
diff --git a/ghc/compiler/stranal/SaLib.lhs b/compiler/stranal/SaLib.lhs
index 338a351530..338a351530 100644
--- a/ghc/compiler/stranal/SaLib.lhs
+++ b/compiler/stranal/SaLib.lhs
diff --git a/ghc/compiler/stranal/StrictAnal.lhs b/compiler/stranal/StrictAnal.lhs
index 242a947074..242a947074 100644
--- a/ghc/compiler/stranal/StrictAnal.lhs
+++ b/compiler/stranal/StrictAnal.lhs
diff --git a/ghc/compiler/stranal/WorkWrap.lhs b/compiler/stranal/WorkWrap.lhs
index 64eba89273..64eba89273 100644
--- a/ghc/compiler/stranal/WorkWrap.lhs
+++ b/compiler/stranal/WorkWrap.lhs
diff --git a/ghc/compiler/stranal/WwLib.lhs b/compiler/stranal/WwLib.lhs
index e44e521c83..e44e521c83 100644
--- a/ghc/compiler/stranal/WwLib.lhs
+++ b/compiler/stranal/WwLib.lhs
diff --git a/ghc/compiler/typecheck/Inst.lhs b/compiler/typecheck/Inst.lhs
index 8768e20250..8768e20250 100644
--- a/ghc/compiler/typecheck/Inst.lhs
+++ b/compiler/typecheck/Inst.lhs
diff --git a/ghc/compiler/typecheck/TcArrows.lhs b/compiler/typecheck/TcArrows.lhs
index 3bfa9b4757..3bfa9b4757 100644
--- a/ghc/compiler/typecheck/TcArrows.lhs
+++ b/compiler/typecheck/TcArrows.lhs
diff --git a/ghc/compiler/typecheck/TcBinds.lhs b/compiler/typecheck/TcBinds.lhs
index cffcb9cfb9..cffcb9cfb9 100644
--- a/ghc/compiler/typecheck/TcBinds.lhs
+++ b/compiler/typecheck/TcBinds.lhs
diff --git a/ghc/compiler/typecheck/TcClassDcl.lhs b/compiler/typecheck/TcClassDcl.lhs
index 14682a295d..14682a295d 100644
--- a/ghc/compiler/typecheck/TcClassDcl.lhs
+++ b/compiler/typecheck/TcClassDcl.lhs
diff --git a/ghc/compiler/typecheck/TcDefaults.lhs b/compiler/typecheck/TcDefaults.lhs
index 6c9de36a3c..6c9de36a3c 100644
--- a/ghc/compiler/typecheck/TcDefaults.lhs
+++ b/compiler/typecheck/TcDefaults.lhs
diff --git a/ghc/compiler/typecheck/TcDeriv.lhs b/compiler/typecheck/TcDeriv.lhs
index 472ce6b94d..472ce6b94d 100644
--- a/ghc/compiler/typecheck/TcDeriv.lhs
+++ b/compiler/typecheck/TcDeriv.lhs
diff --git a/ghc/compiler/typecheck/TcEnv.lhs b/compiler/typecheck/TcEnv.lhs
index 497ba235da..497ba235da 100644
--- a/ghc/compiler/typecheck/TcEnv.lhs
+++ b/compiler/typecheck/TcEnv.lhs
diff --git a/ghc/compiler/typecheck/TcExpr.hi-boot-5 b/compiler/typecheck/TcExpr.hi-boot-5
index 14714cd2f6..14714cd2f6 100644
--- a/ghc/compiler/typecheck/TcExpr.hi-boot-5
+++ b/compiler/typecheck/TcExpr.hi-boot-5
diff --git a/ghc/compiler/typecheck/TcExpr.hi-boot-6 b/compiler/typecheck/TcExpr.hi-boot-6
index 5a0fa8cd2c..5a0fa8cd2c 100644
--- a/ghc/compiler/typecheck/TcExpr.hi-boot-6
+++ b/compiler/typecheck/TcExpr.hi-boot-6
diff --git a/ghc/compiler/typecheck/TcExpr.lhs b/compiler/typecheck/TcExpr.lhs
index a044f43ef2..a044f43ef2 100644
--- a/ghc/compiler/typecheck/TcExpr.lhs
+++ b/compiler/typecheck/TcExpr.lhs
diff --git a/ghc/compiler/typecheck/TcExpr.lhs-boot b/compiler/typecheck/TcExpr.lhs-boot
index 1c4240dcc0..1c4240dcc0 100644
--- a/ghc/compiler/typecheck/TcExpr.lhs-boot
+++ b/compiler/typecheck/TcExpr.lhs-boot
diff --git a/ghc/compiler/typecheck/TcForeign.lhs b/compiler/typecheck/TcForeign.lhs
index 4be039bd93..4be039bd93 100644
--- a/ghc/compiler/typecheck/TcForeign.lhs
+++ b/compiler/typecheck/TcForeign.lhs
diff --git a/ghc/compiler/typecheck/TcGenDeriv.lhs b/compiler/typecheck/TcGenDeriv.lhs
index 40e091d475..40e091d475 100644
--- a/ghc/compiler/typecheck/TcGenDeriv.lhs
+++ b/compiler/typecheck/TcGenDeriv.lhs
diff --git a/ghc/compiler/typecheck/TcHsSyn.lhs b/compiler/typecheck/TcHsSyn.lhs
index 6389f34aef..6389f34aef 100644
--- a/ghc/compiler/typecheck/TcHsSyn.lhs
+++ b/compiler/typecheck/TcHsSyn.lhs
diff --git a/ghc/compiler/typecheck/TcHsType.lhs b/compiler/typecheck/TcHsType.lhs
index 968ccfb960..968ccfb960 100644
--- a/ghc/compiler/typecheck/TcHsType.lhs
+++ b/compiler/typecheck/TcHsType.lhs
diff --git a/ghc/compiler/typecheck/TcInstDcls.lhs b/compiler/typecheck/TcInstDcls.lhs
index 45338d0a1e..45338d0a1e 100644
--- a/ghc/compiler/typecheck/TcInstDcls.lhs
+++ b/compiler/typecheck/TcInstDcls.lhs
diff --git a/ghc/compiler/typecheck/TcMType.lhs b/compiler/typecheck/TcMType.lhs
index fa129d3927..fa129d3927 100644
--- a/ghc/compiler/typecheck/TcMType.lhs
+++ b/compiler/typecheck/TcMType.lhs
diff --git a/ghc/compiler/typecheck/TcMatches.hi-boot-5 b/compiler/typecheck/TcMatches.hi-boot-5
index 43e2330683..43e2330683 100644
--- a/ghc/compiler/typecheck/TcMatches.hi-boot-5
+++ b/compiler/typecheck/TcMatches.hi-boot-5
diff --git a/ghc/compiler/typecheck/TcMatches.hi-boot-6 b/compiler/typecheck/TcMatches.hi-boot-6
index fb723a4527..fb723a4527 100644
--- a/ghc/compiler/typecheck/TcMatches.hi-boot-6
+++ b/compiler/typecheck/TcMatches.hi-boot-6
diff --git a/ghc/compiler/typecheck/TcMatches.lhs b/compiler/typecheck/TcMatches.lhs
index 07a1094d58..07a1094d58 100644
--- a/ghc/compiler/typecheck/TcMatches.lhs
+++ b/compiler/typecheck/TcMatches.lhs
diff --git a/ghc/compiler/typecheck/TcMatches.lhs-boot b/compiler/typecheck/TcMatches.lhs-boot
index 18a79fa984..18a79fa984 100644
--- a/ghc/compiler/typecheck/TcMatches.lhs-boot
+++ b/compiler/typecheck/TcMatches.lhs-boot
diff --git a/ghc/compiler/typecheck/TcPat.lhs b/compiler/typecheck/TcPat.lhs
index 4c56b083bb..4c56b083bb 100644
--- a/ghc/compiler/typecheck/TcPat.lhs
+++ b/compiler/typecheck/TcPat.lhs
diff --git a/ghc/compiler/typecheck/TcRnDriver.lhs b/compiler/typecheck/TcRnDriver.lhs
index 5f4b487103..5f4b487103 100644
--- a/ghc/compiler/typecheck/TcRnDriver.lhs
+++ b/compiler/typecheck/TcRnDriver.lhs
diff --git a/ghc/compiler/typecheck/TcRnMonad.lhs b/compiler/typecheck/TcRnMonad.lhs
index ff1979bc06..ff1979bc06 100644
--- a/ghc/compiler/typecheck/TcRnMonad.lhs
+++ b/compiler/typecheck/TcRnMonad.lhs
diff --git a/ghc/compiler/typecheck/TcRnTypes.lhs b/compiler/typecheck/TcRnTypes.lhs
index 62281b56a1..62281b56a1 100644
--- a/ghc/compiler/typecheck/TcRnTypes.lhs
+++ b/compiler/typecheck/TcRnTypes.lhs
diff --git a/ghc/compiler/typecheck/TcRules.lhs b/compiler/typecheck/TcRules.lhs
index b14c2c9449..b14c2c9449 100644
--- a/ghc/compiler/typecheck/TcRules.lhs
+++ b/compiler/typecheck/TcRules.lhs
diff --git a/ghc/compiler/typecheck/TcSimplify.lhs b/compiler/typecheck/TcSimplify.lhs
index 7656198a25..7656198a25 100644
--- a/ghc/compiler/typecheck/TcSimplify.lhs
+++ b/compiler/typecheck/TcSimplify.lhs
diff --git a/ghc/compiler/typecheck/TcSplice.hi-boot-6 b/compiler/typecheck/TcSplice.hi-boot-6
index aa73980e5a..aa73980e5a 100644
--- a/ghc/compiler/typecheck/TcSplice.hi-boot-6
+++ b/compiler/typecheck/TcSplice.hi-boot-6
diff --git a/ghc/compiler/typecheck/TcSplice.lhs b/compiler/typecheck/TcSplice.lhs
index beb72f1932..beb72f1932 100644
--- a/ghc/compiler/typecheck/TcSplice.lhs
+++ b/compiler/typecheck/TcSplice.lhs
diff --git a/ghc/compiler/typecheck/TcSplice.lhs-boot b/compiler/typecheck/TcSplice.lhs-boot
index d161770672..d161770672 100644
--- a/ghc/compiler/typecheck/TcSplice.lhs-boot
+++ b/compiler/typecheck/TcSplice.lhs-boot
diff --git a/ghc/compiler/typecheck/TcTyClsDecls.lhs b/compiler/typecheck/TcTyClsDecls.lhs
index 9e0b6cc6ed..9e0b6cc6ed 100644
--- a/ghc/compiler/typecheck/TcTyClsDecls.lhs
+++ b/compiler/typecheck/TcTyClsDecls.lhs
diff --git a/ghc/compiler/typecheck/TcTyDecls.lhs b/compiler/typecheck/TcTyDecls.lhs
index 4ce5fed3f3..4ce5fed3f3 100644
--- a/ghc/compiler/typecheck/TcTyDecls.lhs
+++ b/compiler/typecheck/TcTyDecls.lhs
diff --git a/ghc/compiler/typecheck/TcType.hi-boot-5 b/compiler/typecheck/TcType.hi-boot-5
index 23b3a9c963..23b3a9c963 100644
--- a/ghc/compiler/typecheck/TcType.hi-boot-5
+++ b/compiler/typecheck/TcType.hi-boot-5
diff --git a/ghc/compiler/typecheck/TcType.hi-boot-6 b/compiler/typecheck/TcType.hi-boot-6
index d1fc721c64..d1fc721c64 100644
--- a/ghc/compiler/typecheck/TcType.hi-boot-6
+++ b/compiler/typecheck/TcType.hi-boot-6
diff --git a/ghc/compiler/typecheck/TcType.lhs b/compiler/typecheck/TcType.lhs
index 4b6e7b814e..4b6e7b814e 100644
--- a/ghc/compiler/typecheck/TcType.lhs
+++ b/compiler/typecheck/TcType.lhs
diff --git a/ghc/compiler/typecheck/TcType.lhs-boot b/compiler/typecheck/TcType.lhs-boot
index 191badd943..191badd943 100644
--- a/ghc/compiler/typecheck/TcType.lhs-boot
+++ b/compiler/typecheck/TcType.lhs-boot
diff --git a/ghc/compiler/typecheck/TcUnify.hi-boot-5 b/compiler/typecheck/TcUnify.hi-boot-5
index b88d3abeb0..b88d3abeb0 100644
--- a/ghc/compiler/typecheck/TcUnify.hi-boot-5
+++ b/compiler/typecheck/TcUnify.hi-boot-5
diff --git a/ghc/compiler/typecheck/TcUnify.hi-boot-6 b/compiler/typecheck/TcUnify.hi-boot-6
index eb286359e2..eb286359e2 100644
--- a/ghc/compiler/typecheck/TcUnify.hi-boot-6
+++ b/compiler/typecheck/TcUnify.hi-boot-6
diff --git a/ghc/compiler/typecheck/TcUnify.lhs b/compiler/typecheck/TcUnify.lhs
index 23cc9e2176..23cc9e2176 100644
--- a/ghc/compiler/typecheck/TcUnify.lhs
+++ b/compiler/typecheck/TcUnify.lhs
diff --git a/ghc/compiler/typecheck/TcUnify.lhs-boot b/compiler/typecheck/TcUnify.lhs-boot
index 8a1847e671..8a1847e671 100644
--- a/ghc/compiler/typecheck/TcUnify.lhs-boot
+++ b/compiler/typecheck/TcUnify.lhs-boot
diff --git a/ghc/compiler/types/Class.lhs b/compiler/types/Class.lhs
index 016ce1bfbe..016ce1bfbe 100644
--- a/ghc/compiler/types/Class.lhs
+++ b/compiler/types/Class.lhs
diff --git a/ghc/compiler/types/FunDeps.lhs b/compiler/types/FunDeps.lhs
index 9347f5f665..9347f5f665 100644
--- a/ghc/compiler/types/FunDeps.lhs
+++ b/compiler/types/FunDeps.lhs
diff --git a/ghc/compiler/types/Generics.lhs b/compiler/types/Generics.lhs
index 2c973649cf..2c973649cf 100644
--- a/ghc/compiler/types/Generics.lhs
+++ b/compiler/types/Generics.lhs
diff --git a/ghc/compiler/types/InstEnv.lhs b/compiler/types/InstEnv.lhs
index d4a7b771b7..d4a7b771b7 100644
--- a/ghc/compiler/types/InstEnv.lhs
+++ b/compiler/types/InstEnv.lhs
diff --git a/ghc/compiler/types/Kind.lhs b/compiler/types/Kind.lhs
index fa24fec144..fa24fec144 100644
--- a/ghc/compiler/types/Kind.lhs
+++ b/compiler/types/Kind.lhs
diff --git a/ghc/compiler/types/TyCon.hi-boot-5 b/compiler/types/TyCon.hi-boot-5
index 1f040d73e1..1f040d73e1 100644
--- a/ghc/compiler/types/TyCon.hi-boot-5
+++ b/compiler/types/TyCon.hi-boot-5
diff --git a/ghc/compiler/types/TyCon.hi-boot-6 b/compiler/types/TyCon.hi-boot-6
index 08975621f0..08975621f0 100644
--- a/ghc/compiler/types/TyCon.hi-boot-6
+++ b/compiler/types/TyCon.hi-boot-6
diff --git a/ghc/compiler/types/TyCon.lhs b/compiler/types/TyCon.lhs
index fcd32c6974..fcd32c6974 100644
--- a/ghc/compiler/types/TyCon.lhs
+++ b/compiler/types/TyCon.lhs
diff --git a/ghc/compiler/types/TyCon.lhs-boot b/compiler/types/TyCon.lhs-boot
index 83b4b7d07a..83b4b7d07a 100644
--- a/ghc/compiler/types/TyCon.lhs-boot
+++ b/compiler/types/TyCon.lhs-boot
diff --git a/ghc/compiler/types/Type.lhs b/compiler/types/Type.lhs
index 872feb06f5..872feb06f5 100644
--- a/ghc/compiler/types/Type.lhs
+++ b/compiler/types/Type.lhs
diff --git a/ghc/compiler/types/TypeRep.hi-boot-5 b/compiler/types/TypeRep.hi-boot-5
index 80452e4d2f..80452e4d2f 100644
--- a/ghc/compiler/types/TypeRep.hi-boot-5
+++ b/compiler/types/TypeRep.hi-boot-5
diff --git a/ghc/compiler/types/TypeRep.hi-boot-6 b/compiler/types/TypeRep.hi-boot-6
index 55d80a6acc..55d80a6acc 100644
--- a/ghc/compiler/types/TypeRep.hi-boot-6
+++ b/compiler/types/TypeRep.hi-boot-6
diff --git a/ghc/compiler/types/TypeRep.lhs b/compiler/types/TypeRep.lhs
index 7bb863a210..7bb863a210 100644
--- a/ghc/compiler/types/TypeRep.lhs
+++ b/compiler/types/TypeRep.lhs
diff --git a/ghc/compiler/types/TypeRep.lhs-boot b/compiler/types/TypeRep.lhs-boot
index b99fdd3321..b99fdd3321 100644
--- a/ghc/compiler/types/TypeRep.lhs-boot
+++ b/compiler/types/TypeRep.lhs-boot
diff --git a/ghc/compiler/types/Unify.lhs b/compiler/types/Unify.lhs
index f60c7bee61..f60c7bee61 100644
--- a/ghc/compiler/types/Unify.lhs
+++ b/compiler/types/Unify.lhs
diff --git a/ghc/compiler/utils/Bag.lhs b/compiler/utils/Bag.lhs
index b107f84a3a..b107f84a3a 100644
--- a/ghc/compiler/utils/Bag.lhs
+++ b/compiler/utils/Bag.lhs
diff --git a/ghc/compiler/utils/Binary.hs b/compiler/utils/Binary.hs
index 7a1ca515b7..7a1ca515b7 100644
--- a/ghc/compiler/utils/Binary.hs
+++ b/compiler/utils/Binary.hs
diff --git a/ghc/compiler/utils/BitSet.lhs b/compiler/utils/BitSet.lhs
index a108136af3..a108136af3 100644
--- a/ghc/compiler/utils/BitSet.lhs
+++ b/compiler/utils/BitSet.lhs
diff --git a/ghc/compiler/utils/BufWrite.hs b/compiler/utils/BufWrite.hs
index a03db3d084..a03db3d084 100644
--- a/ghc/compiler/utils/BufWrite.hs
+++ b/compiler/utils/BufWrite.hs
diff --git a/ghc/compiler/utils/Digraph.lhs b/compiler/utils/Digraph.lhs
index c49087c8f3..c49087c8f3 100644
--- a/ghc/compiler/utils/Digraph.lhs
+++ b/compiler/utils/Digraph.lhs
diff --git a/ghc/compiler/utils/Encoding.hs b/compiler/utils/Encoding.hs
index 152bf3c60e..152bf3c60e 100644
--- a/ghc/compiler/utils/Encoding.hs
+++ b/compiler/utils/Encoding.hs
diff --git a/ghc/compiler/utils/FastMutInt.lhs b/compiler/utils/FastMutInt.lhs
index b483a1428e..b483a1428e 100644
--- a/ghc/compiler/utils/FastMutInt.lhs
+++ b/compiler/utils/FastMutInt.lhs
diff --git a/ghc/compiler/utils/FastString.lhs b/compiler/utils/FastString.lhs
index ea307799c4..ea307799c4 100644
--- a/ghc/compiler/utils/FastString.lhs
+++ b/compiler/utils/FastString.lhs
diff --git a/ghc/compiler/utils/FastTypes.lhs b/compiler/utils/FastTypes.lhs
index bb92c8c02f..bb92c8c02f 100644
--- a/ghc/compiler/utils/FastTypes.lhs
+++ b/compiler/utils/FastTypes.lhs
diff --git a/ghc/compiler/utils/FiniteMap.lhs b/compiler/utils/FiniteMap.lhs
index 9168d3656f..9168d3656f 100644
--- a/ghc/compiler/utils/FiniteMap.lhs
+++ b/compiler/utils/FiniteMap.lhs
diff --git a/ghc/compiler/utils/IOEnv.hs b/compiler/utils/IOEnv.hs
index e1dfdb400b..e1dfdb400b 100644
--- a/ghc/compiler/utils/IOEnv.hs
+++ b/compiler/utils/IOEnv.hs
diff --git a/ghc/compiler/utils/ListSetOps.lhs b/compiler/utils/ListSetOps.lhs
index 02950722a2..02950722a2 100644
--- a/ghc/compiler/utils/ListSetOps.lhs
+++ b/compiler/utils/ListSetOps.lhs
diff --git a/ghc/compiler/utils/Maybes.lhs b/compiler/utils/Maybes.lhs
index 3c9bd693e6..3c9bd693e6 100644
--- a/ghc/compiler/utils/Maybes.lhs
+++ b/compiler/utils/Maybes.lhs
diff --git a/ghc/compiler/utils/OrdList.lhs b/compiler/utils/OrdList.lhs
index 7f22b38e49..7f22b38e49 100644
--- a/ghc/compiler/utils/OrdList.lhs
+++ b/compiler/utils/OrdList.lhs
diff --git a/ghc/compiler/utils/Outputable.lhs b/compiler/utils/Outputable.lhs
index cf99e12bcf..cf99e12bcf 100644
--- a/ghc/compiler/utils/Outputable.lhs
+++ b/compiler/utils/Outputable.lhs
diff --git a/ghc/compiler/utils/Panic.lhs b/compiler/utils/Panic.lhs
index 1a74d5db32..1a74d5db32 100644
--- a/ghc/compiler/utils/Panic.lhs
+++ b/compiler/utils/Panic.lhs
diff --git a/ghc/compiler/utils/Pretty.lhs b/compiler/utils/Pretty.lhs
index ec8f1e75ad..ec8f1e75ad 100644
--- a/ghc/compiler/utils/Pretty.lhs
+++ b/compiler/utils/Pretty.lhs
diff --git a/ghc/compiler/utils/StringBuffer.lhs b/compiler/utils/StringBuffer.lhs
index e52e7e78da..e52e7e78da 100644
--- a/ghc/compiler/utils/StringBuffer.lhs
+++ b/compiler/utils/StringBuffer.lhs
diff --git a/ghc/compiler/utils/UniqFM.lhs b/compiler/utils/UniqFM.lhs
index 84294aae0d..84294aae0d 100644
--- a/ghc/compiler/utils/UniqFM.lhs
+++ b/compiler/utils/UniqFM.lhs
diff --git a/ghc/compiler/utils/UniqSet.lhs b/compiler/utils/UniqSet.lhs
index 129e333eb5..129e333eb5 100644
--- a/ghc/compiler/utils/UniqSet.lhs
+++ b/compiler/utils/UniqSet.lhs
diff --git a/ghc/compiler/utils/Util.lhs b/compiler/utils/Util.lhs
index e692ff1aa3..e692ff1aa3 100644
--- a/ghc/compiler/utils/Util.lhs
+++ b/compiler/utils/Util.lhs
diff --git a/configure.ac b/configure.ac
index f8d64d5a47..a35ad817e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,12 @@ dnl
 # see what flags are available. (Better yet, read the documentation!)
 #
 
-AC_INIT([fptools build system], [1.0], [cvs-fptools@haskell.org], [fptools])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [6.5], [glasgow-haskell-bugs@haskell.org], [ghc])
+
+FP_SETUP_PROJECT_VERSION
+
+# Hmmm, we fix the RPM release number to 1 here... Is this convenient?
+AC_SUBST([release], [1])
 
 # First off, a distrib sanity check..
 AC_CONFIG_SRCDIR([mk/config.mk.in])
@@ -28,7 +33,7 @@ dnl
 dnl After the toplevel configuration is complete, the script will recurse into
 dnl these subdirectories if they exist. The use of a cache file makes repeated
 dnl checks cheap.
-AC_CONFIG_SUBDIRS([ghc libraries])
+AC_CONFIG_SUBDIRS([libraries])
 
 # -------------------------------------------------------------------------
 # Prepare to generate the following header files
@@ -649,6 +654,9 @@ if test "$WithGhc" != ""; then
   AC_SUBST(GhcPatchLevel)dnl
 fi
 
+# Check whether this GHC has readline installed
+FP_GHC_HAS_READLINE
+
 AC_PATH_PROGS(NHC,nhc nhc98)
 AC_PATH_PROG(HBC,hbc)
 
@@ -717,21 +725,6 @@ if test "$BootingFromHc" = "NO" -a "$WithGhc" = "" -a -d "$srcdir/ghc"; then
 AC_MSG_ERROR([GHC is required unless bootstrapping from .hc files.])
 fi;
 
-dnl ** --enable-threaded-rts (not used any more)
-dnl --------------------------------------------------------------
-AC_ARG_ENABLE(threaded-rts,
-[AC_HELP_STRING([--enable-threaded-rts],
-[DEPRECATED (backwards compatibility only). [default=no]])],
-[ if test x"$enableval" = x"yes"; then
-	ThreadedRts=YES
-  else
-	ThreadedRts=NO
-  fi
-],
-[ThreadedRts=NO]
-)
-AC_SUBST(ThreadedRts)
-
 dnl ** Enable the construction of Win32 DLLs?
 dnl --------------------------------------------------------------
 dnl
@@ -850,6 +843,7 @@ dnl     If gcc, make sure it's at least 2.1
 dnl
 FP_HAVE_GCC
 FP_MINGW_GCC
+FP_GCC_NEEDS_NO_OMIT_LFPTR
 
 dnl ** figure out how to invoke cpp directly (gcc -E is no good)
 AC_PROG_CPP
@@ -1236,7 +1230,18 @@ AC_TRY_LINK_FUNC(printf$LSBLStub,
             [Define to 1 if we have printf$LDBLStub (Apple Mac OS >= 10.4, PPC).])
     ])
 
+# test for GTK+
+AC_PATH_PROGS([GTK_CONFIG], [pkg-config])
+if test -n "$GTK_CONFIG"; then
+  if $GTK_CONFIG gtk+-2.0 --atleast-version=2.0; then
+    GTK_CONFIG="$GTK_CONFIG gtk+-2.0"
+  else
+    AC_MSG_WARN([GTK+ not usable, need at least version 2.0])
+    GTK_CONFIG=
+  fi
+fi
+AC_SUBST([GTK_CONFIG])
 
-AC_CONFIG_FILES([mk/config.mk])
+AC_CONFIG_FILES([mk/config.mk ghc.spec docs/users_guide/ug-book.xml])
 AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h])
 AC_OUTPUT
diff --git a/distrib/hc-build b/distrib/hc-build
index 1540e15757..5ce9dfbdd9 100644
--- a/distrib/hc-build
+++ b/distrib/hc-build
@@ -46,7 +46,7 @@ esac
 echo "*** Building compiler..."
 ./configure --enable-hc-boot $configopts
 
-$MAKE -C glafp-utils boot all
+$MAKE -C utils boot all
 $MAKE -C ghc boot
 $MAKE -C libraries boot all GhcBootLibs=YES
 $MAKE -C ghc all
@@ -60,7 +60,7 @@ configopts=`echo $configopts | sed s/--enable-hc-boot-unregisterised//`
 
 # Reconfigure, using the newly-build ghc binary as our $(GHC), and
 # with hc bootstrapping disabled.
-HappyCmd="$PWD/distrib/fake-happy" ./configure --with-ghc="$PWD/ghc/compiler/ghc-inplace" $configopts
+HappyCmd="$PWD/distrib/fake-happy" ./configure --with-ghc="$PWD/compiler/ghc-inplace" $configopts
 
 PRIMOP_BITS="primop-data-decl.hs-incl \
 	      primop-tag.hs-incl  \
@@ -80,27 +80,24 @@ PRIMOP_BITS="primop-data-decl.hs-incl \
 find libraries hslibs | grep '\.[oa]$' | xargs rm -f
 
 # Do includes and RTS now
-$MAKE -C ghc/includes boot && $MAKE -C ghc/includes all
-$MAKE -C ghc/rts      boot && $MAKE -C ghc/rts      all
+$MAKE -C includes boot && $MAKE -C includes all
+$MAKE -C rts      boot && $MAKE -C rts      all
 
 # Now build a new set of libraries (GhcBootLibs only for now)
 $MAKE -C libraries boot all GhcBootLibs=YES
 
-# Build all of ghc/lib
-$MAKE -C ghc/lib clean && $MAKE -C ghc/lib boot all
+# Build all of compat
+$MAKE -C compat clean && $MAKE -C compat boot all
 
-# Build all of ghc/utils
-$MAKE -C ghc/utils clean && $MAKE -C ghc/utils boot all
+# Build all of utils
+$MAKE -C utils clean && $MAKE -C utils boot all
 
 # Build the rest of the libraries
 $MAKE -C libraries boot all
 
-# Now we can build hslibs (hsc2hs is required, so must be after ghc/utils)
-$MAKE -C hslibs  boot all
-
 # The reconfigure step updates a few files, which can lead to
 # unnecessary recompilations.  Touch a bunch of things here to avoid
 # having to recompile stuff that we've already built.
-(cd ghc/compiler; touch $PRIMOP_BITS parser/hschooks.o prelude/PrimOp.o main/Config.hs main/Config.o ghc-*)
+(cd compiler; touch $PRIMOP_BITS parser/hschooks.o prelude/PrimOp.o main/Config.hs main/Config.o ghc-*)
 
 # At this point, the tree should be safe to do 'make install' in.
diff --git a/docs/Makefile b/docs/Makefile
index a9140dd843..b384a934c6 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,6 +1,6 @@
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
 
-SUBDIRS = docbook-cheat-sheet
+SUBDIRS = building docbook-cheat-sheet ext-core storage-mgt users_guide
 
 include $(TOP)/mk/target.mk
diff --git a/ghc/docs/building/Makefile b/docs/building/Makefile
index fb9cce6ff5..fb9cce6ff5 100644
--- a/ghc/docs/building/Makefile
+++ b/docs/building/Makefile
diff --git a/ghc/docs/building/building.xml b/docs/building/building.xml
index e1967e9fec..e1967e9fec 100644
--- a/ghc/docs/building/building.xml
+++ b/docs/building/building.xml
diff --git a/ghc/docs/comm/exts/ndp.html b/docs/comm/exts/ndp.html
index 0c94c3960b..0c94c3960b 100644
--- a/ghc/docs/comm/exts/ndp.html
+++ b/docs/comm/exts/ndp.html
diff --git a/ghc/docs/comm/exts/th.html b/docs/comm/exts/th.html
index dbb168aa0e..dbb168aa0e 100644
--- a/ghc/docs/comm/exts/th.html
+++ b/docs/comm/exts/th.html
diff --git a/ghc/docs/comm/feedback.html b/docs/comm/feedback.html
index 1da8b10f29..1da8b10f29 100644
--- a/ghc/docs/comm/feedback.html
+++ b/docs/comm/feedback.html
diff --git a/ghc/docs/comm/genesis/genesis.html b/docs/comm/genesis/genesis.html
index 30b16fec46..30b16fec46 100644
--- a/ghc/docs/comm/genesis/genesis.html
+++ b/docs/comm/genesis/genesis.html
diff --git a/ghc/docs/comm/genesis/makefiles.html b/docs/comm/genesis/makefiles.html
index 957a82eb85..957a82eb85 100644
--- a/ghc/docs/comm/genesis/makefiles.html
+++ b/docs/comm/genesis/makefiles.html
diff --git a/ghc/docs/comm/genesis/modules.html b/docs/comm/genesis/modules.html
index de59cce6d3..de59cce6d3 100644
--- a/ghc/docs/comm/genesis/modules.html
+++ b/docs/comm/genesis/modules.html
diff --git a/ghc/docs/comm/index.html b/docs/comm/index.html
index 5ccd5f0ca9..5ccd5f0ca9 100644
--- a/ghc/docs/comm/index.html
+++ b/docs/comm/index.html
diff --git a/ghc/docs/comm/others.html b/docs/comm/others.html
index 52d87e9419..52d87e9419 100644
--- a/ghc/docs/comm/others.html
+++ b/docs/comm/others.html
diff --git a/ghc/docs/comm/rts-libs/coding-style.html b/docs/comm/rts-libs/coding-style.html
index 58f5b4f9bb..58f5b4f9bb 100644
--- a/ghc/docs/comm/rts-libs/coding-style.html
+++ b/docs/comm/rts-libs/coding-style.html
diff --git a/ghc/docs/comm/rts-libs/foreignptr.html b/docs/comm/rts-libs/foreignptr.html
index febe9fe422..febe9fe422 100644
--- a/ghc/docs/comm/rts-libs/foreignptr.html
+++ b/docs/comm/rts-libs/foreignptr.html
diff --git a/ghc/docs/comm/rts-libs/multi-thread.html b/docs/comm/rts-libs/multi-thread.html
index 67a544be85..67a544be85 100644
--- a/ghc/docs/comm/rts-libs/multi-thread.html
+++ b/docs/comm/rts-libs/multi-thread.html
diff --git a/ghc/docs/comm/rts-libs/non-blocking.html b/docs/comm/rts-libs/non-blocking.html
index 627bde8d88..627bde8d88 100644
--- a/ghc/docs/comm/rts-libs/non-blocking.html
+++ b/docs/comm/rts-libs/non-blocking.html
diff --git a/ghc/docs/comm/rts-libs/prelfound.html b/docs/comm/rts-libs/prelfound.html
index 25407eed43..25407eed43 100644
--- a/ghc/docs/comm/rts-libs/prelfound.html
+++ b/docs/comm/rts-libs/prelfound.html
diff --git a/ghc/docs/comm/rts-libs/prelude.html b/docs/comm/rts-libs/prelude.html
index 4ad6c20338..4ad6c20338 100644
--- a/ghc/docs/comm/rts-libs/prelude.html
+++ b/docs/comm/rts-libs/prelude.html
diff --git a/ghc/docs/comm/rts-libs/primitives.html b/docs/comm/rts-libs/primitives.html
index 28abc79426..28abc79426 100644
--- a/ghc/docs/comm/rts-libs/primitives.html
+++ b/docs/comm/rts-libs/primitives.html
diff --git a/ghc/docs/comm/rts-libs/stgc.html b/docs/comm/rts-libs/stgc.html
index 196ec9150d..196ec9150d 100644
--- a/ghc/docs/comm/rts-libs/stgc.html
+++ b/docs/comm/rts-libs/stgc.html
diff --git a/ghc/docs/comm/rts-libs/threaded-rts.html b/docs/comm/rts-libs/threaded-rts.html
index 499aeec767..499aeec767 100644
--- a/ghc/docs/comm/rts-libs/threaded-rts.html
+++ b/docs/comm/rts-libs/threaded-rts.html
diff --git a/ghc/docs/comm/the-beast/alien.html b/docs/comm/the-beast/alien.html
index 3d4776ebc9..3d4776ebc9 100644
--- a/ghc/docs/comm/the-beast/alien.html
+++ b/docs/comm/the-beast/alien.html
diff --git a/ghc/docs/comm/the-beast/basicTypes.html b/docs/comm/the-beast/basicTypes.html
index ca56d6b6a8..ca56d6b6a8 100644
--- a/ghc/docs/comm/the-beast/basicTypes.html
+++ b/docs/comm/the-beast/basicTypes.html
diff --git a/ghc/docs/comm/the-beast/coding-style.html b/docs/comm/the-beast/coding-style.html
index 41347c6902..41347c6902 100644
--- a/ghc/docs/comm/the-beast/coding-style.html
+++ b/docs/comm/the-beast/coding-style.html
diff --git a/ghc/docs/comm/the-beast/data-types.html b/docs/comm/the-beast/data-types.html
index fef4852d4d..fef4852d4d 100644
--- a/ghc/docs/comm/the-beast/data-types.html
+++ b/docs/comm/the-beast/data-types.html
diff --git a/ghc/docs/comm/the-beast/desugar.html b/docs/comm/the-beast/desugar.html
index a66740259b..a66740259b 100644
--- a/ghc/docs/comm/the-beast/desugar.html
+++ b/docs/comm/the-beast/desugar.html
diff --git a/ghc/docs/comm/the-beast/driver.html b/docs/comm/the-beast/driver.html
index fbf65e33e7..fbf65e33e7 100644
--- a/ghc/docs/comm/the-beast/driver.html
+++ b/docs/comm/the-beast/driver.html
diff --git a/ghc/docs/comm/the-beast/fexport.html b/docs/comm/the-beast/fexport.html
index 956043bafb..956043bafb 100644
--- a/ghc/docs/comm/the-beast/fexport.html
+++ b/docs/comm/the-beast/fexport.html
diff --git a/ghc/docs/comm/the-beast/ghci.html b/docs/comm/the-beast/ghci.html
index b893acdeb4..b893acdeb4 100644
--- a/ghc/docs/comm/the-beast/ghci.html
+++ b/docs/comm/the-beast/ghci.html
diff --git a/ghc/docs/comm/the-beast/main.html b/docs/comm/the-beast/main.html
index 332ffaa501..332ffaa501 100644
--- a/ghc/docs/comm/the-beast/main.html
+++ b/docs/comm/the-beast/main.html
diff --git a/ghc/docs/comm/the-beast/mangler.html b/docs/comm/the-beast/mangler.html
index 1ad80f0d5c..1ad80f0d5c 100644
--- a/ghc/docs/comm/the-beast/mangler.html
+++ b/docs/comm/the-beast/mangler.html
diff --git a/ghc/docs/comm/the-beast/modules.html b/docs/comm/the-beast/modules.html
index a6655a68a7..a6655a68a7 100644
--- a/ghc/docs/comm/the-beast/modules.html
+++ b/docs/comm/the-beast/modules.html
diff --git a/ghc/docs/comm/the-beast/names.html b/docs/comm/the-beast/names.html
index 061fae3ebf..061fae3ebf 100644
--- a/ghc/docs/comm/the-beast/names.html
+++ b/docs/comm/the-beast/names.html
diff --git a/ghc/docs/comm/the-beast/ncg.html b/docs/comm/the-beast/ncg.html
index 5810a35212..5810a35212 100644
--- a/ghc/docs/comm/the-beast/ncg.html
+++ b/docs/comm/the-beast/ncg.html
diff --git a/ghc/docs/comm/the-beast/optimistic.html b/docs/comm/the-beast/optimistic.html
index 4d158022e8..4d158022e8 100644
--- a/ghc/docs/comm/the-beast/optimistic.html
+++ b/docs/comm/the-beast/optimistic.html
diff --git a/ghc/docs/comm/the-beast/prelude.html b/docs/comm/the-beast/prelude.html
index 64b607def5..64b607def5 100644
--- a/ghc/docs/comm/the-beast/prelude.html
+++ b/docs/comm/the-beast/prelude.html
diff --git a/ghc/docs/comm/the-beast/renamer.html b/docs/comm/the-beast/renamer.html
index 828b569bb9..828b569bb9 100644
--- a/ghc/docs/comm/the-beast/renamer.html
+++ b/docs/comm/the-beast/renamer.html
diff --git a/ghc/docs/comm/the-beast/simplifier.html b/docs/comm/the-beast/simplifier.html
index 40cf7cf892..40cf7cf892 100644
--- a/ghc/docs/comm/the-beast/simplifier.html
+++ b/docs/comm/the-beast/simplifier.html
diff --git a/ghc/docs/comm/the-beast/stg.html b/docs/comm/the-beast/stg.html
index 4581da7d1f..4581da7d1f 100644
--- a/ghc/docs/comm/the-beast/stg.html
+++ b/docs/comm/the-beast/stg.html
diff --git a/ghc/docs/comm/the-beast/syntax.html b/docs/comm/the-beast/syntax.html
index be5bbefa17..be5bbefa17 100644
--- a/ghc/docs/comm/the-beast/syntax.html
+++ b/docs/comm/the-beast/syntax.html
diff --git a/ghc/docs/comm/the-beast/typecheck.html b/docs/comm/the-beast/typecheck.html
index 8d22784b8a..8d22784b8a 100644
--- a/ghc/docs/comm/the-beast/typecheck.html
+++ b/docs/comm/the-beast/typecheck.html
diff --git a/ghc/docs/comm/the-beast/types.html b/docs/comm/the-beast/types.html
index 383b71f054..383b71f054 100644
--- a/ghc/docs/comm/the-beast/types.html
+++ b/docs/comm/the-beast/types.html
diff --git a/ghc/docs/comm/the-beast/vars.html b/docs/comm/the-beast/vars.html
index 9bbd310c60..9bbd310c60 100644
--- a/ghc/docs/comm/the-beast/vars.html
+++ b/docs/comm/the-beast/vars.html
diff --git a/ghc/docs/ext-core/Makefile b/docs/ext-core/Makefile
index 8c32a7bb25..8c32a7bb25 100644
--- a/ghc/docs/ext-core/Makefile
+++ b/docs/ext-core/Makefile
diff --git a/ghc/docs/ext-core/a4wide.sty b/docs/ext-core/a4wide.sty
index 9f651505d7..9f651505d7 100644
--- a/ghc/docs/ext-core/a4wide.sty
+++ b/docs/ext-core/a4wide.sty
diff --git a/ghc/docs/ext-core/code.sty b/docs/ext-core/code.sty
index 3b62685057..3b62685057 100644
--- a/ghc/docs/ext-core/code.sty
+++ b/docs/ext-core/code.sty
diff --git a/ghc/docs/ext-core/core.tex b/docs/ext-core/core.tex
index 266d857c46..266d857c46 100644
--- a/ghc/docs/ext-core/core.tex
+++ b/docs/ext-core/core.tex
diff --git a/ghc/docs/ghci/ghci.tex b/docs/ghci/ghci.tex
index c4638a6719..c4638a6719 100644
--- a/ghc/docs/ghci/ghci.tex
+++ b/docs/ghci/ghci.tex
diff --git a/ghc/docs/rts/closure.ps b/docs/rts/closure.ps
index 241bf9b404..241bf9b404 100644
--- a/ghc/docs/rts/closure.ps
+++ b/docs/rts/closure.ps
diff --git a/ghc/docs/rts/closure.tex b/docs/rts/closure.tex
index 572a8516cf..572a8516cf 100644
--- a/ghc/docs/rts/closure.tex
+++ b/docs/rts/closure.tex
diff --git a/ghc/docs/rts/hugs_ret.pstex b/docs/rts/hugs_ret.pstex
index 9a7ed98456..9a7ed98456 100644
--- a/ghc/docs/rts/hugs_ret.pstex
+++ b/docs/rts/hugs_ret.pstex
diff --git a/ghc/docs/rts/hugs_ret.pstex_t b/docs/rts/hugs_ret.pstex_t
index 3b844da3f0..3b844da3f0 100644
--- a/ghc/docs/rts/hugs_ret.pstex_t
+++ b/docs/rts/hugs_ret.pstex_t
diff --git a/ghc/docs/rts/hugs_ret2.pstex b/docs/rts/hugs_ret2.pstex
index 74d081c40c..74d081c40c 100644
--- a/ghc/docs/rts/hugs_ret2.pstex
+++ b/docs/rts/hugs_ret2.pstex
diff --git a/ghc/docs/rts/hugs_ret2.pstex_t b/docs/rts/hugs_ret2.pstex_t
index 13208a3de1..13208a3de1 100644
--- a/ghc/docs/rts/hugs_ret2.pstex_t
+++ b/docs/rts/hugs_ret2.pstex_t
diff --git a/ghc/docs/rts/rts.tex b/docs/rts/rts.tex
index 158ae7e79a..158ae7e79a 100644
--- a/ghc/docs/rts/rts.tex
+++ b/docs/rts/rts.tex
diff --git a/ghc/docs/storage-mgt/Makefile b/docs/storage-mgt/Makefile
index 871766d4fc..871766d4fc 100644
--- a/ghc/docs/storage-mgt/Makefile
+++ b/docs/storage-mgt/Makefile
diff --git a/ghc/docs/storage-mgt/architecture.eepic b/docs/storage-mgt/architecture.eepic
index 57ffd8fc99..57ffd8fc99 100644
--- a/ghc/docs/storage-mgt/architecture.eepic
+++ b/docs/storage-mgt/architecture.eepic
diff --git a/ghc/docs/storage-mgt/architecture.fig b/docs/storage-mgt/architecture.fig
index 563da78a53..563da78a53 100644
--- a/ghc/docs/storage-mgt/architecture.fig
+++ b/docs/storage-mgt/architecture.fig
diff --git a/ghc/docs/storage-mgt/cacheprof_p.eps b/docs/storage-mgt/cacheprof_p.eps
index 94d3a5d0c2..94d3a5d0c2 100644
--- a/ghc/docs/storage-mgt/cacheprof_p.eps
+++ b/docs/storage-mgt/cacheprof_p.eps
diff --git a/ghc/docs/storage-mgt/code.sty b/docs/storage-mgt/code.sty
index f5ec2f59ee..f5ec2f59ee 100644
--- a/ghc/docs/storage-mgt/code.sty
+++ b/docs/storage-mgt/code.sty
diff --git a/ghc/docs/storage-mgt/freelist.eepic b/docs/storage-mgt/freelist.eepic
index f87d939649..f87d939649 100644
--- a/ghc/docs/storage-mgt/freelist.eepic
+++ b/docs/storage-mgt/freelist.eepic
diff --git a/ghc/docs/storage-mgt/freelist.fig b/docs/storage-mgt/freelist.fig
index d8debffd7c..d8debffd7c 100644
--- a/ghc/docs/storage-mgt/freelist.fig
+++ b/docs/storage-mgt/freelist.fig
diff --git a/ghc/docs/storage-mgt/gen.eepic b/docs/storage-mgt/gen.eepic
index b50d691395..b50d691395 100644
--- a/ghc/docs/storage-mgt/gen.eepic
+++ b/docs/storage-mgt/gen.eepic
diff --git a/ghc/docs/storage-mgt/gen.fig b/docs/storage-mgt/gen.fig
index 086a335819..086a335819 100644
--- a/ghc/docs/storage-mgt/gen.fig
+++ b/docs/storage-mgt/gen.fig
diff --git a/ghc/docs/storage-mgt/generation.eepic b/docs/storage-mgt/generation.eepic
index bea5a8c6ec..bea5a8c6ec 100644
--- a/ghc/docs/storage-mgt/generation.eepic
+++ b/docs/storage-mgt/generation.eepic
diff --git a/ghc/docs/storage-mgt/generation.fig b/docs/storage-mgt/generation.fig
index e91ed6d4c6..e91ed6d4c6 100644
--- a/ghc/docs/storage-mgt/generation.fig
+++ b/docs/storage-mgt/generation.fig
diff --git a/ghc/docs/storage-mgt/largeobjectpool.eepic b/docs/storage-mgt/largeobjectpool.eepic
index 9c198fd279..9c198fd279 100644
--- a/ghc/docs/storage-mgt/largeobjectpool.eepic
+++ b/docs/storage-mgt/largeobjectpool.eepic
diff --git a/ghc/docs/storage-mgt/largeobjectpool.fig b/docs/storage-mgt/largeobjectpool.fig
index 6c49ff03f1..6c49ff03f1 100644
--- a/ghc/docs/storage-mgt/largeobjectpool.fig
+++ b/docs/storage-mgt/largeobjectpool.fig
diff --git a/ghc/docs/storage-mgt/ldv.eepic b/docs/storage-mgt/ldv.eepic
index aa41327aa5..aa41327aa5 100644
--- a/ghc/docs/storage-mgt/ldv.eepic
+++ b/docs/storage-mgt/ldv.eepic
diff --git a/ghc/docs/storage-mgt/ldv.fig b/docs/storage-mgt/ldv.fig
index 772411c289..772411c289 100644
--- a/ghc/docs/storage-mgt/ldv.fig
+++ b/docs/storage-mgt/ldv.fig
diff --git a/ghc/docs/storage-mgt/ldv.tex b/docs/storage-mgt/ldv.tex
index 936407c701..936407c701 100644
--- a/ghc/docs/storage-mgt/ldv.tex
+++ b/docs/storage-mgt/ldv.tex
diff --git a/ghc/docs/storage-mgt/megablock.eepic b/docs/storage-mgt/megablock.eepic
index 922226945b..922226945b 100644
--- a/ghc/docs/storage-mgt/megablock.eepic
+++ b/docs/storage-mgt/megablock.eepic
diff --git a/ghc/docs/storage-mgt/megablock.fig b/docs/storage-mgt/megablock.fig
index 8116c841b5..8116c841b5 100644
--- a/ghc/docs/storage-mgt/megablock.fig
+++ b/docs/storage-mgt/megablock.fig
diff --git a/ghc/docs/storage-mgt/nursery.eepic b/docs/storage-mgt/nursery.eepic
index 9b06c6e0a3..9b06c6e0a3 100644
--- a/ghc/docs/storage-mgt/nursery.eepic
+++ b/docs/storage-mgt/nursery.eepic
diff --git a/ghc/docs/storage-mgt/nursery.fig b/docs/storage-mgt/nursery.fig
index 6a4b60fb82..6a4b60fb82 100644
--- a/ghc/docs/storage-mgt/nursery.fig
+++ b/docs/storage-mgt/nursery.fig
diff --git a/ghc/docs/storage-mgt/reference.bib b/docs/storage-mgt/reference.bib
index 48fa520b27..48fa520b27 100644
--- a/ghc/docs/storage-mgt/reference.bib
+++ b/docs/storage-mgt/reference.bib
diff --git a/ghc/docs/storage-mgt/rp.tex b/docs/storage-mgt/rp.tex
index 2055894282..2055894282 100644
--- a/ghc/docs/storage-mgt/rp.tex
+++ b/docs/storage-mgt/rp.tex
diff --git a/ghc/docs/storage-mgt/sm.tex b/docs/storage-mgt/sm.tex
index 9dee565c7d..9dee565c7d 100644
--- a/ghc/docs/storage-mgt/sm.tex
+++ b/docs/storage-mgt/sm.tex
diff --git a/ghc/docs/storage-mgt/smallobjectpool.eepic b/docs/storage-mgt/smallobjectpool.eepic
index 0ccf61c3fb..0ccf61c3fb 100644
--- a/ghc/docs/storage-mgt/smallobjectpool.eepic
+++ b/docs/storage-mgt/smallobjectpool.eepic
diff --git a/ghc/docs/storage-mgt/smallobjectpool.fig b/docs/storage-mgt/smallobjectpool.fig
index afcfe9862d..afcfe9862d 100644
--- a/ghc/docs/storage-mgt/smallobjectpool.fig
+++ b/docs/storage-mgt/smallobjectpool.fig
diff --git a/ghc/docs/storage-mgt/step.eepic b/docs/storage-mgt/step.eepic
index d5af2b7b04..d5af2b7b04 100644
--- a/ghc/docs/storage-mgt/step.eepic
+++ b/docs/storage-mgt/step.eepic
diff --git a/ghc/docs/storage-mgt/step.fig b/docs/storage-mgt/step.fig
index af9661f2be..af9661f2be 100644
--- a/ghc/docs/storage-mgt/step.fig
+++ b/docs/storage-mgt/step.fig
diff --git a/ghc/docs/users_guide/5-00-notes.xml b/docs/users_guide/5-00-notes.xml
index 28712472c6..28712472c6 100644
--- a/ghc/docs/users_guide/5-00-notes.xml
+++ b/docs/users_guide/5-00-notes.xml
diff --git a/ghc/docs/users_guide/5-02-notes.xml b/docs/users_guide/5-02-notes.xml
index a8bc83a4ba..a8bc83a4ba 100644
--- a/ghc/docs/users_guide/5-02-notes.xml
+++ b/docs/users_guide/5-02-notes.xml
diff --git a/ghc/docs/users_guide/5-04-notes.xml b/docs/users_guide/5-04-notes.xml
index 91b8dcf606..91b8dcf606 100644
--- a/ghc/docs/users_guide/5-04-notes.xml
+++ b/docs/users_guide/5-04-notes.xml
diff --git a/ghc/docs/users_guide/6.0-notes.xml b/docs/users_guide/6.0-notes.xml
index e07bc890f2..e07bc890f2 100644
--- a/ghc/docs/users_guide/6.0-notes.xml
+++ b/docs/users_guide/6.0-notes.xml
diff --git a/ghc/docs/users_guide/Makefile b/docs/users_guide/Makefile
index f0a31fb705..f0a31fb705 100644
--- a/ghc/docs/users_guide/Makefile
+++ b/docs/users_guide/Makefile
diff --git a/ghc/docs/users_guide/bugs.xml b/docs/users_guide/bugs.xml
index ab0b9be7b9..ab0b9be7b9 100644
--- a/ghc/docs/users_guide/bugs.xml
+++ b/docs/users_guide/bugs.xml
diff --git a/ghc/docs/users_guide/debugging.xml b/docs/users_guide/debugging.xml
index a325389d46..a325389d46 100644
--- a/ghc/docs/users_guide/debugging.xml
+++ b/docs/users_guide/debugging.xml
diff --git a/ghc/docs/users_guide/ffi-chap.xml b/docs/users_guide/ffi-chap.xml
index e1374c4610..e1374c4610 100644
--- a/ghc/docs/users_guide/ffi-chap.xml
+++ b/docs/users_guide/ffi-chap.xml
diff --git a/ghc/docs/users_guide/flags.xml b/docs/users_guide/flags.xml
index e288da2fb2..e288da2fb2 100644
--- a/ghc/docs/users_guide/flags.xml
+++ b/docs/users_guide/flags.xml
diff --git a/ghc/docs/users_guide/ghci.xml b/docs/users_guide/ghci.xml
index 786815d484..786815d484 100644
--- a/ghc/docs/users_guide/ghci.xml
+++ b/docs/users_guide/ghci.xml
diff --git a/ghc/docs/users_guide/glasgow_exts.xml b/docs/users_guide/glasgow_exts.xml
index beaaad616a..beaaad616a 100644
--- a/ghc/docs/users_guide/glasgow_exts.xml
+++ b/docs/users_guide/glasgow_exts.xml
diff --git a/ghc/docs/users_guide/gone_wrong.xml b/docs/users_guide/gone_wrong.xml
index d31087c164..d31087c164 100644
--- a/ghc/docs/users_guide/gone_wrong.xml
+++ b/docs/users_guide/gone_wrong.xml
diff --git a/ghc/docs/users_guide/installing.xml b/docs/users_guide/installing.xml
index 9f8e4c9eb8..9f8e4c9eb8 100644
--- a/ghc/docs/users_guide/installing.xml
+++ b/docs/users_guide/installing.xml
diff --git a/ghc/docs/users_guide/intro.xml b/docs/users_guide/intro.xml
index d4b6a1241f..d4b6a1241f 100644
--- a/ghc/docs/users_guide/intro.xml
+++ b/docs/users_guide/intro.xml
diff --git a/ghc/docs/users_guide/lang.xml b/docs/users_guide/lang.xml
index 7e9621ed8b..7e9621ed8b 100644
--- a/ghc/docs/users_guide/lang.xml
+++ b/docs/users_guide/lang.xml
diff --git a/ghc/docs/users_guide/license.xml b/docs/users_guide/license.xml
index 55e2395a7c..55e2395a7c 100644
--- a/ghc/docs/users_guide/license.xml
+++ b/docs/users_guide/license.xml
diff --git a/ghc/docs/users_guide/packages.xml b/docs/users_guide/packages.xml
index 3bd65c66ce..3bd65c66ce 100644
--- a/ghc/docs/users_guide/packages.xml
+++ b/docs/users_guide/packages.xml
diff --git a/ghc/docs/users_guide/parallel.xml b/docs/users_guide/parallel.xml
index 11c2547898..11c2547898 100644
--- a/ghc/docs/users_guide/parallel.xml
+++ b/docs/users_guide/parallel.xml
diff --git a/ghc/docs/users_guide/phases.xml b/docs/users_guide/phases.xml
index fd034a305a..fd034a305a 100644
--- a/ghc/docs/users_guide/phases.xml
+++ b/docs/users_guide/phases.xml
diff --git a/ghc/docs/users_guide/primitives.xml b/docs/users_guide/primitives.xml
index e41bb59ee1..e41bb59ee1 100644
--- a/ghc/docs/users_guide/primitives.xml
+++ b/docs/users_guide/primitives.xml
diff --git a/ghc/docs/users_guide/profiling.xml b/docs/users_guide/profiling.xml
index a88c8bbf4c..a88c8bbf4c 100644
--- a/ghc/docs/users_guide/profiling.xml
+++ b/docs/users_guide/profiling.xml
diff --git a/ghc/docs/users_guide/runtime_control.xml b/docs/users_guide/runtime_control.xml
index daed07cee3..daed07cee3 100644
--- a/ghc/docs/users_guide/runtime_control.xml
+++ b/docs/users_guide/runtime_control.xml
diff --git a/ghc/docs/users_guide/separate_compilation.xml b/docs/users_guide/separate_compilation.xml
index c33ff2175b..c33ff2175b 100644
--- a/ghc/docs/users_guide/separate_compilation.xml
+++ b/docs/users_guide/separate_compilation.xml
diff --git a/ghc/docs/users_guide/sooner.xml b/docs/users_guide/sooner.xml
index 1aba5d1af0..1aba5d1af0 100644
--- a/ghc/docs/users_guide/sooner.xml
+++ b/docs/users_guide/sooner.xml
diff --git a/ghc/docs/users_guide/ug-book.xml.in b/docs/users_guide/ug-book.xml.in
index c5710f1d77..c5710f1d77 100644
--- a/ghc/docs/users_guide/ug-book.xml.in
+++ b/docs/users_guide/ug-book.xml.in
diff --git a/ghc/docs/users_guide/ug-ent.xml b/docs/users_guide/ug-ent.xml
index cad75ab499..cad75ab499 100644
--- a/ghc/docs/users_guide/ug-ent.xml
+++ b/docs/users_guide/ug-ent.xml
diff --git a/ghc/docs/users_guide/users_guide.xml b/docs/users_guide/users_guide.xml
index 740e729b72..740e729b72 100644
--- a/ghc/docs/users_guide/users_guide.xml
+++ b/docs/users_guide/users_guide.xml
diff --git a/ghc/docs/users_guide/using.xml b/docs/users_guide/using.xml
index 8cbcd35fca..8cbcd35fca 100644
--- a/ghc/docs/users_guide/using.xml
+++ b/docs/users_guide/using.xml
diff --git a/ghc/docs/users_guide/utils.xml b/docs/users_guide/utils.xml
index 6c82f6b38a..6c82f6b38a 100644
--- a/ghc/docs/users_guide/utils.xml
+++ b/docs/users_guide/utils.xml
diff --git a/ghc/docs/users_guide/win32-dlls.xml b/docs/users_guide/win32-dlls.xml
index 959f7ce1b6..959f7ce1b6 100644
--- a/ghc/docs/users_guide/win32-dlls.xml
+++ b/docs/users_guide/win32-dlls.xml
diff --git a/ghc/docs/vh/Makefile b/docs/vh/Makefile
index 4410e4953d..4410e4953d 100644
--- a/ghc/docs/vh/Makefile
+++ b/docs/vh/Makefile
diff --git a/ghc/docs/vh/vh.xml b/docs/vh/vh.xml
index f7d636a71f..f7d636a71f 100644
--- a/ghc/docs/vh/vh.xml
+++ b/docs/vh/vh.xml
diff --git a/ghc/driver/Makefile b/driver/Makefile
index 3a87ab43c5..3a87ab43c5 100644
--- a/ghc/driver/Makefile
+++ b/driver/Makefile
diff --git a/ghc/driver/ghc-usage.txt b/driver/ghc-usage.txt
index e95d5846b9..e95d5846b9 100644
--- a/ghc/driver/ghc-usage.txt
+++ b/driver/ghc-usage.txt
diff --git a/ghc/driver/ghc/Makefile b/driver/ghc/Makefile
index 26965569a4..26965569a4 100644
--- a/ghc/driver/ghc/Makefile
+++ b/driver/ghc/Makefile
diff --git a/ghc/driver/ghc/ghc.sh b/driver/ghc/ghc.sh
index 780b9498be..780b9498be 100644
--- a/ghc/driver/ghc/ghc.sh
+++ b/driver/ghc/ghc.sh
diff --git a/ghc/driver/ghci-usage.txt b/driver/ghci-usage.txt
index 4a633fc3e1..4a633fc3e1 100644
--- a/ghc/driver/ghci-usage.txt
+++ b/driver/ghci-usage.txt
diff --git a/ghc/driver/ghci/Makefile b/driver/ghci/Makefile
index 9392249f03..7c67ac546c 100644
--- a/ghc/driver/ghci/Makefile
+++ b/driver/ghci/Makefile
@@ -20,7 +20,7 @@ GHCBIN=$(libexecdir)/ghc-$(ProjectVersion)
 GHCLIB=$(libdir)
 endif # BIN_DIST
 else
-GHCBIN=$(FPTOOLS_TOP_ABS)/ghc/compiler/ghc-$(ProjectVersion)
+GHCBIN=$(FPTOOLS_TOP_ABS)/$(GHC_COMPILER_DIR_REL)/ghc-$(ProjectVersion)
 GHCLIB=$(FPTOOLS_TOP_ABS)
 endif
 
diff --git a/ghc/driver/ghci/ghci.c b/driver/ghci/ghci.c
index f21a12a4ba..f21a12a4ba 100644
--- a/ghc/driver/ghci/ghci.c
+++ b/driver/ghci/ghci.c
diff --git a/ghc/driver/ghci/ghci.ico b/driver/ghci/ghci.ico
index 680be76e71..680be76e71 100644
--- a/ghc/driver/ghci/ghci.ico
+++ b/driver/ghci/ghci.ico
diff --git a/ghc/driver/ghci/ghci.rc b/driver/ghci/ghci.rc
index 01ed2f4081..01ed2f4081 100644
--- a/ghc/driver/ghci/ghci.rc
+++ b/driver/ghci/ghci.rc
diff --git a/ghc/driver/ghci/ghci.sh b/driver/ghci/ghci.sh
index b0200477b8..b0200477b8 100644
--- a/ghc/driver/ghci/ghci.sh
+++ b/driver/ghci/ghci.sh
diff --git a/ghc/driver/ghci/ghcii.sh b/driver/ghci/ghcii.sh
index 70d98988b8..70d98988b8 100644
--- a/ghc/driver/ghci/ghcii.sh
+++ b/driver/ghci/ghcii.sh
diff --git a/ghc/driver/mangler/Makefile b/driver/mangler/Makefile
index 7b482e1d98..7b482e1d98 100644
--- a/ghc/driver/mangler/Makefile
+++ b/driver/mangler/Makefile
diff --git a/ghc/driver/mangler/ghc-asm.lprl b/driver/mangler/ghc-asm.lprl
index 902593ea7f..902593ea7f 100644
--- a/ghc/driver/mangler/ghc-asm.lprl
+++ b/driver/mangler/ghc-asm.lprl
diff --git a/ghc/driver/ordering-passes b/driver/ordering-passes
index 305f3f06b4..305f3f06b4 100644
--- a/ghc/driver/ordering-passes
+++ b/driver/ordering-passes
diff --git a/ghc/driver/split/Makefile b/driver/split/Makefile
index 6b545de20f..6b545de20f 100644
--- a/ghc/driver/split/Makefile
+++ b/driver/split/Makefile
diff --git a/ghc/driver/split/ghc-split.lprl b/driver/split/ghc-split.lprl
index 4d159ec04f..4d159ec04f 100644
--- a/ghc/driver/split/ghc-split.lprl
+++ b/driver/split/ghc-split.lprl
diff --git a/ghc/driver/test_mangler b/driver/test_mangler
index 96cf31ca68..96cf31ca68 100644
--- a/ghc/driver/test_mangler
+++ b/driver/test_mangler
diff --git a/ghc/ghc.spec.in b/ghc.spec.in
index 87dc6e905a..87dc6e905a 100644
--- a/ghc/ghc.spec.in
+++ b/ghc.spec.in
diff --git a/ghc/Makefile b/ghc/Makefile
index afdb50a0ca..cacc3f7c8e 100644
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -32,10 +32,6 @@ SUBDIRS = includes lib utils driver docs compiler
 endif
 endif
 
-ifeq ($(IncludeTestDirsInBuild),YES)
-SUBDIRS += tests
-endif
-
 SRC_DIST_FILES += configure
 
 # Clean everything created by configure:
diff --git a/ghc/README b/ghc/README
deleted file mode 100644
index e5a9a6960d..0000000000
--- a/ghc/README
+++ /dev/null
@@ -1,53 +0,0 @@
-The Glasgow Haskell Compiler
-============================
-
-(this file is fptools/ghc/README in a source distribution, and
-fptools/README in a binary distribution).
-
-GHC is a batch compiler for Haskell 98.  See the file ANNOUNCE for
-information on the current version.
-
-Haskell is "the" standard lazy functional programming language.
-Haskell 98 is the current version of the language, released in
-December 1998.  The language definition is on the Web at
-http://www.haskell.org/definition/.
-
-More information on GHC can be found on its web page
-
-	http://www.haskell.org/ghc/
-
-Documentation
-=============
-
-In a binary distribution, pre-formatted documentation can be found in
-the html and ps directories.  Pre-formatted HTML documentation is also
-available on the GHC web page.
-
-In a source distribution, the unformatted (DocBook XML) documentation
-is in the following places:
-
-  * fptools/ghc/docs/users_guide  Users' Guide.
-  * fptools/hslibs/doc/hslibs	  Library documentation.
-  * fptools/docs  		  Build System Guide.
-
-We welcome your comments and suggestions about this software!  Please
-do not suffer or grumble in silence.  The "bug reports" section of the
-User's Guide says what we would like to know when you report a
-problem.
-
-Mailing Lists
-=============
-
-    glasgow-haskell-bugs@haskell.org	 (bug reports mailing list)
-    glasgow-haskell-users@haskell.org	 (users' mailing list)
-    cvs-ghc@haskell.org			 (developers & bleeding-edge users list)
-
-    subscribe at http://www.haskell.org/mailman/listinfo/
-
-Contributors
-=============
-
-Please see
-  
-   http://www.haskell.org/ghc/contributors.html
-
diff --git a/ghc/VERSION.in b/ghc/VERSION.in
deleted file mode 100644
index 7bb6a43389..0000000000
--- a/ghc/VERSION.in
+++ /dev/null
@@ -1 +0,0 @@
-@ProjectName@, version @ProjectVersion@
diff --git a/ghc/aclocal.m4 b/ghc/aclocal.m4
deleted file mode 100644
index 3a4a6f734d..0000000000
--- a/ghc/aclocal.m4
+++ /dev/null
@@ -1,131 +0,0 @@
-# FP_SETUP_PROJECT_INFO
-# ---------------------
-AC_DEFUN([FP_SETUP_PROJECT_INFO],
-[# Some renamings
-AC_SUBST([ProjectName], [$PACKAGE_NAME])
-AC_SUBST([ProjectNameShort], [$PACKAGE_TARNAME])
-AC_SUBST([ProjectVersion], [$PACKAGE_VERSION])
-
-# Split PACKAGE_VERSION into (possibly empty) parts
-VERSION_MAJOR=`echo $PACKAGE_VERSION | sed 's/^\(@<:@^.@:>@*\)\(\.\{0,1\}\(.*\)\)$/\1'/`
-VERSION_TMP=`echo $PACKAGE_VERSION | sed 's/^\(@<:@^.@:>@*\)\(\.\{0,1\}\(.*\)\)$/\3'/`
-VERSION_MINOR=`echo $VERSION_TMP | sed 's/^\(@<:@^.@:>@*\)\(\.\{0,1\}\(.*\)\)$/\1'/`
-ProjectPatchLevel=`echo $VERSION_TMP | sed 's/^\(@<:@^.@:>@*\)\(\.\{0,1\}\(.*\)\)$/\3'/`
-
-# Calculate project version as an integer, using 2 digits for minor version
-case $VERSION_MINOR in
-  ?) ProjectVersionInt=${VERSION_MAJOR}0${VERSION_MINOR} ;;
-  ??) ProjectVersionInt=${VERSION_MAJOR}${VERSION_MINOR} ;;
-  *) AC_MSG_ERROR([bad minor version in $PACKAGE_VERSION]) ;;
-esac
-AC_SUBST([ProjectVersionInt])
-
-# The project patchlevel is zero unless stated otherwise
-test -z "$ProjectPatchLevel" && ProjectPatchLevel=0
-
-# Remove dots from the patch level; this allows us to have versions like 6.4.1.20050508
-ProjectPatchLevel=`echo $ProjectPatchLevel | sed 's/\.//'`
-
-AC_SUBST([ProjectPatchLevel])
-])# FP_SETUP_PROJECT_INFO
-
-
-# FP_PROG_GHC_PKG
-# ----------------
-# Try to find a ghc-pkg matching the ghc mentioned in the environment variable
-# WithGhc. If the latter is unset or no matching ghc-pkg can be found, try to
-# find a plain ghc-pkg. Sets the output variable GhcPkgCmd.
-AC_DEFUN([FP_PROG_GHC_PKG],
-[AC_CACHE_CHECK([for ghc-pkg matching $WithGhc], fp_cv_matching_ghc_pkg,
-[fp_ghc_pkg_guess=`echo $WithGhc | sed 's,ghc\(@<:@^/\\@:>@*\)$,ghc-pkg\1,'`
-if "$fp_ghc_pkg_guess" -l > /dev/null 2>&1; then
-  fp_cv_matching_ghc_pkg=$fp_ghc_pkg_guess
-else
-  fp_cv_matching_ghc_pkg=no
-fi])
-if test x"$fp_cv_matching_ghc_pkg" = xno; then
-  AC_PATH_PROG([GhcPkgCmd], [ghc-pkg])
-else
-  GhcPkgCmd=$fp_cv_matching_ghc_pkg
-fi])# FP_PROG_GHC_PKG
-
-
-# FP_GHC_HAS_READLINE
-# -------------------
-AC_DEFUN([FP_GHC_HAS_READLINE],
-[AC_REQUIRE([FP_PROG_GHC_PKG])
-AC_CACHE_CHECK([whether ghc has readline package], [fp_cv_ghc_has_readline],
-[if "${GhcPkgCmd-ghc-pkg}" --show-package readline >/dev/null 2>&1; then
-  fp_cv_ghc_has_readline=yes
-else
-  fp_cv_ghc_has_readline=no
- fi])
-AC_SUBST([GhcHasReadline], [`echo $fp_cv_ghc_has_readline | sed 'y/yesno/YESNO/'`])
-])# FP_GHC_HAS_READLINE
-
-
-# FP_COMPARE_VERSIONS(VERSION1, TEST, VERSION2, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
-# ----------------------------------------------------------------------------------
-# Compare dotted version numbers VERSION1 and VERSION2 lexicographically according
-# to TEST (one of -eq, -ne, -lt, -le, -gt, or -ge).
-AC_DEFUN([FP_COMPARE_VERSIONS],
-[fp_version1=$1; fp_version2=$3
-fp_save_IFS=$IFS; IFS='.'
-while test x"$fp_version1" != x || test x"$fp_version2" != x
-do
-
-  set dummy $fp_version1; shift
-  fp_num1=""
-  test $[@%:@] = 0 || { fp_num1="[$]1"; shift; }
-  test x"$fp_num1" = x && fp_num1="0"
-  fp_version1="[$]*"
-
-  set dummy $fp_version2; shift
-  fp_num2=""
-  test $[@%:@] = 0 || { fp_num2="[$]1"; shift; }
-  test x"$fp_num2" = x && fp_num2="0"
-  fp_version2="[$]*"
-
-  test "$fp_num1" = "$fp_num2" || break;
-done
-IFS=$fp_save_IFS
-AS_IF([test "$fp_num1" $2 "$fp_num2"], [$4], [$5])[]dnl
-])# FP_COMPARE_VERSIONS
-
-
-# FP_HAVE_GCC
-# -----------
-# Extra testing of the result AC_PROG_CC, testing the gcc version no. Sets the
-# output variables HaveGcc and GccVersion.
-AC_DEFUN([FP_HAVE_GCC],
-[AC_REQUIRE([AC_PROG_CC])
-AC_CACHE_CHECK([whether your gcc is OK], [fp_cv_have_gcc],
-[if test -z "$GCC"; then
-  fp_cv_have_gcc='no'
-  AC_MSG_WARN([You would be better off with gcc, perhaps it is already installed, but not in your PATH?])
-else
-  fp_cv_have_gcc='yes'
-  gcc_version_str="`$CC -v 2>&1 | grep 'version ' | sed -e 's/.*version [[^0-9]]*\([[0-9]][[0-9]]*\)\.\([[0-9]][[0-9]]*\).*/\1\.\2/g' `"
-  FP_COMPARE_VERSIONS([$gcc_version_str], [-lt], [2.0],
-    [AC_MSG_ERROR([Need at least gcc version 2.0 (2.95.3 recommend)])])
-fi])
-AC_SUBST([HaveGcc], [`echo $fp_cv_have_gcc | sed 'y/yesno/YESNO/'`])
-AC_SUBST([GccVersion], [`gcc --version | grep mingw | cut -f 3 -d ' '`])
-])# FP_HAVE_GCC
-
-
-# FP_GCC_NEEDS_NO_OMIT_LFPTR
-# --------------------------
-# Some OSs (Mandrake Linux, in particular) configure GCC with
-# -momit-leaf-frame-pointer on by default. If this is the case, we need to turn
-# it off for mangling to work. The test is currently a bit crude, using only the
-# version number of gcc. Defines HAVE_GCC_MNO_OMIT_LFPTR.
-AC_DEFUN([FP_GCC_NEEDS_NO_OMIT_LFPTR],
-[AC_REQUIRE([FP_HAVE_GCC])
-AC_CACHE_CHECK([whether gcc needs -mno-omit-leaf-frame-pointer], [fp_cv_gcc_needs_no_omit_lfptr],
-[FP_COMPARE_VERSIONS([$gcc_version_str], [-ge], [3.2],
-  [fp_cv_gcc_needs_no_omit_lfptr=yes],
-  [fp_cv_gcc_needs_no_omit_lfptr=no])])
-if test "$fp_cv_gcc_needs_no_omit_lfptr" = "yes"; then
-   AC_DEFINE([HAVE_GCC_MNO_OMIT_LFPTR], [1], [Define to 1 if gcc supports -mno-omit-leaf-frame-pointer.])
-fi])# FP_GCC_NEEDS_NO_OMIT_LFPTR
diff --git a/ghc/lib/Makefile b/ghc/lib/Makefile
deleted file mode 100644
index ca08ea20bc..0000000000
--- a/ghc/lib/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-TOP=..
-include $(TOP)/mk/boilerplate.mk
-
-SUBDIRS = compat
-
-include $(TOP)/mk/target.mk
diff --git a/ghc/mk/boilerplate.mk b/ghc/mk/boilerplate.mk
deleted file mode 100644
index 0ab3f331a0..0000000000
--- a/ghc/mk/boilerplate.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# GHC boilerplate.mk
-
-GHC_TOP := $(TOP)
-
-# Include this first, because the top-level .mk files might depend on
-# the values of $(ProjectXXX) variables.  (in fact they might/should not, 
-# but we're not brave enough to move this include later --SDM).
--include $(GHC_TOP)/mk/version.mk
-
-# We need to set TOP to be the TOP that the next level up expects!
-# The TOP variable is reset after the inclusion of the fptools
-# boilerplate, so we stash TOP away first:
-TOP:=$(GHC_TOP)/..
-
-include $(TOP)/mk/boilerplate.mk
-
-# Reset TOP
-TOP:=$(GHC_TOP)
-
-# -----------------------------------------------------------------
-# Everything after this point
-# augments or overrides previously set variables.
-# -----------------------------------------------------------------
-
--include $(GHC_TOP)/mk/config.mk
--include $(GHC_TOP)/mk/paths.mk
--include $(GHC_TOP)/mk/opts.mk
--include $(GHC_TOP)/mk/suffix.mk
diff --git a/ghc/mk/config.mk.in b/ghc/mk/config.mk.in
deleted file mode 100644
index e3060ec20c..0000000000
--- a/ghc/mk/config.mk.in
+++ /dev/null
@@ -1,67 +0,0 @@
-# -*-makefile-*-
-# @configure_input@
-
-# -----------------------------------------------------------------------------
-# GHC binary distribution configuration
-
-# These settings are used by the top-level Makefile when building
-# binary distributions.
-
-# what to include in a binary distribution
-GhcMainDir = ghc
-GhcBinDistDirs = ghc libraries hslibs
-
-ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-GhcBinDistShScripts = ghc-$(ProjectVersion) ghci-$(ProjectVersion) ghc-pkg-$(ProjectVersion) hsc2hs
-else
-GhcBinDistShScripts =
-endif
-
-GhcBinDistPrlScripts = ghcprof
-GhcBinDistLibPrlScripts = ghc-asm ghc-split
-GhcBinDistBins = hp2ps runghc
-GhcBinDistOptBins = runhaskell
-GhcBinDistLinks = ghc ghci ghc-pkg
-GhcBinDistLibSplicedFiles = package.conf
-
-# -----------------------------------------------------------------------------
-# GHC-specific configuration settings
-
-# Set to YES if $(GHC) has the readline package installed
-GhcHasReadline	= @GhcHasReadline@
-
-# GTK+
-GTK_CONFIG = @GTK_CONFIG@
-
-# -----------------------------------------------------------------------------
-
-# We can build using the stage1 compiler by setting UseStage1=YES.
-# This is useful when building up a set of .hc files for
-# bootstrapping, because we need the ghc/lib/compat library and the
-# contents of ghc/utils compiled with the stage1 compiler.
-
-ifeq "$(UseStage1)" "YES"
-HC=$(GHC_STAGE1)
-MKDEPENDHS=$(GHC_STAGE1)
-endif
-
-# Some useful GHC version predicates:
-
-ifeq "$(UseStage1)" "YES"
-ghc_ge_504 = YES
-ghc_ge_601 = YES
-ghc_ge_602 = YES
-ghc_ge_603 = YES
-else
-ifeq "$(BootingFromHc)" "YES"
-ghc_ge_504 = YES
-ghc_ge_601 = YES
-ghc_ge_602 = YES
-ghc_ge_603 = YES
-else
-ghc_ge_504 = $(shell if (test $(GhcCanonVersion) -ge 504); then echo YES; else echo NO; fi)
-ghc_ge_601 = $(shell if (test $(GhcCanonVersion) -ge 601); then echo YES; else echo NO; fi)
-ghc_ge_602 = $(shell if (test $(GhcCanonVersion) -ge 602); then echo YES; else echo NO; fi)
-ghc_ge_603 = $(shell if (test $(GhcCanonVersion) -ge 603); then echo YES; else echo NO; fi)
-endif
-endif
diff --git a/ghc/mk/paths.mk b/ghc/mk/paths.mk
deleted file mode 100644
index 2e86122f2c..0000000000
--- a/ghc/mk/paths.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-# -----------------------------------------------------------------------------
-# $Id: paths.mk,v 1.44 2004/11/11 09:36:40 simonmar Exp $
-#
-# ghc project specific make variables
-#
-
-PROJECT_DIR		:= ghc
-
-#-----------------------------------------------------------------------------
-# Useful directories
-#
-#      xxx_DIR_REL      a directory relative to $(GHC_TOP)
-#      xxx_DIR          a directory (including $(GHC_TOP))
-
-GHC_INCLUDE_DIR_REL   	= includes
-GHC_COMPILER_DIR_REL  	= compiler
-GHC_RUNTIME_DIR_REL   	= rts
-GHC_UTILS_DIR_REL 	= utils
-GHC_DRIVER_DIR_REL	= driver
-GHC_LIB_DIR_REL		= lib
-
-GHC_UNLIT_DIR_REL	= $(GHC_UTILS_DIR_REL)/unlit
-GHC_HSTAGS_DIR_REL	= $(GHC_UTILS_DIR_REL)/hasktags
-GHC_TOUCHY_DIR_REL	= $(GHC_UTILS_DIR_REL)/touchy
-GHC_PKG_DIR_REL		= $(GHC_UTILS_DIR_REL)/ghc-pkg
-GHC_GENPRIMOP_DIR_REL	= $(GHC_UTILS_DIR_REL)/genprimopcode
-GHC_GENAPPLY_DIR_REL	= $(GHC_UTILS_DIR_REL)/genapply
-GHC_MANGLER_DIR_REL 	= $(GHC_DRIVER_DIR_REL)/mangler
-GHC_SPLIT_DIR_REL 	= $(GHC_DRIVER_DIR_REL)/split
-GHC_SYSMAN_DIR_REL	= $(GHC_RUNTIME_DIR_REL)/parallel
-GHC_LIB_COMPAT_DIR_REL	= $(GHC_LIB_DIR_REL)/compat
-
-GHC_INCLUDE_DIR   	= $(GHC_TOP)/$(GHC_INCLUDE_DIR_REL)
-GHC_COMPILER_DIR  	= $(GHC_TOP)/$(GHC_COMPILER_DIR_REL)
-GHC_RUNTIME_DIR   	= $(GHC_TOP)/$(GHC_RUNTIME_DIR_REL)
-GHC_UTILS_DIR	 	= $(GHC_TOP)/$(GHC_UTILS_DIR_REL)
-GHC_DRIVER_DIR		= $(GHC_TOP)/$(GHC_DRIVER_DIR_REL)
-GHC_PKG_DIR		= $(GHC_TOP)/$(GHC_PKG_DIR_REL)
-GHC_GENPRIMOP_DIR	= $(GHC_TOP)/$(GHC_GENPRIMOP_DIR_REL)
-GHC_GENAPPLY_DIR	= $(GHC_TOP)/$(GHC_GENAPPLY_DIR_REL)
-GHC_MANGLER_DIR         = $(GHC_TOP)/$(GHC_MANGLER_DIR_REL)
-GHC_SPLIT_DIR           = $(GHC_TOP)/$(GHC_SPLIT_DIR_REL)
-GHC_LIB_COMPAT_DIR      = $(GHC_TOP)/$(GHC_LIB_COMPAT_DIR_REL)
-
-# -----------------------------------------------------------------------------
-# Names of programs in the GHC tree
-#
-#      xxx_PGM	        the name of an executable, without the path
-
-GHC_UNLIT_PGM		= unlit$(exeext)
-GHC_HSTAGS_PGM		= hasktags
-GHC_TOUCHY_PGM		= touchy$(exeext)
-GHC_MANGLER_PGM		= ghc-asm
-GHC_SPLIT_PGM		= ghc-split
-GHC_SYSMAN_PGM 		= SysMan
-GHC_PKG_INPLACE_PGM	= ghc-pkg-inplace
-GHC_GENPRIMOP_PGM	= genprimopcode
-GHC_GENAPPLY_PGM	= genapply
-
-# -----------------------------------------------------------------------------
-# Auxilliary programs used by GHC
-#
-#      xxx              the pathname to an executable (some using $(TOP))
-
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-GHC_CP			= "xcopy /y"
-GHC_PERL		= perl
-else
-GHC_CP			= $(CP)
-GHC_PERL		= $(PERL)
-endif
-
-GHC_UNLIT		= $(GHC_UNLIT_DIR)/$(GHC_UNLIT_PGM)
-GHC_HSTAGS		= $(GHC_HSTAGS_DIR)/$(GHC_HSTAGS_PGM)
-GHC_MANGLER		= $(GHC_MANGLER_DIR)/$(GHC_MANGLER_PGM)
-GHC_SPLIT		= $(GHC_SPLIT_DIR)/$(GHC_SPLIT_PGM)
-GHC_SYSMAN 		= $(GHC_SYSMAN_DIR)/$(GHC_SYSMAN_PGM)
-GHC_PKG_INPLACE		= $(GHC_PKG_DIR)/$(GHC_PKG_INPLACE_PGM)
-GHC_GENPRIMOP		= $(GHC_GENPRIMOP_DIR)/$(GHC_GENPRIMOP_PGM)
-GHC_GENAPPLY		= $(GHC_GENAPPLY_DIR)/$(GHC_GENAPPLY_PGM)
diff --git a/ghc/mk/target.mk b/ghc/mk/target.mk
deleted file mode 100644
index 0d49585a90..0000000000
--- a/ghc/mk/target.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# target.mk project stub
-#
-
-# We need to set TOP to be the TOP that the next level up expects!
-# The TOP variable is reset after the inclusion of the fptools
-# boilerplate, so we stash TOP away first:
-GHC_TOP := $(TOP)
-TOP:=$(TOP)/..
-
-include $(TOP)/mk/target.mk
-
-# Reset TOP
-TOP:=$(GHC_TOP)
diff --git a/ghc/mk/version.mk.in b/ghc/mk/version.mk.in
deleted file mode 100644
index e8e1656b7c..0000000000
--- a/ghc/mk/version.mk.in
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Project-specific version information.
-#
-# Note:
-#   this config file is intended to centralise all
-#   project version information. To bump up the version
-#   info on your package, edit this file and recompile
-#   all the dependents. This file lives in the source tree.
-#
-# In the case of the ghc/ project, if you make changes
-# to this file, you'll *have to* to rebuild the driver
-# in your build tree(s). The ghc/driver/Makefile has got
-# a dependency that will force such rebuilding to happen,
-# but it does require you to do a 'make' in ghc/driver.
-
-#
-# Ghc project settings:
-# 
-# ProjectVersion    is treated as a *string*
-# ProjectVersionInt is treated as an *integer* (for cpp defines)
-
-# Versioning scheme: A.B.C
-#         A: major version, decimal, any number of digits
-#         B: minor version, decimal, any number of digits
-#	  C: patchlevel, one digit, omitted if zero.
-#
-# ProjectVersionInt does *not* contain the patchlevel (rationale: this
-# figure is used for conditional compilations, and library interfaces
-# etc. are not supposed to change between patchlevels).
-#
-# The ProjectVersionInt is included in interface files, and GHC
-# checks that it's reading interface generated by the same ProjectVersion
-# as itself. It does this even though interface file syntax may not 
-# change between versions.  Rationale: calling conventions or other 
-# random .o-file stuff might change even if the .hi syntax doesn't
-
-ProjectName       = @ProjectName@
-ProjectNameShort  = @ProjectNameShort@
-ProjectVersion    = @ProjectVersion@
-ProjectVersionInt = @ProjectVersionInt@
-ProjectPatchLevel = @ProjectPatchLevel@
-
-# Interface file version (hi-boot files only)
-#
-# A GHC built with HscIfaceFileVersion=n will look for 
-#	M.hi-boot-n, and only then for 
-#	M.hi-boot.
-# (It'll be happy with the latter if the former doesn't exist.)
-#
-#
-# This variable is used ONLY for hi-boot files.  Its only purpose is
-# to allow you to have a single directory with multiple .hi-boot files
-# for the same module, each corresponding to a different version of
-# GHC.
-#
-# HscIfaceFileVersion is propagated to hsc via
-# ghc/compiler/main/Config.hs, which is automatically generated by
-# ghc/compiler/Makefile.
-
-HscIfaceFileVersion=6
diff --git a/ghc/utils/prof/cgprof/Makefile b/ghc/utils/prof/cgprof/Makefile
deleted file mode 100644
index fd6ac040a7..0000000000
--- a/ghc/utils/prof/cgprof/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-#-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.2 2003/08/01 15:38:41 panne Exp $
-#
-# (c) The GHC Team, 2000
-#
-
-TOP=../../..
-include $(TOP)/mk/boilerplate.mk
-
-C_PROG = cgprof
-INSTALL_LIBEXECS=$(C_PROG)
-
-SRC_CC_OPTS += -Wall -I$(GHC_INCLUDE_DIR)
-
-include $(TOP)/mk/target.mk
diff --git a/ghc/utils/prof/icons/Makefile b/ghc/utils/prof/icons/Makefile
deleted file mode 100644
index 5b3eb4d40b..0000000000
--- a/ghc/utils/prof/icons/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-#-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.1 2000/04/05 10:11:55 simonmar Exp $
-#
-# (c) The GHC Team, 2000
-#
-
-TOP=../../..
-include $(TOP)/mk/boilerplate.mk
-
-override datadir=$(libdir)/icons
-INSTALL_DATAS=$(wildcard *.xbm)
-
-include $(TOP)/mk/target.mk
diff --git a/glafp-utils/Makefile b/glafp-utils/Makefile
deleted file mode 100644
index d9a8b2e351..0000000000
--- a/glafp-utils/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-#################################################################################
-#
-#			    glafp-utils/Makefile
-#
-#		Main Makefile for project glafp-utils
-#
-#################################################################################
-
-TOP=.
-include $(TOP)/mk/boilerplate.mk
-
-# We need to write mkdependC first (in that order), to be sure that
-# make depend will succeed in all the other directories.
-SUBDIRS = mkdependC mkdirhier runstdtest
-ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-SUBDIRS += lndir
-endif
-
-include $(TOP)/mk/target.mk
diff --git a/glafp-utils/PATCHLEVEL b/glafp-utils/PATCHLEVEL
deleted file mode 100644
index a20156b9cb..0000000000
--- a/glafp-utils/PATCHLEVEL
+++ /dev/null
@@ -1 +0,0 @@
-Miscellaneous FP-projects-related tools, version 2.01, patchlevel 0
diff --git a/glafp-utils/README b/glafp-utils/README
deleted file mode 100644
index 8967522e5a..0000000000
--- a/glafp-utils/README
+++ /dev/null
@@ -1,31 +0,0 @@
-This directory tree's worth of stuff are utility bits that are used in
-more than one of the Glasgow functional-programming tools.  (For the
-project-specific bits, try <project>/utils/<blah>.)
-
- lndir		from X imake stuff (via DuBois); make a shadow tree
-		of symbolic links
-
- ltx		a "latex" wrapper.  Re-runs latex/bibtex/makeindex
-		enough times to "do the right thing."
-
- mkdependC	script version of C makedepend (from X11R4 via DuBois)
-
- mkdirhier	"mkdir a/b/c/d" will do "mkdir a; mkdir a/b; ..."
-		(assuming none of those dirs exist)
-
- runstdtest	runs a pgm with some flags & some stdin; checks for an
-		expected exit code, expected stdout, and expected
-		stderr.  (Expect this to change :-)
-
- verbatim	pre-processor for LaTeX files that typesets text between
-		@...@ in typewriter font.
-
- sgmlverb	pre-processor for SGML that does essentially the same thing
-		as verbatim.
-
- docbook	scripts to process DocBook files stolen from Cygnus DocBook
- 		tools.
-
- genargs	converts whitespace separated strings into partial
-		Haskell lists.
-
diff --git a/glafp-utils/mk/boilerplate.mk b/glafp-utils/mk/boilerplate.mk
deleted file mode 100644
index e645586a5d..0000000000
--- a/glafp-utils/mk/boilerplate.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-################################################################################
-#
-#			    GHC boilerplate.mk
-#
-#		Boilerplate Makefile for an fptools project
-#
-################################################################################
-
-# Begin by slurping in the boilerplate from one level up.
-# Remember, TOP is the top level of the innermost level
-# (FPTOOLS_TOP is the fptools top)
-
-# We need to set TOP to be the TOP that the next level up expects!
-GLAFP_UTILS_TOP := $(TOP)
-TOP:=$(GLAFP_UTILS_TOP)/..
-
-include $(TOP)/mk/boilerplate.mk
-
-TOP:=$(GLAFP_UTILS_TOP)
-
-# -----------------------------------------------------------------
-# Everything after this point
-# augments or overrides previously set variables.
-# (these files are optional, so `make' won't fret if
-#  cannot get to them).
-# -----------------------------------------------------------------
-
-#Not currently used: -include $(GLAFP_UTILS_TOP)/mk/paths.mk
-#Not currently used: -include $(GLAFP_UTILS_TOP)/mk/suffix.mk
-
-# No ways, please
-WAYS=
diff --git a/glafp-utils/mk/target.mk b/glafp-utils/mk/target.mk
deleted file mode 100644
index a2ed36c3c9..0000000000
--- a/glafp-utils/mk/target.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# (c) The GHC Team 2000
-# 
-
-TOP:=$(TOP)/..
-include $(TOP)/mk/target.mk
-TOP:=$(GLAFP_UTILS_TOP)
diff --git a/glafp-utils/sgmlverb/Makefile b/glafp-utils/sgmlverb/Makefile
deleted file mode 100644
index 4ae120326f..0000000000
--- a/glafp-utils/sgmlverb/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-TOP=..
-include $(TOP)/mk/boilerplate.mk
-
-C_SRCS = sgmlverb.c
-C_PROG = sgmlverb
-LIBS = $(FLEX_LIB)
-
-override SRC_FLEX_OPTS=-8
-
-# sgmlverb.c isn't in distclean
-MAINTAINER_CLEAN_FILES += sgmlverb.c
-
-#
-# For src distributions, include flex output.
-#
-SRC_DIST_FILES += sgmlverb.c
-
-include $(TOP)/mk/target.mk
diff --git a/glafp-utils/sgmlverb/sgmlverb.lex b/glafp-utils/sgmlverb/sgmlverb.lex
deleted file mode 100644
index 812cb8416c..0000000000
--- a/glafp-utils/sgmlverb/sgmlverb.lex
+++ /dev/null
@@ -1,68 +0,0 @@
-
-  /*	This Lex script acts as a filter to pre-process Latex files.
-
-	It surrounds groups of lines beginning with a ">" sign, and
-	preceded and followed by a blank line, with \begin{verbatim} 
-	and \end{verbatim}.  The ">" may be preceded by a digit or digit
-	range (eg 4>, 2-5>, 3->); in this case the digits are removed.  
-	They are meant to be used for filtering out versions.
-
-	It takes words surrounded with @ signs (thus @letrec@) and makes them
-	come out in typewriter font, regardless of the current mode.
-  */
-
-%START  NORM  VERB  VERBENV
-sp			[ \t]*
-nl			{sp}\n{sp}
-comment                 \%.*$
-miranda			([0-9]+(\-([0-9]+)?)?)?>
-%{
-#define PUSH		states[top++] =
-#define POP		BEGIN states[--top]
-#define yywrap() 	1
-#define YY_SKIP_YYWRAP
-%}
-%%
-			int states[256];
-			int top;
-			BEGIN NORM;
-			top = 0;
-<NORM>@@		{ printf ("@"); }
-<NORM>@			{ printf ("<tt>"); PUSH NORM;  BEGIN VERB; }
-<NORM>\\%               { printf ("&percnt;"); }
-<NORM>{comment}         { }
-<VERB>@			{ printf ("</tt>");  POP; }
-<VERB>@@		{ printf ("@"); }
-<VERB>\>		{ printf ("&gt;"); }
-<VERB>\<		{ printf ("&lt;"); }
-<VERB>\#		{ printf ("&num;"); }
-<VERB>\$		{ printf ("&dollar;"); }
-<VERB>\%		{ printf ("&percnt;"); }
-<VERB>\&		{ printf ("&amp;"); }
-<VERB>\~		{ printf ("&tilde;"); }
-<VERB>\^		{ printf ("&circ;"); }
-
-<NORM>\<verb\>		 { printf ("<verb>"); PUSH NORM; BEGIN VERBENV; }
-<NORM>\<code\>		 { printf ("<code>"); PUSH NORM; BEGIN VERBENV; }
-<NORM>\\begin\{code\}	 { printf ("<code>"); PUSH NORM; BEGIN VERBENV; }
-<VERBENV>\<\/verb\>	 { printf ("</verb>"); POP; }
-<VERBENV>\<\/code\>	 { printf ("</code>"); POP; }
-<VERBENV>\<\\end\{code\} { printf ("</code>"); POP; }
-<VERBENV>\&\&		 { printf ("&"); }
-<VERBENV>\&		 { printf ("&ero;"); }
-<VERBENV>\<\/		 { printf ("&etago;"); }
-
-%%
-int
-main()
-{
-    yylex();
-    return(0);
-}
-
-/*
-<VERB>\_		{ printf ("{\\char'137}"); }
-<VERB>\\		{ printf ("{\\char'134}"); }
-<VERB>\{		{ printf ("{\\char'173}"); }
-<VERB>\}		{ printf ("{\\char'175}"); }
-*/
diff --git a/ghc/includes/Block.h b/includes/Block.h
index d1705ad686..d1705ad686 100644
--- a/ghc/includes/Block.h
+++ b/includes/Block.h
diff --git a/ghc/includes/Bytecodes.h b/includes/Bytecodes.h
index 73003a3002..73003a3002 100644
--- a/ghc/includes/Bytecodes.h
+++ b/includes/Bytecodes.h
diff --git a/ghc/includes/ClosureMacros.h b/includes/ClosureMacros.h
index f40f6aace6..f40f6aace6 100644
--- a/ghc/includes/ClosureMacros.h
+++ b/includes/ClosureMacros.h
diff --git a/ghc/includes/ClosureTypes.h b/includes/ClosureTypes.h
index f8840264f3..f8840264f3 100644
--- a/ghc/includes/ClosureTypes.h
+++ b/includes/ClosureTypes.h
diff --git a/ghc/includes/Closures.h b/includes/Closures.h
index 3df208cd09..3df208cd09 100644
--- a/ghc/includes/Closures.h
+++ b/includes/Closures.h
diff --git a/ghc/includes/Cmm.h b/includes/Cmm.h
index 783b0e41bb..783b0e41bb 100644
--- a/ghc/includes/Cmm.h
+++ b/includes/Cmm.h
diff --git a/ghc/includes/Constants.h b/includes/Constants.h
index 4f3c35b744..4f3c35b744 100644
--- a/ghc/includes/Constants.h
+++ b/includes/Constants.h
diff --git a/ghc/includes/DNInvoke.h b/includes/DNInvoke.h
index 410bd640e1..410bd640e1 100644
--- a/ghc/includes/DNInvoke.h
+++ b/includes/DNInvoke.h
diff --git a/ghc/includes/Dotnet.h b/includes/Dotnet.h
index 89dace2ced..89dace2ced 100644
--- a/ghc/includes/Dotnet.h
+++ b/includes/Dotnet.h
diff --git a/ghc/includes/GranSim.h b/includes/GranSim.h
index be5aa83a52..be5aa83a52 100644
--- a/ghc/includes/GranSim.h
+++ b/includes/GranSim.h
diff --git a/ghc/includes/Hooks.h b/includes/Hooks.h
index 38014cc8f7..38014cc8f7 100644
--- a/ghc/includes/Hooks.h
+++ b/includes/Hooks.h
diff --git a/ghc/includes/HsFFI.h b/includes/HsFFI.h
index 70891a2dc2..70891a2dc2 100644
--- a/ghc/includes/HsFFI.h
+++ b/includes/HsFFI.h
diff --git a/ghc/includes/InfoTables.h b/includes/InfoTables.h
index 8fa699a097..8fa699a097 100644
--- a/ghc/includes/InfoTables.h
+++ b/includes/InfoTables.h
diff --git a/ghc/includes/Linker.h b/includes/Linker.h
index bb1a4c251f..bb1a4c251f 100644
--- a/ghc/includes/Linker.h
+++ b/includes/Linker.h
diff --git a/ghc/includes/Liveness.h b/includes/Liveness.h
index cc93cae34f..cc93cae34f 100644
--- a/ghc/includes/Liveness.h
+++ b/includes/Liveness.h
diff --git a/ghc/includes/MachDeps.h b/includes/MachDeps.h
index abe4405d5e..abe4405d5e 100644
--- a/ghc/includes/MachDeps.h
+++ b/includes/MachDeps.h
diff --git a/ghc/includes/MachRegs.h b/includes/MachRegs.h
index 92944e1467..92944e1467 100644
--- a/ghc/includes/MachRegs.h
+++ b/includes/MachRegs.h
diff --git a/ghc/includes/Makefile b/includes/Makefile
index cb33ade014..83b74d49a7 100644
--- a/ghc/includes/Makefile
+++ b/includes/Makefile
@@ -28,7 +28,7 @@ boot :: gmp.h
 all :: $(H_CONFIG) $(H_PLATFORM)
 
 # gmp.h is copied from the GMP directory
-gmp.h : $(FPTOOLS_TOP)/ghc/rts/gmp/gmp.h
+gmp.h : $(FPTOOLS_TOP)/rts/gmp/gmp.h
 	$(CP) $< $@
 
 # The fptools configure script creates the configuration header file and puts it
diff --git a/ghc/includes/OSThreads.h b/includes/OSThreads.h
index 90431445b7..90431445b7 100644
--- a/ghc/includes/OSThreads.h
+++ b/includes/OSThreads.h
diff --git a/ghc/includes/Parallel.h b/includes/Parallel.h
index e18fbe9b2c..e18fbe9b2c 100644
--- a/ghc/includes/Parallel.h
+++ b/includes/Parallel.h
diff --git a/ghc/includes/README b/includes/README
index aae99bf20b..aae99bf20b 100644
--- a/ghc/includes/README
+++ b/includes/README
diff --git a/ghc/includes/Regs.h b/includes/Regs.h
index b6e29217eb..b6e29217eb 100644
--- a/ghc/includes/Regs.h
+++ b/includes/Regs.h
diff --git a/ghc/includes/Rts.h b/includes/Rts.h
index 3ca0d9a913..3ca0d9a913 100644
--- a/ghc/includes/Rts.h
+++ b/includes/Rts.h
diff --git a/ghc/includes/RtsAPI.h b/includes/RtsAPI.h
index 1b66789059..1b66789059 100644
--- a/ghc/includes/RtsAPI.h
+++ b/includes/RtsAPI.h
diff --git a/ghc/includes/RtsConfig.h b/includes/RtsConfig.h
index 8590ccd7cc..8590ccd7cc 100644
--- a/ghc/includes/RtsConfig.h
+++ b/includes/RtsConfig.h
diff --git a/ghc/includes/RtsExternal.h b/includes/RtsExternal.h
index 61a920b0ab..61a920b0ab 100644
--- a/ghc/includes/RtsExternal.h
+++ b/includes/RtsExternal.h
diff --git a/ghc/includes/RtsFlags.h b/includes/RtsFlags.h
index 17d23638e7..17d23638e7 100644
--- a/ghc/includes/RtsFlags.h
+++ b/includes/RtsFlags.h
diff --git a/ghc/includes/RtsMessages.h b/includes/RtsMessages.h
index 3f0da3d7ed..3f0da3d7ed 100644
--- a/ghc/includes/RtsMessages.h
+++ b/includes/RtsMessages.h
diff --git a/ghc/includes/RtsTypes.h b/includes/RtsTypes.h
index 9e8c7b847b..9e8c7b847b 100644
--- a/ghc/includes/RtsTypes.h
+++ b/includes/RtsTypes.h
diff --git a/ghc/includes/SMP.h b/includes/SMP.h
index 5974c962ad..5974c962ad 100644
--- a/ghc/includes/SMP.h
+++ b/includes/SMP.h
diff --git a/ghc/includes/STM.h b/includes/STM.h
index 4c2b109f73..4c2b109f73 100644
--- a/ghc/includes/STM.h
+++ b/includes/STM.h
diff --git a/ghc/includes/SchedAPI.h b/includes/SchedAPI.h
index 8dff6ea63d..8dff6ea63d 100644
--- a/ghc/includes/SchedAPI.h
+++ b/includes/SchedAPI.h
diff --git a/ghc/includes/Signals.h b/includes/Signals.h
index a5907bbee9..a5907bbee9 100644
--- a/ghc/includes/Signals.h
+++ b/includes/Signals.h
diff --git a/ghc/includes/Stable.h b/includes/Stable.h
index ca2e72118a..ca2e72118a 100644
--- a/ghc/includes/Stable.h
+++ b/includes/Stable.h
diff --git a/ghc/includes/Stg.h b/includes/Stg.h
index a63b7ec2d6..a63b7ec2d6 100644
--- a/ghc/includes/Stg.h
+++ b/includes/Stg.h
diff --git a/ghc/includes/StgDLL.h b/includes/StgDLL.h
index ededcc96b5..ededcc96b5 100644
--- a/ghc/includes/StgDLL.h
+++ b/includes/StgDLL.h
diff --git a/ghc/includes/StgFun.h b/includes/StgFun.h
index e6f9b1fe0e..e6f9b1fe0e 100644
--- a/ghc/includes/StgFun.h
+++ b/includes/StgFun.h
diff --git a/ghc/includes/StgLdvProf.h b/includes/StgLdvProf.h
index 3c3df1c5fa..3c3df1c5fa 100644
--- a/ghc/includes/StgLdvProf.h
+++ b/includes/StgLdvProf.h
diff --git a/ghc/includes/StgMiscClosures.h b/includes/StgMiscClosures.h
index 4a6a7c47c2..4a6a7c47c2 100644
--- a/ghc/includes/StgMiscClosures.h
+++ b/includes/StgMiscClosures.h
diff --git a/ghc/includes/StgProf.h b/includes/StgProf.h
index 9b3ce69a9f..9b3ce69a9f 100644
--- a/ghc/includes/StgProf.h
+++ b/includes/StgProf.h
diff --git a/ghc/includes/StgTicky.h b/includes/StgTicky.h
index 27dd24edd9..27dd24edd9 100644
--- a/ghc/includes/StgTicky.h
+++ b/includes/StgTicky.h
diff --git a/ghc/includes/StgTypes.h b/includes/StgTypes.h
index ac2f78e27c..ac2f78e27c 100644
--- a/ghc/includes/StgTypes.h
+++ b/includes/StgTypes.h
diff --git a/ghc/includes/Storage.h b/includes/Storage.h
index 3a6bb2fde1..3a6bb2fde1 100644
--- a/ghc/includes/Storage.h
+++ b/includes/Storage.h
diff --git a/ghc/includes/TSO.h b/includes/TSO.h
index d096d401cf..d096d401cf 100644
--- a/ghc/includes/TSO.h
+++ b/includes/TSO.h
diff --git a/ghc/includes/TailCalls.h b/includes/TailCalls.h
index 670da9546f..670da9546f 100644
--- a/ghc/includes/TailCalls.h
+++ b/includes/TailCalls.h
diff --git a/ghc/includes/config.h b/includes/config.h
index 66e2ade637..66e2ade637 100644
--- a/ghc/includes/config.h
+++ b/includes/config.h
diff --git a/ghc/includes/ghcconfig.h b/includes/ghcconfig.h
index 5f10e923fd..5f10e923fd 100644
--- a/ghc/includes/ghcconfig.h
+++ b/includes/ghcconfig.h
diff --git a/ghc/includes/ieee-flpt.h b/includes/ieee-flpt.h
index a1fce3a8da..a1fce3a8da 100644
--- a/ghc/includes/ieee-flpt.h
+++ b/includes/ieee-flpt.h
diff --git a/ghc/includes/mkDerivedConstants.c b/includes/mkDerivedConstants.c
index 27d4fa9e7b..27d4fa9e7b 100644
--- a/ghc/includes/mkDerivedConstants.c
+++ b/includes/mkDerivedConstants.c
diff --git a/libraries/mk/boilerplate.mk b/libraries/mk/boilerplate.mk
index a9c22bcf74..3f15f8d297 100644
--- a/libraries/mk/boilerplate.mk
+++ b/libraries/mk/boilerplate.mk
@@ -1,6 +1,3 @@
-# -----------------------------------------------------------------------------
-# $Id: boilerplate.mk,v 1.1 2001/07/31 16:40:34 simonmar Exp $
-
 # Begin by slurping in the boilerplate from one level up.
 # Remember, TOP is the top level of the innermost level
 # (FPTOOLS_TOP is the fptools top)
@@ -11,12 +8,6 @@
 LIBRARIES_TOP := $(TOP)
 TOP:=$(TOP)/..
 
-# Also set GHC_TOP here, because we need to get at bits of GHC's config
-GHC_TOP := $(TOP)/ghc
-
-# Pull in GHC's version & project info
--include $(GHC_TOP)/mk/version.mk
-
 # Pull in the fptools boilerplate
 include $(TOP)/mk/boilerplate.mk
 
@@ -27,8 +18,6 @@ TOP:=$(LIBRARIES_TOP)
 # Everything after this point
 # augments or overrides previously set variables.
 
--include $(GHC_TOP)/mk/paths.mk
-
 -include $(TOP)/mk/paths.mk
 -include $(TOP)/mk/opts.mk
 -include $(TOP)/mk/suffix.mk
diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk
index 13c7a863b7..94ba7d5743 100644
--- a/mk/boilerplate.mk
+++ b/mk/boilerplate.mk
@@ -2,10 +2,10 @@
 #
 #			    mk/boilerplate.mk
 #
-#		The Glorious fptools Boilerplate Makefile
+#		The Glorious GHC Boilerplate Makefile
 #
 # This one file should be included (directly or indirectly) by all Makefiles 
-# in the fptools hierarchy.
+# in the GHC hierarchy.
 #
 #################################################################################
 
diff --git a/mk/bootstrap.mk b/mk/bootstrap.mk
index 5bbc41f567..1501d5500c 100644
--- a/mk/bootstrap.mk
+++ b/mk/bootstrap.mk
@@ -67,7 +67,7 @@ PLATFORM_CC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt)
 
 HC_BOOT_CC_OPTS = $(PLATFORM_HC_BOOT_CC_OPTS) $(PLATFORM_CC_OPTS) $(CC_OPTS)
 
-SRC_CC_OPTS += -I$(FPTOOLS_TOP_ABS)/ghc/includes -I$(FPTOOLS_TOP_ABS)/libraries/base/include -I$(FPTOOLS_TOP_ABS)/libraries/unix/include -I$(FPTOOLS_TOP_ABS)/libraries/parsec/include
+SRC_CC_OPTS += -I$(FPTOOLS_TOP_ABS)/$(GHC_INCLUDE_DIR_REL) -I$(FPTOOLS_TOP_ABS)/libraries/base/include -I$(FPTOOLS_TOP_ABS)/libraries/unix/include -I$(FPTOOLS_TOP_ABS)/libraries/parsec/include
 
 # C code compiled with UseGhcForCc=YES assumes the existence of certain CPP
 # symbols defined by GHC (eg. __GLASGOW_HASKELL__), so we better make sure
@@ -89,11 +89,11 @@ UNDERSCORE=
 endif
 
 ifeq "$(HaveLibGmp)" "NO"
-DASH_L_GHC_RTS_GMP_DIR=-L$(FPTOOLS_TOP_ABS)/ghc/rts/gmp
+DASH_L_GHC_RTS_GMP_DIR=-L$(FPTOOLS_TOP_ABS)/$(GHC_RTS_DIR_REL)/gmp
 endif
 
 HC_BOOT_LD_OPTS =				\
-   -L$(FPTOOLS_TOP_ABS)/ghc/rts			\
+   -L$(FPTOOLS_TOP_ABS)/$(GHC_RTS_DIR_REL)	\
    $(DASH_L_GHC_RTS_GMP_DIR)                    \
    -L$(FPTOOLS_TOP_ABS)/libraries/base		\
    -L$(FPTOOLS_TOP_ABS)/libraries/base/cbits	\
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 23162f9363..774d6375e0 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -25,12 +25,6 @@
 #
 # This is one of only two files that configure generates (the other is config.h)
 #
-# There is a section below for each project within the fptools suite
-#
-#	PLUS
-#
-# a section corresponding to each of the main .mk files 
-# included by boilerplate.mk (see boilerplate.mk for a list).
 
 ifneq "$(findstring 3.7, $(MAKE_VERSION))" ""
 ifeq "$(findstring 3.79.1, $(MAKE_VERSION))" ""
@@ -40,7 +34,34 @@ endif
 
 ################################################################################
 #
-#		Project-wide platform variables
+# GHC Version
+#
+
+# ProjectVersion    is treated as a *string*
+# ProjectVersionInt is treated as an *integer* (for cpp defines)
+
+# Versioning scheme: A.B.C
+#         A: major version, decimal, any number of digits
+#         B: minor version, decimal, any number of digits
+#	  C: patchlevel, one digit, omitted if zero.
+#
+# ProjectVersionInt does *not* contain the patchlevel (rationale: this
+# figure is used for conditional compilations, and library interfaces
+# etc. are not supposed to change between patchlevels).
+#
+# The ProjectVersionInt is included in interface files, and GHC
+# checks that it's reading interface generated by the same ProjectVersion
+# as itself. It does this even though interface file syntax may not 
+# change between versions.  Rationale: calling conventions or other 
+# random .o-file stuff might change even if the .hi syntax doesn't
+
+ProjectVersion    = @ProjectVersion@
+ProjectVersionInt = @ProjectVersionInt@
+ProjectPatchLevel = @ProjectPatchLevel@
+
+################################################################################
+#
+#		Platform variables
 #
 ################################################################################
 
@@ -127,6 +148,12 @@ BuildVendor_CPP                 = @BuildVendor_CPP@
 @TargetVendor_CPP@_TARGET_VENDOR  = 1
 @BuildVendor_CPP@_BUILD_VENDOR    = 1
 
+################################################################################
+#
+#		Global configuration options
+#
+################################################################################
+
 # Leading underscores on symbol names in object files
 # Valid options: YES/NO
 #
@@ -142,14 +169,6 @@ else
 Windows=NO
 endif
 
-################################################################################
-#
-#		project-wide flags
-#
-# 	Set of options applicable to all fptools projects
-#
-################################################################################
-
 # BootingFromHc - build GHC and the libraries from .hc files?
 BootingFromHc = @BootingFromHc@
 
@@ -157,39 +176,6 @@ BootingFromHc = @BootingFromHc@
 # rather than registerised code, i.e., disable the mangler?
 BootingFromUnregisterisedHc = @BootingFromUnregisterisedHc@
 
-# Build Order: we build Happy, Haddock and Alex before GHC if they are
-# in this source tree, just in case our GHC build depends on these
-# local builds rather than installed versions of the tools.
-#
-# Build the libs first if we're bootstrapping from .hc files.
-ifeq "$(BootingFromHc)" "YES"
-AllProjects = glafp-utils happy alex haddock libraries hslibs ghc greencard hdirect hood nofib docs
-else
-AllProjects = glafp-utils happy alex haddock ghc libraries hslibs greencard hdirect hood nofib docs
-endif
-
-#
-# (OPTIONAL) set ProjectsToBuild to a list of projects to be built.  If this
-# list is empty, then all projects present in the source tree will be built.
-#
-ProjectsToBuild =
-
-#
-# set ProjectsDontInstall to a list of projects which are normally built but
-# not installed.
-#
-ProjectsDontInstall = glafp-utils nofib
-
-#
-# Should the various project tests directories be built?
-#
-IncludeTestDirsInBuild=NO
-
-#
-# Should the various project example directories be built?
-#
-IncludeExampleDirsInBuild=NO
-
 #
 # Which ways should DocBook XML documents be built?
 # options are: dvi ps pdf html chm HxS
@@ -198,18 +184,9 @@ XMLDocWays=
 
 ################################################################################
 #
-#		GHC project
-# 
-# 	Set of (configurable) options needed by the ghc tree
-#	plus their default options (if any).
-#
-################################################################################
-
-#---------------------------------------------------------------
-#
 # Variables that control how the compiler itself is built
 #
-#---------------------------------------------------------------
+################################################################################
 
 # The compiler used to build GHC is $(GHC).  To change the actual compiler
 # used, re-configure with --with-ghc=<path-to-ghc>.
@@ -219,7 +196,7 @@ XMLDocWays=
 GhcCompilerWays=
 
 # Extra option flags to pass to the compiler that compiles the compiler
-# (Ones that are essential are wired into ghc/compiler/Makefile)
+# (Ones that are essential are wired into compiler/Makefile)
 # Typical options to use here:
 #
 #	-DDEBUG		include debugging code and assertions (will make the
@@ -297,6 +274,25 @@ endif
 BuildingParallel=$(subst mp,YES,$(filter mp,$(WAYS)))
 BuildingGranSim=$(subst mg,YES,$(filter mg,$(WAYS)))
 
+# Interface file version (hi-boot files only)
+#
+# A GHC built with HscIfaceFileVersion=n will look for 
+#	M.hi-boot-n, and only then for 
+#	M.hi-boot.
+# (It'll be happy with the latter if the former doesn't exist.)
+#
+#
+# This variable is used ONLY for hi-boot files.  Its only purpose is
+# to allow you to have a single directory with multiple .hi-boot files
+# for the same module, each corresponding to a different version of
+# GHC.
+#
+# HscIfaceFileVersion is propagated to hsc via
+# compiler/main/Config.hs, which is automatically generated by
+# compiler/Makefile.
+
+HscIfaceFileVersion=6
+
 #------------------------------------------------------------------------------
 # Options for Libraries
 
@@ -380,23 +376,6 @@ ifeq "$(TargetArch_CPP)" "ia64"
 SplitObjs=NO
 endif
 
-# ----------------------------------------------------------------------------
-# Options for GHC's RTS
-
-# For an optimised RTS (you probably don't want to change these; we build
-# a debugging RTS by default now.  Use -debug to get it).
-GhcRtsHcOpts=-optc-O2
-GhcRtsCcOpts=-fomit-frame-pointer
-
-# Include the front panel code?  Needs GTK+.
-GhcRtsWithFrontPanel = NO
-
-################################################################################
-#
-# libraries project
-#
-################################################################################
-
 # Build the Haskell Readline bindings?
 #
 GhcLibsWithReadline=@GhcLibsWithReadline@
@@ -424,41 +403,20 @@ DotnetSupport=@DotnetSupport@
 #
 GhcLibsWithUnix=@GhcLibsWithUnix@
 
-################################################################################
-#
-#		happy project
-#
-# 	Happy specific options
-#
-################################################################################
-
-# The compiler you'd like to use to compile Happy
-WithHappyHc = @WithHc@
-
-# HappyHcOpts gives the flags to pass to the Haskell compiler used
-# 	      to compile the Happy sources with.
-#
-HappyHcOpts = -O
+# ----------------------------------------------------------------------------
+# Options for GHC's RTS
 
-################################################################################
-#
-#		haggis project
-#
-# 	Haggis specific options
-#
-################################################################################
+# For an optimised RTS (you probably don't want to change these; we build
+# a debugging RTS by default now.  Use -debug to get it).
+GhcRtsHcOpts=-optc-O2
+GhcRtsCcOpts=-fomit-frame-pointer
 
-################################################################################
-#
-#		greencard project
-#
-# 	GreenCard specific options
-#
-################################################################################
+# Include the front panel code?  Needs GTK+.
+GhcRtsWithFrontPanel = NO
 
 ################################################################################
 #
-#		nofib project
+#		nofib
 #
 # 	nofib specific options
 #
@@ -488,14 +446,6 @@ NoFibHcOpts = -O
 # Number of times to run each program
 NoFibRuns = 5
 
-# ==============================================================================
-#
-#			END OF PROJECT-SPECIFIC STUFF
-#
-#		Now come the generic configuration options
-#
-# ==============================================================================
-
 ################################################################################
 #
 #		Paths (see paths.mk)
@@ -553,11 +503,11 @@ libdir		= $(prefix)
 else
 
 #
-# Unix: override libdir and datadir to put project-specific stuff in
+# Unix: override libdir and datadir to put ghc-specific stuff in
 # a subdirectory with the version number included.
 #
-libdir     = $(if $(ProjectNameShort),$(libdir0)/$(ProjectNameShort)-$(ProjectVersion),$(libdir0))
-datadir    = $(if $(ProjectNameShort),$(datadir0)/$(ProjectNameShort)-$(ProjectVersion),$(datadir0))
+libdir     = $(libdir0)/ghc-$(ProjectVersion)
+datadir    = $(datadir0)/ghc-$(ProjectVersion)
 
 endif # Windows
 
@@ -658,50 +608,141 @@ GC_CPP_OPTS += -P -E -x c -traditional -D__GLASGOW_HASKELL__
 
 ################################################################################
 #
-#		Utilities programs: where to find them
+#	Layout of the source tree
 #
 ################################################################################
 
-#-----------------------------------------------------------------------------
-# FPtools Utility locations
-
-# By default, the various utils needed to be build ghc and chums
-# is set up to point to the utils/ directory. Define here the
-# path prefix for the utilities. Notice that it's a prefix with
-# a trailing slash, so that it can be concatenated directly on
-# front of a program name; if it's not set then we just look
-# along the shell's $(PATH)
-#
-# If instead you want to use installed or your own versions of these,
-# override the various *_PREFIX in build.mk, i.e., having the following
-# in build.mk:
-#
-#   MKDEPENDC_PREFIX=
-#
-# will force `make' to rummage around in your PATH to find `mkdependC' (not
-# sure it would need it in the first place, but still).
-#
-GLAFP_UTILS  		= $(FPTOOLS_TOP)/glafp-utils
+# Here we provide defines for the various directories in the source tree,
+# so we can move things around more easily.  A define $(GHC_FOO_DIR_REL)
+# indicates a directory relative to the top of the source tree, whereas
+# $(GHC_FOO_DIR) is a directory relative to the current directory.
+# $(GHC_FOO_DIR_ABS) is the absolute path to the directory.
+
+GHC_UTILS_DIR_REL	= utils
+GHC_INCLUDE_DIR_REL	= includes
+GHC_COMPILER_DIR_REL	= compiler
+GHC_RTS_DIR_REL	   	= rts
+GHC_UTILS_DIR_REL 	= utils
+GHC_DRIVER_DIR_REL	= driver
+GHC_COMPAT_DIR_REL	= compat
+
+GHC_MKDEPENDC_DIR_REL	= $(GHC_UTILS_DIR_REL)/mkdependC
+GHC_LTX_DIR_REL		= $(GHC_UTILS_DIR_REL)/ltx
+GHC_RUNTEST_DIR_REL	= $(GHC_UTILS_DIR_REL)/runstdtest
+GHC_LNDIR_DIR_REL	= $(GHC_UTILS_DIR_REL)/lndir
+GHC_MKDIRHIER_DIR_REL	= $(GHC_UTILS_DIR_REL)/mkdirhier
+GHC_DOCBOOK_DIR_REL	= $(GHC_UTILS_DIR_REL)/docbook
+GHC_UNLIT_DIR_REL    	= $(GHC_UTILS_DIR_REL)/unlit
+GHC_HP2PS_DIR_REL	= $(GHC_UTILS_DIR_REL)/hp2ps
+GHC_HSTAGS_DIR_REL	= $(GHC_UTILS_DIR_REL)/hasktags
+GHC_HSC2HS_DIR_REL	= $(GHC_UTILS_DIR_REL)/hsc2hs
+GHC_TOUCHY_DIR_REL	= $(GHC_UTILS_DIR_REL)/touchy
+GHC_PKG_DIR_REL		= $(GHC_UTILS_DIR_REL)/ghc-pkg
+GHC_GENPRIMOP_DIR_REL	= $(GHC_UTILS_DIR_REL)/genprimopcode
+GHC_GENAPPLY_DIR_REL	= $(GHC_UTILS_DIR_REL)/genapply
+
+GHC_MANGLER_DIR_REL	= $(GHC_DRIVER_DIR_REL)/mangler
+GHC_SPLIT_DIR_REL	= $(GHC_DRIVER_DIR_REL)/split
+GHC_SYSMAN_DIR_REL	= $(GHC_RTS_DIR_REL)/parallel
+
+GHC_UTILS_DIR		= $(FPTOOLS_TOP)/$(GHC_UTILS_DIR_REL)
+GHC_INCLUDE_DIR	  	= $(FPTOOLS_TOP)/$(GHC_INCLUDE_DIR_REL)
+GHC_COMPILER_DIR	= $(FPTOOLS_TOP)/$(GHC_COMPILER_DIR_REL)
+GHC_RTS_DIR	   	= $(FPTOOLS_TOP)/$(GHC_RTS_DIR_REL)
+GHC_UTILS_DIR 		= $(FPTOOLS_TOP)/$(GHC_UTILS_DIR_REL)
+GHC_DRIVER_DIR		= $(FPTOOLS_TOP)/$(GHC_DRIVER_DIR_REL)
+GHC_COMPAT_DIR		= $(FPTOOLS_TOP)/$(GHC_COMPAT_DIR_REL)
+
+GHC_MKDEPENDC_DIR	= $(FPTOOLS_TOP)/$(GHC_MKDEPENDC_DIR_REL)
+GHC_LTX_DIR		= $(FPTOOLS_TOP)/$(GHC_LTX_DIR_REL)
+GHC_RUNTEST_DIR		= $(FPTOOLS_TOP)/$(GHC_RUNTEST_DIR_REL)
+GHC_LNDIR_DIR		= $(FPTOOLS_TOP)/$(GHC_LNDIR_DIR_REL)
+GHC_MKDIRHIER_DIR	= $(FPTOOLS_TOP)/$(GHC_MKDIRHIER_DIR_REL)
+GHC_DOCBOOK_DIR		= $(FPTOOLS_TOP)/$(GHC_DOCBOOK_DIR_REL)
+GHC_UNLIT_DIR    	= $(FPTOOLS_TOP)/$(GHC_UNLIT_DIR_REL)
+GHC_HP2PS_DIR		= $(FPTOOLS_TOP)/$(GHC_HP2PS_DIR_REL)
+GHC_HSTAGS_DIR		= $(FPTOOLS_TOP)/$(GHC_HSTAGS_DIR_REL)
+GHC_HSC2HS_DIR		= $(FPTOOLS_TOP)/$(GHC_HSC2HS_DIR_REL)
+GHC_TOUCHY_DIR		= $(FPTOOLS_TOP)/$(GHC_TOUCHY_DIR_REL)
+GHC_PKG_DIR		= $(FPTOOLS_TOP)/$(GHC_PKG_DIR_REL)
+GHC_GENPRIMOP_DIR	= $(FPTOOLS_TOP)/$(GHC_GENPRIMOP_DIR_REL)
+GHC_GENAPPLY_DIR	= $(FPTOOLS_TOP)/$(GHC_GENAPPLY_DIR_REL)
+
+GHC_MANGLER_DIR		= $(FPTOOLS_TOP)/$(GHC_MANGLER_DIR_REL)
+GHC_SPLIT_DIR		= $(FPTOOLS_TOP)/$(GHC_SPLIT_DIR_REL)
+GHC_SYSMAN_DIR		= $(FPTOOLS_TOP)/$(GHC_SYSMAN_DIR_REL)
+
+GHC_UTILS_DIR_ABS	= $(FPTOOLS_TOP_ABS)/$(GHC_UTILS_DIR_REL)
+GHC_INCLUDE_DIR_ABS	= $(FPTOOLS_TOP_ABS)/$(GHC_INCLUDE_DIR_REL)
+GHC_COMPILER_DIR_ABS	= $(FPTOOLS_TOP_ABS)/$(GHC_COMPILER_DIR_REL)
+GHC_RTS_DIR_ABS	   	= $(FPTOOLS_TOP_ABS)/$(GHC_RTS_DIR_REL)
+GHC_UTILS_DIR_ABS	= $(FPTOOLS_TOP_ABS)/$(GHC_UTILS_DIR_REL)
+GHC_DRIVER_DIR_ABS	= $(FPTOOLS_TOP_ABS)/$(GHC_DRIVER_DIR_REL)
+GHC_COMPAT_DIR_ABS	= $(FPTOOLS_TOP_ABS)/$(GHC_COMPAT_DIR_REL)
+
+GHC_MKDEPENDC_DIR_ABS	= $(FPTOOLS_TOP_ABS)/$(GHC_MKDEPENDC_DIR_REL)
+GHC_LTX_DIR_ABS		= $(FPTOOLS_TOP_ABS)/$(GHC_LTX_DIR_REL)
+GHC_RUNTEST_DIR_ABS	= $(FPTOOLS_TOP_ABS)/$(GHC_RUNTEST_DIR_REL)
+GHC_LNDIR_DIR_ABS	= $(FPTOOLS_TOP_ABS)/$(GHC_LNDIR_DIR_REL)
+GHC_MKDIRHIER_DIR_ABS	= $(FPTOOLS_TOP_ABS)/$(GHC_MKDIRHIER_DIR_REL)
+GHC_DOCBOOK_DIR_ABS	= $(FPTOOLS_TOP_ABS)/$(GHC_DOCBOOK_DIR_REL)
+GHC_UNLIT_DIR    	= $(FPTOOLS_TOP_ABS)/$(GHC_UNLIT_DIR_REL)
+GHC_HP2PS_DIR_ABS	= $(FPTOOLS_TOP_ABS)/$(GHC_HP2PS_DIR_REL)
+GHC_HSTAGS_DIR_ABS	= $(FPTOOLS_TOP_ABS)/$(GHC_HSTAGS_DIR_REL)
+GHC_HSC2HS_DIR_ABS	= $(FPTOOLS_TOP_ABS)/$(GHC_HSC2HS_DIR_REL)
+GHC_TOUCHY_DIR_ABS	= $(FPTOOLS_TOP_ABS)/$(GHC_TOUCHY_DIR_REL)
+GHC_PKG_DIR_ABS		= $(FPTOOLS_TOP_ABS)/$(GHC_PKG_DIR_REL)
+GHC_GENPRIMOP_DIR_ABS	= $(FPTOOLS_TOP_ABS)/$(GHC_GENPRIMOP_DIR_REL)
+GHC_GENAPPLY_DIR_ABS	= $(FPTOOLS_TOP_ABS)/$(GHC_GENAPPLY_DIR_REL)
+
+GHC_MANGLER_DIR_ABS	= $(FPTOOLS_TOP_ABS)/$(GHC_MANGLER_DIR_REL)
+GHC_SYSMAN_DIR_ABS	= $(FPTOOLS_TOP_ABS)/$(GHC_SYSMAN_DIR_REL)
+GHC_SPLIT_DIR_ABS	= $(FPTOOLS_TOP_ABS)/$(GHC_SPLIT_DIR_REL)
 
-SCRIPT_PREFIX 		= $(GLAFP_UTILS)/scripts/
-MKDEPENDC_PREFIX	= $(GLAFP_UTILS)/mkdependC/
-LTX_PREFIX		= $(GLAFP_UTILS)/ltx/
-RUNTEST_PREFIX		= $(GLAFP_UTILS)/runstdtest/
-VERBATIM_PREFIX		= $(GLAFP_UTILS)/verbatim/
-SGMLVERB_PREFIX		= $(GLAFP_UTILS)/sgmlverb/
-ETAGS_PREFIX		= $(GLAFP_UTILS)/etags/
-LNDIR_PREFIX		= $(GLAFP_UTILS)/lndir/
-MKDIRHIER_PREFIX	= $(GLAFP_UTILS)/mkdirhier/
-DOCBOOK_PREFIX		= $(GLAFP_UTILS)/docbook/
-
-HADDOCK_PREFIX		= $(FPTOOLS_TOP)/haddock/
+# -----------------------------------------------------------------------------
+# Names of programs in the GHC tree
+#
+#      xxx_PGM	        the name of an executable, without the path
+#      xxx		the executable relative to the current dir
+
+GHC_UNLIT_PGM		= unlit$(exeext)
+GHC_HSTAGS_PGM		= hasktags
+GHC_HSC2HS_INPLACE_PGM	= hsc2hs-inplace
+GHC_TOUCHY_PGM		= touchy$(exeext)
+GHC_MANGLER_PGM		= ghc-asm
+GHC_SPLIT_PGM		= ghc-split
+GHC_SYSMAN_PGM 		= SysMan
+GHC_PKG_INPLACE_PGM	= ghc-pkg-inplace
+GHC_GENPRIMOP_PGM	= genprimopcode
+GHC_GENAPPLY_PGM	= genapply
+GHC_MKDEPENDC_PGM 	= mkdependC
+GHC_LTX_PGM 		= ltx
+GHC_MKDIRHIER_PGM	= mkdirhier
+GHC_LNDIR_PGM		= lndir
+GHC_RUNTEST_PGM		= runstdtest
 
-LITERATE_PREFIX    	= $(FPTOOLS_TOP)/literate/
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+GHC_CP			= "xcopy /y"
+GHC_PERL		= perl
+else
+GHC_CP			= $(CP)
+GHC_PERL		= $(PERL)
+endif
 
-UNLIT_PREFIX    	= $(FPTOOLS_TOP)/ghc/utils/unlit/
-HP2PS_PREFIX            = $(FPTOOLS_TOP)/ghc/utils/hp2ps/
-HSTAGS_PREFIX           = $(FPTOOLS_TOP)/ghc/utils/hasktags/
-HSC2HS_PREFIX		= $(FPTOOLS_TOP)/ghc/utils/hsc2hs/
+UNLIT			= $(GHC_UNLIT_DIR)/$(GHC_UNLIT_PGM)
+HSTAGS			= $(GHC_HSTAGS_DIR)/$(GHC_HSTAGS_PGM)
+HSC2HS_INPLACE		= $(GHC_HSC2HS_DIR)/$(GHC_HSC2HS_INPLACE_PGM)
+MANGLER			= $(GHC_MANGLER_DIR)/$(GHC_MANGLER_PGM)
+SPLIT			= $(GHC_SPLIT_DIR)/$(GHC_SPLIT_PGM)
+SYSMAN 			= $(GHC_SYSMAN_DIR)/$(GHC_SYSMAN_PGM)
+GHC_PKG_INPLACE		= $(GHC_PKG_DIR)/$(GHC_PKG_INPLACE_PGM)
+GENPRIMOP		= $(GHC_GENPRIMOP_DIR)/$(GHC_GENPRIMOP_PGM)
+GENAPPLY		= $(GHC_GENAPPLY_DIR)/$(GHC_GENAPPLY_PGM)
+MKDEPENDC 		= $(GHC_MKDEPENDC_DIR)/$(GHC_MKDEPENDC_PGM)
+LTX 			= $(GHC_LTX_DIR)/$(GHC_LTX_PGM)
+MKDIRHIER		= $(GHC_MKDIRHIER_DIR)/$(GHC_MKDIRHIER_PGM)
+LNDIR			= $(GHC_LNDIR_DIR)/$(GHC_LNDIR_PGM)
+RUNTEST			= $(GHC_RUNTEST_DIR)/$(GHC_RUNTEST_PGM)
 
 #-----------------------------------------------------------------------------
 # Haskell compilers and mkdependHS
@@ -722,6 +763,9 @@ GhcMajVersion	= @GhcMajVersion@
 GhcMinVersion	= @GhcMinVersion@
 GhcPatchLevel	= @GhcPatchLevel@
 
+# Set to YES if $(GHC) has the readline package installed
+GhcHasReadline	= @GhcHasReadline@
+
 # Canonicalised ghc version number, used for easy (integer) version
 # comparisons.  We must expand $(GhcMinVersion) to two digits by
 # adding a leading zero if necessary:
@@ -734,17 +778,45 @@ endif
 HBC		= @HBC@
 NHC		= @NHC@
 
+# Setting UseStage1=YES forces use of the stage1 compiler to compile
+# Haskell code, rather than the installed compiler.
+ifeq "$(UseStage1)" "YES"
+HC		=$(GHC_STAGE1)
+MKDEPENDHS	=$(GHC_STAGE1)
+else
 HC	        = @WithHc@
 MKDEPENDHS	= $(GHC)
+endif
 
 # Sometimes we want to invoke ghc from the build tree in different
-# projects (eg. it's handy to have a nofib & a ghc build in the same
+# places (eg. it's handy to have a nofib & a ghc build in the same
 # tree).  We can refer to "this ghc" as $(GHC_INPLACE):
 
-GHC_INPLACE 	= $(FPTOOLS_TOP)/ghc/compiler/ghc-inplace
-GHC_STAGE1 	= $(FPTOOLS_TOP)/ghc/compiler/stage1/ghc-inplace
-GHC_STAGE2 	= $(FPTOOLS_TOP)/ghc/compiler/stage2/ghc-inplace
-GHC_STAGE3 	= $(FPTOOLS_TOP)/ghc/compiler/stage3/ghc-inplace
+GHC_INPLACE 	= $(GHC_COMPILER_DIR)/ghc-inplace
+GHC_STAGE1 	= $(GHC_COMPILER_DIR)/stage1/ghc-inplace
+GHC_STAGE2 	= $(GHC_COMPILER_DIR)/stage2/ghc-inplace
+GHC_STAGE3 	= $(GHC_COMPILER_DIR)/stage3/ghc-inplace
+
+# Some useful GHC version predicates:
+
+ifeq "$(UseStage1)" "YES"
+ghc_ge_504 = YES
+ghc_ge_601 = YES
+ghc_ge_602 = YES
+ghc_ge_603 = YES
+else
+ifeq "$(BootingFromHc)" "YES"
+ghc_ge_504 = YES
+ghc_ge_601 = YES
+ghc_ge_602 = YES
+ghc_ge_603 = YES
+else
+ghc_ge_504 = $(shell if (test $(GhcCanonVersion) -ge 504); then echo YES; else echo NO; fi)
+ghc_ge_601 = $(shell if (test $(GhcCanonVersion) -ge 601); then echo YES; else echo NO; fi)
+ghc_ge_602 = $(shell if (test $(GhcCanonVersion) -ge 602); then echo YES; else echo NO; fi)
+ghc_ge_603 = $(shell if (test $(GhcCanonVersion) -ge 603); then echo YES; else echo NO; fi)
+endif
+endif
 
 #-----------------------------------------------------------------------------
 # C compiler
@@ -859,7 +931,7 @@ LdIsGNULd		= @LdIsGNULd@
 # The reason for having to do this is that overly long command lines
 # cause unnecessary trouble with some shells (e.g., /bin/sh on Solaris
 # 2.5.1), which is why this backdoor is provided. The situation of overly
-# long command lines is either encountered while doing `make boot' in ghc/compiler, 
+# long command lines is either encountered while doing `make boot' in compiler/, 
 # or when linking the compiler binary (`hsc'). 
 #
 # We do not use SHELL to execute long commands, as `make' will more than likely
@@ -893,6 +965,9 @@ TIME			= @TimeCmd@
 TROFF			= troff
 UNAME			= uname
 
+# GTK+
+GTK_CONFIG = @GTK_CONFIG@
+
 #-----------------------------------------------------------------------------
 # DocBook XML stuff
 
@@ -912,16 +987,6 @@ XSLTPROC_LABEL_OPTS	= --stringparam toc.section.depth 3 \
 #-----------------------------------------------------------------------------
 # 		FPtools support software
 
-# Stuff from fptools/glafp-utils
-MKDEPENDC 		= $(MKDEPENDC_PREFIX)mkdependC
-LTX 			= $(LTX_PREFIX)ltx
-MKDIRHIER		= $(MKDIRHIER_PREFIX)mkdirhier
-LNDIR			= $(LNDIR_PREFIX)lndir
-ETAGS			= $(ETAGS_PREFIX)etags
-VERBATIM		= $(VERBATIM_PREFIX)verbatim
-SGMLVERB		= $(SGMLVERB_PREFIX)sgmlverb
-RUNTEST			= $(RUNTEST_PREFIX)runstdtest
-
 BLD_DLL			= dllwrap
 
 #
@@ -969,31 +1034,9 @@ GHC_ALEX_OPTS		= -g
 # Haddock
 # 
 HADDOCK			= @HaddockCmd@
-HADDOCK_INPLACE		= $(HADDOCK_PREFIX)/src/haddock-inplace
-
-#
-# Stuff from fptools/literate
-#
-LIT2PGM 		= $(LITERATE_PREFIX)lit2pgm
-LIT2HTML      		= $(LITERATE_PREFIX)lit2html
-LIT2LATEX     		= $(LITERATE_PREFIX)lit2latex
-MKDEPENDLIT   		= $(LITERATE_PREFIX)mkdependlit
-LIT2CHANGELOG 		= $(LITERATE_PREFIX)lit2changelog
-LIT2TEXT 		= $(LITERATE_PREFIX)lit2text
-
-#
-# Stuff from fptools/ghc/utils
-#
-UNLIT	 		= $(UNLIT_PREFIX)unlit$(exeext)
-HP2PS			= $(HP2PS_PREFIX)hp2ps$(exeext)
-HSTAGS			= $(HSTAGS_PREFIX)hasktags
-HSC2HS			= $(HSC2HS_PREFIX)hsc2hs-inplace
 
 #
-# Options for the compiling different `ways'. Various projects within
-# the glorious fptools tree support building in various user-configured
-# ways. For instance, you could set up one `way' such that the prelude
-# libraries all were built with the option -ffoldr-build-on.
+# Options for compiling in different `ways'. 
 # 
 # To configure up your own way, have a look at some of the standard ways
 # such as profiling, and create your own set of WAY_*_OPTS defs below.
@@ -1003,15 +1046,6 @@ HSC2HS			= $(HSC2HS_PREFIX)hsc2hs-inplace
 #
 
 #
-# IMPORTANT! The WAYS variable configures the different `ways'
-# you want to build a project (or maybe just parts of it, as is
-# the case for ghc/). This variable is intended set inside the
-# project mk setup, enforcing a global fptools WAYS is a bit too
-# much (do you *really* want to build glafp-utils the profiled-concurrent 
-# way?)
-#
-
-#
 # Definitions of the different ways:
 #   
 #   * their name:
@@ -1032,7 +1066,7 @@ USER_WAYS=a b c d e f g h j k l m n o A B
 # The following ways currently have treated specially, p u t mg,
 # as the driver script treats these guys specially and needs to carefully be told
 # about the options for these. Hence, we hide the required command line options
-# for these in the ghc/driver, as this is the only place they are needed.
+# for these in the driver, as this is the only place they are needed.
 # 
 # If you want to add to these default options, fill in the variables below:
 
diff --git a/mk/package.mk b/mk/package.mk
index 37e286bca7..fbabfeb1e4 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -3,13 +3,8 @@
 
 ifneq "$(PACKAGE)" ""
 
-ifeq "$(STANDALONE_PACKAGE)" ""
-ifeq "$(ProjectNameShort)" "ghc"
+# FIXME: does anyone do this any more?
 STANDALONE_PACKAGE = NO
-else
-STANDALONE_PACKAGE = YES
-endif
-endif
 
 # -----------------------------------------------------------------------------
 # Directory layouts, installation etc.
@@ -104,7 +99,7 @@ package.conf.installed : package.conf.in
 	sed -e 's/""//g' -e 's/:[ 	]*,/: /g' >$@
 
 # we could be more accurate here and add a dependency on
-# ghc/driver/package.conf, but that doesn't work too well because of
+# driver/package.conf, but that doesn't work too well because of
 # make's limited accuracy with modification times: when doing 'make
 # boot' in multiple packages, make won't detect that the package
 # configuration needs updating if it was updated already in the last
diff --git a/mk/paths.mk b/mk/paths.mk
index 84f8988b17..b616e7d28d 100644
--- a/mk/paths.mk
+++ b/mk/paths.mk
@@ -230,7 +230,7 @@ TAGS_C_SRCS=$(C_SRCS)
 #
 # NOTE: $(SCRIPT_OBJS) is not in MOSTLY_CLEAN_FILES, because in some
 # places in the tree it appears that we have source files in $(SCRIPT_OBJS).
-# Specifically glafp-utils/mkdependC/mkdependC.prl and others in ghc/driver and
+# Specifically glafp-utils/mkdependC/mkdependC.prl and others in driver/ and
 # possibly others elsewhere in the tree.  ToDo: fix this properly.
 MOSTLY_CLEAN_FILES += $(HS_OBJS) $(C_OBJS) $(HSC_C_OBJS) $(GC_C_OBJS)
 CLEAN_FILES        += $(HS_PROG) $(C_PROG) $(SCRIPT_PROG) $(SCRIPT_LINK) \
diff --git a/mk/suffix.mk b/mk/suffix.mk
index 984c311ef4..276c0c02f0 100644
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -26,7 +26,7 @@
 # Haskell Suffix Rules
 
 # The $(odir) support is for building GHC, where we need to build three
-# different versions from the same sources.  See ghc/compiler/Makefile.
+# different versions from the same sources.  See compiler/Makefile.
 ifneq "$(odir)" ""
 odir_ = $(odir)/
 else
@@ -165,7 +165,7 @@ endif # BootingFromHc
 #
 ifneq "$(BootingFromHc)" "YES"
 %_hsc.c %_hsc.h %.hs : %.hsc
-	$(HSC2HS) $(HSC2HS_OPTS) $<
+	$(HSC2HS_INPLACE) $(HSC2HS_OPTS) $<
 	@touch $(patsubst %.hsc,%_hsc.c,$<)
 endif
 
diff --git a/mk/target.mk b/mk/target.mk
index 7a49c35417..0334896b3f 100644
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -2,14 +2,14 @@
 #
 #			target.mk
 #
-#		Standard targets for fptools
+#		Standard targets for GHC
 #
 #################################################################################
 
 #
 # This file contain three groups of target rules:
 #
-# 1.  FPtools targets
+# 1.  GHC targets
 #	depend*
 #	runtests*
 #
@@ -19,7 +19,7 @@
 #       install-docs*
 #	clean* distclean* mostlyclean* maintainer-clean*
 #	tags*
-#	dvi ps (no info) FPTOOLS adds: pdf rtf html chm HxS
+#	dvi ps (no info) GHC adds: pdf rtf html chm HxS
 #	check
 #
 # 3. Some of the above targets have a version that
@@ -50,7 +50,7 @@ include $(TOP)/mk/package.mk
 include $(TOP)/mk/suffix.mk
 
 ##################################################################
-# 		FPtools standard targets
+# 		GHC standard targets
 #
 # depend:
 #
@@ -202,7 +202,7 @@ endif
 #      directories where files are installed, and their parent
 #      directories. There is a script called `mkinstalldirs' which is
 #      convenient for this; find it in the Texinfo package.
-#      (FPTOOLS: we use a close relative of the suggested script, situated
+#      (GHC: we use a close relative of the suggested script, situated
 #       in glafp-utils/mkdirhier -- SOF)
 
 
@@ -373,7 +373,7 @@ SRC_BLD_DLL_OPTS += --export-all --output-def=HS$(PACKAGE)$(_cbits)$(_way).def D
 ifneq "$(PACKAGE) $(IS_CBITS_LIB)" "std YES"
 ifneq "$(PACKAGE)" "rts"
 SRC_BLD_DLL_OPTS += -lHSstd_cbits_imp -L$(GHC_LIB_DIR)/std/cbits
-SRC_BLD_DLL_OPTS += -lHSrts_$(way_)imp -L$(GHC_RUNTIME_DIR)
+SRC_BLD_DLL_OPTS += -lHSrts_$(way_)imp -L$(GHC_RTS_DIR)
 ifneq "$(PACKAGE)" "std"
   ifeq "$(IS_CBITS_LIB)" ""
   SRC_BLD_DLL_OPTS += -lHSstd_$(way_)imp -L$(GHC_LIB_DIR)/std 
@@ -382,7 +382,7 @@ endif
 endif
 endif
 
-SRC_BLD_DLL_OPTS += -lgmp -L. -L$(GHC_RUNTIME_DIR)/gmp
+SRC_BLD_DLL_OPTS += -lgmp -L. -L$(GHC_RTS_DIR)/gmp
 ifeq "$(IS_CBITS_LIB)" ""
 SRC_BLD_DLL_OPTS += $(patsubst %,-lHS%_$(way_)imp, $(PACKAGE_DEPS))
 SRC_BLD_DLL_OPTS += $(patsubst %,-L../%, $(PACKAGE_DEPS))
@@ -1077,21 +1077,21 @@ ifeq "$(way)" ""
 # since these are way-independent
 all docs TAGS clean distclean mostlyclean maintainer-clean install ::
 	@echo "------------------------------------------------------------------------"
-	@echo "===fptools== Recursively making \`$@' for ways: $(WAYS) ..."
+	@echo "== Recursively making \`$@' for ways: $(WAYS) ..."
 	@echo "PWD = $(shell pwd)"
 	@echo "------------------------------------------------------------------------"
 # Don't rely on -e working, instead we check exit return codes from sub-makes.
 	@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
 	for i in $(WAYS) ; do \
 	  echo "------------------------------------------------------------------------"; \
-	  echo "==fptools== $(MAKE) way=$$i $@;"; \
+	  echo "== $(MAKE) way=$$i $@;"; \
 	  echo "PWD = $(shell pwd)"; \
 	  echo "------------------------------------------------------------------------"; \
 	  $(MAKE) way=$$i --no-print-directory $(MFLAGS) $@ ; \
 	  if [ $$? -eq 0 ] ; then true; else exit $$x_on_err; fi; \
 	done
 	@echo "------------------------------------------------------------------------"
-	@echo "===fptools== Finished recursively making \`$@' for ways: $(WAYS) ..."
+	@echo "== Finished recursively making \`$@' for ways: $(WAYS) ..."
 	@echo "PWD = $(shell pwd)"
 	@echo "------------------------------------------------------------------------"
 
@@ -1171,21 +1171,21 @@ endif
 
 $(ALL_TARGET) docs runtests $(BOOT_TARGET) TAGS clean distclean mostlyclean maintainer-clean $(INSTALL_TARGET) $(INSTALL_DOCS_TARGET) html chm HxS ps dvi txt::
 	@echo "------------------------------------------------------------------------"
-	@echo "===fptools== Recursively making \`$@' in $(SUBDIRS) ..."
+	@echo "== Recursively making \`$@' in $(SUBDIRS) ..."
 	@echo "PWD = $(shell pwd)"
 	@echo "------------------------------------------------------------------------"
 # Don't rely on -e working, instead we check exit return codes from sub-makes.
 	@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
 	for i in $(SUBDIRS); do \
 	  echo "------------------------------------------------------------------------"; \
-	  echo "==fptools== $(MAKE) $@ $(MFLAGS);"; \
+	  echo "== $(MAKE) $@ $(MFLAGS);"; \
 	  echo " in $(shell pwd)/$$i"; \
 	  echo "------------------------------------------------------------------------"; \
 	  $(MAKE) --no-print-directory -C $$i $(MFLAGS) $@; \
 	  if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
 	done
 	@echo "------------------------------------------------------------------------"
-	@echo "===fptools== Finished making \`$@' in $(SUBDIRS) ..."
+	@echo "== Finished making \`$@' in $(SUBDIRS) ..."
 	@echo "PWD = $(shell pwd)"
 	@echo "------------------------------------------------------------------------"
 
diff --git a/ghc/rts/Adjustor.c b/rts/Adjustor.c
index f3e5bfe6aa..f3e5bfe6aa 100644
--- a/ghc/rts/Adjustor.c
+++ b/rts/Adjustor.c
diff --git a/ghc/rts/AdjustorAsm.S b/rts/AdjustorAsm.S
index cfdef68349..cfdef68349 100644
--- a/ghc/rts/AdjustorAsm.S
+++ b/rts/AdjustorAsm.S
diff --git a/ghc/rts/Apply.cmm b/rts/Apply.cmm
index e0ca03944c..e0ca03944c 100644
--- a/ghc/rts/Apply.cmm
+++ b/rts/Apply.cmm
diff --git a/ghc/rts/Apply.h b/rts/Apply.h
index 76e36cb9fb..76e36cb9fb 100644
--- a/ghc/rts/Apply.h
+++ b/rts/Apply.h
diff --git a/ghc/rts/Arena.c b/rts/Arena.c
index 76ac23cf88..76ac23cf88 100644
--- a/ghc/rts/Arena.c
+++ b/rts/Arena.c
diff --git a/ghc/rts/Arena.h b/rts/Arena.h
index 7a2989e543..7a2989e543 100644
--- a/ghc/rts/Arena.h
+++ b/rts/Arena.h
diff --git a/ghc/rts/AutoApply.h b/rts/AutoApply.h
index bbec1224ff..bbec1224ff 100644
--- a/ghc/rts/AutoApply.h
+++ b/rts/AutoApply.h
diff --git a/ghc/rts/AwaitEvent.h b/rts/AwaitEvent.h
index e03cb4444e..e03cb4444e 100644
--- a/ghc/rts/AwaitEvent.h
+++ b/rts/AwaitEvent.h
diff --git a/ghc/rts/BlockAlloc.c b/rts/BlockAlloc.c
index 5e0e321947..5e0e321947 100644
--- a/ghc/rts/BlockAlloc.c
+++ b/rts/BlockAlloc.c
diff --git a/ghc/rts/BlockAlloc.h b/rts/BlockAlloc.h
index 1472ac6f76..1472ac6f76 100644
--- a/ghc/rts/BlockAlloc.h
+++ b/rts/BlockAlloc.h
diff --git a/ghc/rts/Capability.c b/rts/Capability.c
index 51a42ef468..51a42ef468 100644
--- a/ghc/rts/Capability.c
+++ b/rts/Capability.c
diff --git a/ghc/rts/Capability.h b/rts/Capability.h
index a2551d0cc5..a2551d0cc5 100644
--- a/ghc/rts/Capability.h
+++ b/rts/Capability.h
diff --git a/ghc/rts/ClosureFlags.c b/rts/ClosureFlags.c
index 5545693362..5545693362 100644
--- a/ghc/rts/ClosureFlags.c
+++ b/rts/ClosureFlags.c
diff --git a/ghc/rts/Disassembler.c b/rts/Disassembler.c
index b084a29b89..b084a29b89 100644
--- a/ghc/rts/Disassembler.c
+++ b/rts/Disassembler.c
diff --git a/ghc/rts/Disassembler.h b/rts/Disassembler.h
index 2851097117..2851097117 100644
--- a/ghc/rts/Disassembler.h
+++ b/rts/Disassembler.h
diff --git a/ghc/rts/Exception.cmm b/rts/Exception.cmm
index b5c29626b2..b5c29626b2 100644
--- a/ghc/rts/Exception.cmm
+++ b/rts/Exception.cmm
diff --git a/ghc/rts/Exception.h b/rts/Exception.h
index f7832f4045..f7832f4045 100644
--- a/ghc/rts/Exception.h
+++ b/rts/Exception.h
diff --git a/ghc/rts/FrontPanel.c b/rts/FrontPanel.c
index 579b75bab3..579b75bab3 100644
--- a/ghc/rts/FrontPanel.c
+++ b/rts/FrontPanel.c
diff --git a/ghc/rts/FrontPanel.h b/rts/FrontPanel.h
index de3b741657..de3b741657 100644
--- a/ghc/rts/FrontPanel.h
+++ b/rts/FrontPanel.h
diff --git a/ghc/rts/GC.c b/rts/GC.c
index a13cd33afa..a13cd33afa 100644
--- a/ghc/rts/GC.c
+++ b/rts/GC.c
diff --git a/ghc/rts/GCCompact.c b/rts/GCCompact.c
index 4dfe84bbe0..4dfe84bbe0 100644
--- a/ghc/rts/GCCompact.c
+++ b/rts/GCCompact.c
diff --git a/ghc/rts/GCCompact.h b/rts/GCCompact.h
index 0fb39b3b12..0fb39b3b12 100644
--- a/ghc/rts/GCCompact.h
+++ b/rts/GCCompact.h
diff --git a/ghc/rts/GetTime.h b/rts/GetTime.h
index 5f02df0625..5f02df0625 100644
--- a/ghc/rts/GetTime.h
+++ b/rts/GetTime.h
diff --git a/ghc/rts/HSprel.def b/rts/HSprel.def
index 0ffe00b48c..0ffe00b48c 100644
--- a/ghc/rts/HSprel.def
+++ b/rts/HSprel.def
diff --git a/ghc/rts/Hash.c b/rts/Hash.c
index ada11a6a85..ada11a6a85 100644
--- a/ghc/rts/Hash.c
+++ b/rts/Hash.c
diff --git a/ghc/rts/Hash.h b/rts/Hash.h
index ad55953da4..ad55953da4 100644
--- a/ghc/rts/Hash.h
+++ b/rts/Hash.h
diff --git a/ghc/rts/HeapStackCheck.cmm b/rts/HeapStackCheck.cmm
index 4e5dd24596..4e5dd24596 100644
--- a/ghc/rts/HeapStackCheck.cmm
+++ b/rts/HeapStackCheck.cmm
diff --git a/ghc/rts/HsFFI.c b/rts/HsFFI.c
index 350bcfbdec..350bcfbdec 100644
--- a/ghc/rts/HsFFI.c
+++ b/rts/HsFFI.c
diff --git a/ghc/rts/Interpreter.c b/rts/Interpreter.c
index 56e9bb67ce..56e9bb67ce 100644
--- a/ghc/rts/Interpreter.c
+++ b/rts/Interpreter.c
diff --git a/ghc/rts/Interpreter.h b/rts/Interpreter.h
index d66e636084..d66e636084 100644
--- a/ghc/rts/Interpreter.h
+++ b/rts/Interpreter.h
diff --git a/ghc/rts/LdvProfile.c b/rts/LdvProfile.c
index 19ebe426d3..19ebe426d3 100644
--- a/ghc/rts/LdvProfile.c
+++ b/rts/LdvProfile.c
diff --git a/ghc/rts/LdvProfile.h b/rts/LdvProfile.h
index d85b95cd6a..d85b95cd6a 100644
--- a/ghc/rts/LdvProfile.h
+++ b/rts/LdvProfile.h
diff --git a/ghc/rts/Linker.c b/rts/Linker.c
index 92d0106def..92d0106def 100644
--- a/ghc/rts/Linker.c
+++ b/rts/Linker.c
diff --git a/ghc/rts/LinkerInternals.h b/rts/LinkerInternals.h
index 07d6334c7f..07d6334c7f 100644
--- a/ghc/rts/LinkerInternals.h
+++ b/rts/LinkerInternals.h
diff --git a/ghc/rts/MBlock.c b/rts/MBlock.c
index fa8fd49d88..fa8fd49d88 100644
--- a/ghc/rts/MBlock.c
+++ b/rts/MBlock.c
diff --git a/ghc/rts/MBlock.h b/rts/MBlock.h
index 1cc0dc5a1f..1cc0dc5a1f 100644
--- a/ghc/rts/MBlock.h
+++ b/rts/MBlock.h
diff --git a/ghc/rts/Main.c b/rts/Main.c
index 6aef280e25..6aef280e25 100644
--- a/ghc/rts/Main.c
+++ b/rts/Main.c
diff --git a/ghc/rts/Makefile b/rts/Makefile
index ef3e244032..2319788d65 100644
--- a/ghc/rts/Makefile
+++ b/rts/Makefile
@@ -195,7 +195,7 @@ AUTO_APPLY_CMM = AutoApply$(_way).cmm
 ifneq "$(BootingFromHc)" "YES"
 $(AUTO_APPLY_CMM): $(GHC_GENAPPLY)
 	@$(RM) $@
-	$(GHC_GENAPPLY) $(if $(filter $(way), u debug_u), -u) >$@
+	$(GENAPPLY) $(if $(filter $(way), u debug_u), -u) >$@
 endif
 
 EXTRA_CMM_SRCS += $(AUTO_APPLY_CMM)
diff --git a/ghc/rts/PosixSource.h b/rts/PosixSource.h
index a938f9bc0f..a938f9bc0f 100644
--- a/ghc/rts/PosixSource.h
+++ b/rts/PosixSource.h
diff --git a/ghc/rts/Prelude.h b/rts/Prelude.h
index c209b2b800..c209b2b800 100644
--- a/ghc/rts/Prelude.h
+++ b/rts/Prelude.h
diff --git a/ghc/rts/PrimOps.cmm b/rts/PrimOps.cmm
index f1c214e304..f1c214e304 100644
--- a/ghc/rts/PrimOps.cmm
+++ b/rts/PrimOps.cmm
diff --git a/ghc/rts/Printer.c b/rts/Printer.c
index 8290d220a0..8290d220a0 100644
--- a/ghc/rts/Printer.c
+++ b/rts/Printer.c
diff --git a/ghc/rts/Printer.h b/rts/Printer.h
index 54bf611250..54bf611250 100644
--- a/ghc/rts/Printer.h
+++ b/rts/Printer.h
diff --git a/ghc/rts/ProfHeap.c b/rts/ProfHeap.c
index 312bee735c..312bee735c 100644
--- a/ghc/rts/ProfHeap.c
+++ b/rts/ProfHeap.c
diff --git a/ghc/rts/ProfHeap.h b/rts/ProfHeap.h
index 0251416762..0251416762 100644
--- a/ghc/rts/ProfHeap.h
+++ b/rts/ProfHeap.h
diff --git a/ghc/rts/Profiling.c b/rts/Profiling.c
index 028dc5a509..028dc5a509 100644
--- a/ghc/rts/Profiling.c
+++ b/rts/Profiling.c
diff --git a/ghc/rts/Profiling.h b/rts/Profiling.h
index d968349a52..d968349a52 100644
--- a/ghc/rts/Profiling.h
+++ b/rts/Profiling.h
diff --git a/ghc/rts/Proftimer.c b/rts/Proftimer.c
index 3b499152d6..3b499152d6 100644
--- a/ghc/rts/Proftimer.c
+++ b/rts/Proftimer.c
diff --git a/ghc/rts/Proftimer.h b/rts/Proftimer.h
index c837b855f9..c837b855f9 100644
--- a/ghc/rts/Proftimer.h
+++ b/rts/Proftimer.h
diff --git a/ghc/rts/RetainerProfile.c b/rts/RetainerProfile.c
index c5c3de5314..c5c3de5314 100644
--- a/ghc/rts/RetainerProfile.c
+++ b/rts/RetainerProfile.c
diff --git a/ghc/rts/RetainerProfile.h b/rts/RetainerProfile.h
index 827daa8ef4..827daa8ef4 100644
--- a/ghc/rts/RetainerProfile.h
+++ b/rts/RetainerProfile.h
diff --git a/ghc/rts/RetainerSet.c b/rts/RetainerSet.c
index bfa0bc8acf..bfa0bc8acf 100644
--- a/ghc/rts/RetainerSet.c
+++ b/rts/RetainerSet.c
diff --git a/ghc/rts/RetainerSet.h b/rts/RetainerSet.h
index 6a00e1395e..6a00e1395e 100644
--- a/ghc/rts/RetainerSet.h
+++ b/rts/RetainerSet.h
diff --git a/ghc/rts/RtsAPI.c b/rts/RtsAPI.c
index b1b1d9c52d..b1b1d9c52d 100644
--- a/ghc/rts/RtsAPI.c
+++ b/rts/RtsAPI.c
diff --git a/ghc/rts/RtsDllMain.c b/rts/RtsDllMain.c
index af3c5090de..af3c5090de 100644
--- a/ghc/rts/RtsDllMain.c
+++ b/rts/RtsDllMain.c
diff --git a/ghc/rts/RtsFlags.c b/rts/RtsFlags.c
index 0f83b3356c..0f83b3356c 100644
--- a/ghc/rts/RtsFlags.c
+++ b/rts/RtsFlags.c
diff --git a/ghc/rts/RtsMessages.c b/rts/RtsMessages.c
index 1242d886eb..1242d886eb 100644
--- a/ghc/rts/RtsMessages.c
+++ b/rts/RtsMessages.c
diff --git a/ghc/rts/RtsSignals.h b/rts/RtsSignals.h
index eafeeaaf55..eafeeaaf55 100644
--- a/ghc/rts/RtsSignals.h
+++ b/rts/RtsSignals.h
diff --git a/ghc/rts/RtsStartup.c b/rts/RtsStartup.c
index 147de7b857..147de7b857 100644
--- a/ghc/rts/RtsStartup.c
+++ b/rts/RtsStartup.c
diff --git a/ghc/rts/RtsUtils.c b/rts/RtsUtils.c
index 3e7e225dda..3e7e225dda 100644
--- a/ghc/rts/RtsUtils.c
+++ b/rts/RtsUtils.c
diff --git a/ghc/rts/RtsUtils.h b/rts/RtsUtils.h
index 96a5f0d82f..96a5f0d82f 100644
--- a/ghc/rts/RtsUtils.h
+++ b/rts/RtsUtils.h
diff --git a/ghc/rts/STM.c b/rts/STM.c
index d3283a92f0..d3283a92f0 100644
--- a/ghc/rts/STM.c
+++ b/rts/STM.c
diff --git a/ghc/rts/Sanity.c b/rts/Sanity.c
index 0e68a86ba7..0e68a86ba7 100644
--- a/ghc/rts/Sanity.c
+++ b/rts/Sanity.c
diff --git a/ghc/rts/Sanity.h b/rts/Sanity.h
index 8cf3f9e52e..8cf3f9e52e 100644
--- a/ghc/rts/Sanity.h
+++ b/rts/Sanity.h
diff --git a/ghc/rts/Schedule.c b/rts/Schedule.c
index 52fd4d5df6..52fd4d5df6 100644
--- a/ghc/rts/Schedule.c
+++ b/rts/Schedule.c
diff --git a/ghc/rts/Schedule.h b/rts/Schedule.h
index 37b07941f4..37b07941f4 100644
--- a/ghc/rts/Schedule.h
+++ b/rts/Schedule.h
diff --git a/ghc/rts/Sparks.c b/rts/Sparks.c
index 615d832e33..615d832e33 100644
--- a/ghc/rts/Sparks.c
+++ b/rts/Sparks.c
diff --git a/ghc/rts/Sparks.h b/rts/Sparks.h
index 77d280bea8..77d280bea8 100644
--- a/ghc/rts/Sparks.h
+++ b/rts/Sparks.h
diff --git a/ghc/rts/Stable.c b/rts/Stable.c
index a4db5cd749..a4db5cd749 100644
--- a/ghc/rts/Stable.c
+++ b/rts/Stable.c
diff --git a/ghc/rts/Stats.c b/rts/Stats.c
index 28d09bdbed..28d09bdbed 100644
--- a/ghc/rts/Stats.c
+++ b/rts/Stats.c
diff --git a/ghc/rts/Stats.h b/rts/Stats.h
index 20bc0155ad..20bc0155ad 100644
--- a/ghc/rts/Stats.h
+++ b/rts/Stats.h
diff --git a/ghc/rts/StgCRun.c b/rts/StgCRun.c
index c1afc16559..c1afc16559 100644
--- a/ghc/rts/StgCRun.c
+++ b/rts/StgCRun.c
diff --git a/ghc/rts/StgMiscClosures.cmm b/rts/StgMiscClosures.cmm
index 70d08aeb0e..70d08aeb0e 100644
--- a/ghc/rts/StgMiscClosures.cmm
+++ b/rts/StgMiscClosures.cmm
diff --git a/ghc/rts/StgPrimFloat.c b/rts/StgPrimFloat.c
index 5bd6aebb1c..5bd6aebb1c 100644
--- a/ghc/rts/StgPrimFloat.c
+++ b/rts/StgPrimFloat.c
diff --git a/ghc/rts/StgRun.h b/rts/StgRun.h
index da376b4971..da376b4971 100644
--- a/ghc/rts/StgRun.h
+++ b/rts/StgRun.h
diff --git a/ghc/rts/StgStartup.cmm b/rts/StgStartup.cmm
index 2f2a759c81..2f2a759c81 100644
--- a/ghc/rts/StgStartup.cmm
+++ b/rts/StgStartup.cmm
diff --git a/ghc/rts/StgStdThunks.cmm b/rts/StgStdThunks.cmm
index 342a6eb164..342a6eb164 100644
--- a/ghc/rts/StgStdThunks.cmm
+++ b/rts/StgStdThunks.cmm
diff --git a/ghc/rts/Storage.c b/rts/Storage.c
index 974be45f10..974be45f10 100644
--- a/ghc/rts/Storage.c
+++ b/rts/Storage.c
diff --git a/ghc/rts/Task.c b/rts/Task.c
index 7366480094..7366480094 100644
--- a/ghc/rts/Task.c
+++ b/rts/Task.c
diff --git a/ghc/rts/Task.h b/rts/Task.h
index ca71d2809a..ca71d2809a 100644
--- a/ghc/rts/Task.h
+++ b/rts/Task.h
diff --git a/ghc/rts/ThreadLabels.c b/rts/ThreadLabels.c
index 9b9f1723ff..9b9f1723ff 100644
--- a/ghc/rts/ThreadLabels.c
+++ b/rts/ThreadLabels.c
diff --git a/ghc/rts/ThreadLabels.h b/rts/ThreadLabels.h
index 97d3d0d241..97d3d0d241 100644
--- a/ghc/rts/ThreadLabels.h
+++ b/rts/ThreadLabels.h
diff --git a/ghc/rts/Ticker.h b/rts/Ticker.h
index f9555768b5..f9555768b5 100644
--- a/ghc/rts/Ticker.h
+++ b/rts/Ticker.h
diff --git a/ghc/rts/Ticky.c b/rts/Ticky.c
index 294e12bdda..294e12bdda 100644
--- a/ghc/rts/Ticky.c
+++ b/rts/Ticky.c
diff --git a/ghc/rts/Ticky.h b/rts/Ticky.h
index 21765e4bbb..21765e4bbb 100644
--- a/ghc/rts/Ticky.h
+++ b/rts/Ticky.h
diff --git a/ghc/rts/Timer.c b/rts/Timer.c
index 0bfea2d6fd..0bfea2d6fd 100644
--- a/ghc/rts/Timer.c
+++ b/rts/Timer.c
diff --git a/ghc/rts/Timer.h b/rts/Timer.h
index ae26653462..ae26653462 100644
--- a/ghc/rts/Timer.h
+++ b/rts/Timer.h
diff --git a/ghc/rts/Updates.cmm b/rts/Updates.cmm
index 1d2fc5fe0f..1d2fc5fe0f 100644
--- a/ghc/rts/Updates.cmm
+++ b/rts/Updates.cmm
diff --git a/ghc/rts/Updates.h b/rts/Updates.h
index 5872157c81..5872157c81 100644
--- a/ghc/rts/Updates.h
+++ b/rts/Updates.h
diff --git a/ghc/rts/VisCallbacks.c b/rts/VisCallbacks.c
index 8e3c6ceb6c..8e3c6ceb6c 100644
--- a/ghc/rts/VisCallbacks.c
+++ b/rts/VisCallbacks.c
diff --git a/ghc/rts/VisCallbacks.h b/rts/VisCallbacks.h
index d242010fad..d242010fad 100644
--- a/ghc/rts/VisCallbacks.h
+++ b/rts/VisCallbacks.h
diff --git a/ghc/rts/VisSupport.c b/rts/VisSupport.c
index a85c5f43a4..a85c5f43a4 100644
--- a/ghc/rts/VisSupport.c
+++ b/rts/VisSupport.c
diff --git a/ghc/rts/VisSupport.h b/rts/VisSupport.h
index 2dea079c2a..2dea079c2a 100644
--- a/ghc/rts/VisSupport.h
+++ b/rts/VisSupport.h
diff --git a/ghc/rts/VisWindow.c b/rts/VisWindow.c
index 188b88976e..188b88976e 100644
--- a/ghc/rts/VisWindow.c
+++ b/rts/VisWindow.c
diff --git a/ghc/rts/VisWindow.h b/rts/VisWindow.h
index c646c40c02..c646c40c02 100644
--- a/ghc/rts/VisWindow.h
+++ b/rts/VisWindow.h
diff --git a/ghc/rts/Weak.c b/rts/Weak.c
index f010395221..f010395221 100644
--- a/ghc/rts/Weak.c
+++ b/rts/Weak.c
diff --git a/ghc/rts/Weak.h b/rts/Weak.h
index ba8c1ca913..ba8c1ca913 100644
--- a/ghc/rts/Weak.h
+++ b/rts/Weak.h
diff --git a/ghc/rts/dotnet/Invoke.c b/rts/dotnet/Invoke.c
index 585dcacaad..585dcacaad 100644
--- a/ghc/rts/dotnet/Invoke.c
+++ b/rts/dotnet/Invoke.c
diff --git a/ghc/rts/dotnet/Invoker.cpp b/rts/dotnet/Invoker.cpp
index d8ad87212d..d8ad87212d 100644
--- a/ghc/rts/dotnet/Invoker.cpp
+++ b/rts/dotnet/Invoker.cpp
diff --git a/ghc/rts/dotnet/Invoker.h b/rts/dotnet/Invoker.h
index d649a4c716..d649a4c716 100644
--- a/ghc/rts/dotnet/Invoker.h
+++ b/rts/dotnet/Invoker.h
diff --git a/ghc/rts/dotnet/InvokerClient.h b/rts/dotnet/InvokerClient.h
index 122f455c01..122f455c01 100644
--- a/ghc/rts/dotnet/InvokerClient.h
+++ b/rts/dotnet/InvokerClient.h
diff --git a/ghc/rts/dotnet/Makefile b/rts/dotnet/Makefile
index 95b6c38890..95b6c38890 100644
--- a/ghc/rts/dotnet/Makefile
+++ b/rts/dotnet/Makefile
diff --git a/ghc/rts/dotnet/invoker.snk b/rts/dotnet/invoker.snk
index 05a222178a..05a222178a 100644
--- a/ghc/rts/dotnet/invoker.snk
+++ b/rts/dotnet/invoker.snk
diff --git a/ghc/rts/ghc-frontpanel.glade b/rts/ghc-frontpanel.glade
index 9b73afce47..9b73afce47 100644
--- a/ghc/rts/ghc-frontpanel.glade
+++ b/rts/ghc-frontpanel.glade
diff --git a/ghc/rts/gmp/.gdbinit b/rts/gmp/.gdbinit
index 843c109e89..843c109e89 100644
--- a/ghc/rts/gmp/.gdbinit
+++ b/rts/gmp/.gdbinit
diff --git a/ghc/rts/gmp/AUTHORS b/rts/gmp/AUTHORS
index 1fa057af6c..1fa057af6c 100644
--- a/ghc/rts/gmp/AUTHORS
+++ b/rts/gmp/AUTHORS
diff --git a/ghc/rts/gmp/COPYING b/rts/gmp/COPYING
index a6d7d0188a..a6d7d0188a 100644
--- a/ghc/rts/gmp/COPYING
+++ b/rts/gmp/COPYING
diff --git a/ghc/rts/gmp/COPYING.LIB b/rts/gmp/COPYING.LIB
index c4792dd27a..c4792dd27a 100644
--- a/ghc/rts/gmp/COPYING.LIB
+++ b/rts/gmp/COPYING.LIB
diff --git a/ghc/rts/gmp/INSTALL b/rts/gmp/INSTALL
index 62faa1a2e3..62faa1a2e3 100644
--- a/ghc/rts/gmp/INSTALL
+++ b/rts/gmp/INSTALL
diff --git a/ghc/rts/gmp/Makefile.am b/rts/gmp/Makefile.am
index b73b805c6e..b73b805c6e 100644
--- a/ghc/rts/gmp/Makefile.am
+++ b/rts/gmp/Makefile.am
diff --git a/ghc/rts/gmp/Makefile.in b/rts/gmp/Makefile.in
index e63383e7a7..e63383e7a7 100644
--- a/ghc/rts/gmp/Makefile.in
+++ b/rts/gmp/Makefile.in
diff --git a/ghc/rts/gmp/NEWS b/rts/gmp/NEWS
index 3b549d59f3..3b549d59f3 100644
--- a/ghc/rts/gmp/NEWS
+++ b/rts/gmp/NEWS
diff --git a/ghc/rts/gmp/README b/rts/gmp/README
index 177c97eb12..177c97eb12 100644
--- a/ghc/rts/gmp/README
+++ b/rts/gmp/README
diff --git a/ghc/rts/gmp/acconfig.h b/rts/gmp/acconfig.h
index dfb1b0b039..dfb1b0b039 100644
--- a/ghc/rts/gmp/acconfig.h
+++ b/rts/gmp/acconfig.h
diff --git a/ghc/rts/gmp/acinclude.m4 b/rts/gmp/acinclude.m4
index a02394a963..a02394a963 100644
--- a/ghc/rts/gmp/acinclude.m4
+++ b/rts/gmp/acinclude.m4
diff --git a/ghc/rts/gmp/aclocal.m4 b/rts/gmp/aclocal.m4
index 086c77915c..086c77915c 100644
--- a/ghc/rts/gmp/aclocal.m4
+++ b/rts/gmp/aclocal.m4
diff --git a/ghc/rts/gmp/ansi2knr.1 b/rts/gmp/ansi2knr.1
index f9ee5a631c..f9ee5a631c 100644
--- a/ghc/rts/gmp/ansi2knr.1
+++ b/rts/gmp/ansi2knr.1
diff --git a/ghc/rts/gmp/ansi2knr.c b/rts/gmp/ansi2knr.c
index 937c731886..937c731886 100644
--- a/ghc/rts/gmp/ansi2knr.c
+++ b/rts/gmp/ansi2knr.c
diff --git a/ghc/rts/gmp/assert.c b/rts/gmp/assert.c
index 65eccfa30b..65eccfa30b 100644
--- a/ghc/rts/gmp/assert.c
+++ b/rts/gmp/assert.c
diff --git a/ghc/rts/gmp/compat.c b/rts/gmp/compat.c
index ab7529f52f..ab7529f52f 100644
--- a/ghc/rts/gmp/compat.c
+++ b/rts/gmp/compat.c
diff --git a/ghc/rts/gmp/config.guess b/rts/gmp/config.guess
index 08018f497d..08018f497d 100644
--- a/ghc/rts/gmp/config.guess
+++ b/rts/gmp/config.guess
diff --git a/ghc/rts/gmp/config.in b/rts/gmp/config.in
index 8b2546ef16..8b2546ef16 100644
--- a/ghc/rts/gmp/config.in
+++ b/rts/gmp/config.in
diff --git a/ghc/rts/gmp/config.sub b/rts/gmp/config.sub
index c4123f28ff..c4123f28ff 100644
--- a/ghc/rts/gmp/config.sub
+++ b/rts/gmp/config.sub
diff --git a/ghc/rts/gmp/configure b/rts/gmp/configure
index 8294680486..8294680486 100644
--- a/ghc/rts/gmp/configure
+++ b/rts/gmp/configure
diff --git a/ghc/rts/gmp/configure.in b/rts/gmp/configure.in
index 18f610fe29..18f610fe29 100644
--- a/ghc/rts/gmp/configure.in
+++ b/rts/gmp/configure.in
diff --git a/ghc/rts/gmp/depcomp b/rts/gmp/depcomp
index 7906096738..7906096738 100644
--- a/ghc/rts/gmp/depcomp
+++ b/rts/gmp/depcomp
diff --git a/ghc/rts/gmp/errno.c b/rts/gmp/errno.c
index 7dd223c19c..7dd223c19c 100644
--- a/ghc/rts/gmp/errno.c
+++ b/rts/gmp/errno.c
diff --git a/ghc/rts/gmp/extract-dbl.c b/rts/gmp/extract-dbl.c
index 2d70d9a3b2..2d70d9a3b2 100644
--- a/ghc/rts/gmp/extract-dbl.c
+++ b/rts/gmp/extract-dbl.c
diff --git a/ghc/rts/gmp/gmp-impl.h b/rts/gmp/gmp-impl.h
index 3c7ac26e7d..3c7ac26e7d 100644
--- a/ghc/rts/gmp/gmp-impl.h
+++ b/rts/gmp/gmp-impl.h
diff --git a/ghc/rts/gmp/gmp.h b/rts/gmp/gmp.h
index 0f1b9510e9..0f1b9510e9 100644
--- a/ghc/rts/gmp/gmp.h
+++ b/rts/gmp/gmp.h
diff --git a/ghc/rts/gmp/insert-dbl.c b/rts/gmp/insert-dbl.c
index dc88a56f62..dc88a56f62 100644
--- a/ghc/rts/gmp/insert-dbl.c
+++ b/rts/gmp/insert-dbl.c
diff --git a/ghc/rts/gmp/install-sh b/rts/gmp/install-sh
index e9de23842d..e9de23842d 100644
--- a/ghc/rts/gmp/install-sh
+++ b/rts/gmp/install-sh
diff --git a/ghc/rts/gmp/longlong.h b/rts/gmp/longlong.h
index 9a12755053..9a12755053 100644
--- a/ghc/rts/gmp/longlong.h
+++ b/rts/gmp/longlong.h
diff --git a/ghc/rts/gmp/ltconfig b/rts/gmp/ltconfig
index 6d8cf33e8f..6d8cf33e8f 100644
--- a/ghc/rts/gmp/ltconfig
+++ b/rts/gmp/ltconfig
diff --git a/ghc/rts/gmp/ltmain.sh b/rts/gmp/ltmain.sh
index d81d89f878..d81d89f878 100644
--- a/ghc/rts/gmp/ltmain.sh
+++ b/rts/gmp/ltmain.sh
diff --git a/ghc/rts/gmp/mdate-sh b/rts/gmp/mdate-sh
index 37171f21fb..37171f21fb 100644
--- a/ghc/rts/gmp/mdate-sh
+++ b/rts/gmp/mdate-sh
diff --git a/ghc/rts/gmp/memory.c b/rts/gmp/memory.c
index 9df440ce22..9df440ce22 100644
--- a/ghc/rts/gmp/memory.c
+++ b/rts/gmp/memory.c
diff --git a/ghc/rts/gmp/missing b/rts/gmp/missing
index c60e9d772f..c60e9d772f 100644
--- a/ghc/rts/gmp/missing
+++ b/rts/gmp/missing
diff --git a/ghc/rts/gmp/mkinstalldirs b/rts/gmp/mkinstalldirs
index 5e17cd39fb..5e17cd39fb 100644
--- a/ghc/rts/gmp/mkinstalldirs
+++ b/rts/gmp/mkinstalldirs
diff --git a/ghc/rts/gmp/mp.h b/rts/gmp/mp.h
index ffab4cba82..ffab4cba82 100644
--- a/ghc/rts/gmp/mp.h
+++ b/rts/gmp/mp.h
diff --git a/ghc/rts/gmp/mp_bpl.c b/rts/gmp/mp_bpl.c
index df8b03e5ab..df8b03e5ab 100644
--- a/ghc/rts/gmp/mp_bpl.c
+++ b/rts/gmp/mp_bpl.c
diff --git a/ghc/rts/gmp/mp_clz_tab.c b/rts/gmp/mp_clz_tab.c
index 1bbd1d6a66..1bbd1d6a66 100644
--- a/ghc/rts/gmp/mp_clz_tab.c
+++ b/rts/gmp/mp_clz_tab.c
diff --git a/ghc/rts/gmp/mp_minv_tab.c b/rts/gmp/mp_minv_tab.c
index 4afff85cfc..4afff85cfc 100644
--- a/ghc/rts/gmp/mp_minv_tab.c
+++ b/rts/gmp/mp_minv_tab.c
diff --git a/ghc/rts/gmp/mp_set_fns.c b/rts/gmp/mp_set_fns.c
index 55d4d9d6e4..55d4d9d6e4 100644
--- a/ghc/rts/gmp/mp_set_fns.c
+++ b/rts/gmp/mp_set_fns.c
diff --git a/ghc/rts/gmp/mpn/Makefile.am b/rts/gmp/mpn/Makefile.am
index 1c49ccda25..1c49ccda25 100644
--- a/ghc/rts/gmp/mpn/Makefile.am
+++ b/rts/gmp/mpn/Makefile.am
diff --git a/ghc/rts/gmp/mpn/Makefile.in b/rts/gmp/mpn/Makefile.in
index 59ee958c92..59ee958c92 100644
--- a/ghc/rts/gmp/mpn/Makefile.in
+++ b/rts/gmp/mpn/Makefile.in
diff --git a/ghc/rts/gmp/mpn/README b/rts/gmp/mpn/README
index 7453c9d03e..7453c9d03e 100644
--- a/ghc/rts/gmp/mpn/README
+++ b/rts/gmp/mpn/README
diff --git a/ghc/rts/gmp/mpn/a29k/add_n.s b/rts/gmp/mpn/a29k/add_n.s
index e3ee6dfa60..e3ee6dfa60 100644
--- a/ghc/rts/gmp/mpn/a29k/add_n.s
+++ b/rts/gmp/mpn/a29k/add_n.s
diff --git a/ghc/rts/gmp/mpn/a29k/addmul_1.s b/rts/gmp/mpn/a29k/addmul_1.s
index f51b6d7af6..f51b6d7af6 100644
--- a/ghc/rts/gmp/mpn/a29k/addmul_1.s
+++ b/rts/gmp/mpn/a29k/addmul_1.s
diff --git a/ghc/rts/gmp/mpn/a29k/lshift.s b/rts/gmp/mpn/a29k/lshift.s
index 93e1917127..93e1917127 100644
--- a/ghc/rts/gmp/mpn/a29k/lshift.s
+++ b/rts/gmp/mpn/a29k/lshift.s
diff --git a/ghc/rts/gmp/mpn/a29k/mul_1.s b/rts/gmp/mpn/a29k/mul_1.s
index 6bcf7ce0cf..6bcf7ce0cf 100644
--- a/ghc/rts/gmp/mpn/a29k/mul_1.s
+++ b/rts/gmp/mpn/a29k/mul_1.s
diff --git a/ghc/rts/gmp/mpn/a29k/rshift.s b/rts/gmp/mpn/a29k/rshift.s
index ea163bff2b..ea163bff2b 100644
--- a/ghc/rts/gmp/mpn/a29k/rshift.s
+++ b/rts/gmp/mpn/a29k/rshift.s
diff --git a/ghc/rts/gmp/mpn/a29k/sub_n.s b/rts/gmp/mpn/a29k/sub_n.s
index c6b64c5bee..c6b64c5bee 100644
--- a/ghc/rts/gmp/mpn/a29k/sub_n.s
+++ b/rts/gmp/mpn/a29k/sub_n.s
diff --git a/ghc/rts/gmp/mpn/a29k/submul_1.s b/rts/gmp/mpn/a29k/submul_1.s
index ef97d8d4e5..ef97d8d4e5 100644
--- a/ghc/rts/gmp/mpn/a29k/submul_1.s
+++ b/rts/gmp/mpn/a29k/submul_1.s
diff --git a/ghc/rts/gmp/mpn/a29k/udiv.s b/rts/gmp/mpn/a29k/udiv.s
index fdd53a9a88..fdd53a9a88 100644
--- a/ghc/rts/gmp/mpn/a29k/udiv.s
+++ b/rts/gmp/mpn/a29k/udiv.s
diff --git a/ghc/rts/gmp/mpn/a29k/umul.s b/rts/gmp/mpn/a29k/umul.s
index 7741981167..7741981167 100644
--- a/ghc/rts/gmp/mpn/a29k/umul.s
+++ b/rts/gmp/mpn/a29k/umul.s
diff --git a/ghc/rts/gmp/mpn/alpha/README b/rts/gmp/mpn/alpha/README
index 744260c7c5..744260c7c5 100644
--- a/ghc/rts/gmp/mpn/alpha/README
+++ b/rts/gmp/mpn/alpha/README
diff --git a/ghc/rts/gmp/mpn/alpha/add_n.asm b/rts/gmp/mpn/alpha/add_n.asm
index 08d6a9f7b8..08d6a9f7b8 100644
--- a/ghc/rts/gmp/mpn/alpha/add_n.asm
+++ b/rts/gmp/mpn/alpha/add_n.asm
diff --git a/ghc/rts/gmp/mpn/alpha/addmul_1.asm b/rts/gmp/mpn/alpha/addmul_1.asm
index 4ea900be6b..4ea900be6b 100644
--- a/ghc/rts/gmp/mpn/alpha/addmul_1.asm
+++ b/rts/gmp/mpn/alpha/addmul_1.asm
diff --git a/ghc/rts/gmp/mpn/alpha/cntlz.asm b/rts/gmp/mpn/alpha/cntlz.asm
index febb3b70d9..febb3b70d9 100644
--- a/ghc/rts/gmp/mpn/alpha/cntlz.asm
+++ b/rts/gmp/mpn/alpha/cntlz.asm
diff --git a/ghc/rts/gmp/mpn/alpha/default.m4 b/rts/gmp/mpn/alpha/default.m4
index 5f4c48dc73..5f4c48dc73 100644
--- a/ghc/rts/gmp/mpn/alpha/default.m4
+++ b/rts/gmp/mpn/alpha/default.m4
diff --git a/ghc/rts/gmp/mpn/alpha/ev5/add_n.asm b/rts/gmp/mpn/alpha/ev5/add_n.asm
index 716d6404ae..716d6404ae 100644
--- a/ghc/rts/gmp/mpn/alpha/ev5/add_n.asm
+++ b/rts/gmp/mpn/alpha/ev5/add_n.asm
diff --git a/ghc/rts/gmp/mpn/alpha/ev5/lshift.asm b/rts/gmp/mpn/alpha/ev5/lshift.asm
index cb181dda66..cb181dda66 100644
--- a/ghc/rts/gmp/mpn/alpha/ev5/lshift.asm
+++ b/rts/gmp/mpn/alpha/ev5/lshift.asm
diff --git a/ghc/rts/gmp/mpn/alpha/ev5/rshift.asm b/rts/gmp/mpn/alpha/ev5/rshift.asm
index 9940d83fad..9940d83fad 100644
--- a/ghc/rts/gmp/mpn/alpha/ev5/rshift.asm
+++ b/rts/gmp/mpn/alpha/ev5/rshift.asm
diff --git a/ghc/rts/gmp/mpn/alpha/ev5/sub_n.asm b/rts/gmp/mpn/alpha/ev5/sub_n.asm
index 5248a2aa38..5248a2aa38 100644
--- a/ghc/rts/gmp/mpn/alpha/ev5/sub_n.asm
+++ b/rts/gmp/mpn/alpha/ev5/sub_n.asm
diff --git a/ghc/rts/gmp/mpn/alpha/ev6/addmul_1.asm b/rts/gmp/mpn/alpha/ev6/addmul_1.asm
index 2f588626a5..2f588626a5 100644
--- a/ghc/rts/gmp/mpn/alpha/ev6/addmul_1.asm
+++ b/rts/gmp/mpn/alpha/ev6/addmul_1.asm
diff --git a/ghc/rts/gmp/mpn/alpha/ev6/gmp-mparam.h b/rts/gmp/mpn/alpha/ev6/gmp-mparam.h
index 7ea20577f8..7ea20577f8 100644
--- a/ghc/rts/gmp/mpn/alpha/ev6/gmp-mparam.h
+++ b/rts/gmp/mpn/alpha/ev6/gmp-mparam.h
diff --git a/ghc/rts/gmp/mpn/alpha/gmp-mparam.h b/rts/gmp/mpn/alpha/gmp-mparam.h
index 054ff2fe5f..054ff2fe5f 100644
--- a/ghc/rts/gmp/mpn/alpha/gmp-mparam.h
+++ b/rts/gmp/mpn/alpha/gmp-mparam.h
diff --git a/ghc/rts/gmp/mpn/alpha/invert_limb.asm b/rts/gmp/mpn/alpha/invert_limb.asm
index a921b32b3f..a921b32b3f 100644
--- a/ghc/rts/gmp/mpn/alpha/invert_limb.asm
+++ b/rts/gmp/mpn/alpha/invert_limb.asm
diff --git a/ghc/rts/gmp/mpn/alpha/lshift.asm b/rts/gmp/mpn/alpha/lshift.asm
index 87c46f6fe7..87c46f6fe7 100644
--- a/ghc/rts/gmp/mpn/alpha/lshift.asm
+++ b/rts/gmp/mpn/alpha/lshift.asm
diff --git a/ghc/rts/gmp/mpn/alpha/mul_1.asm b/rts/gmp/mpn/alpha/mul_1.asm
index 46b8df34f5..46b8df34f5 100644
--- a/ghc/rts/gmp/mpn/alpha/mul_1.asm
+++ b/rts/gmp/mpn/alpha/mul_1.asm
diff --git a/ghc/rts/gmp/mpn/alpha/rshift.asm b/rts/gmp/mpn/alpha/rshift.asm
index aa25eda54e..aa25eda54e 100644
--- a/ghc/rts/gmp/mpn/alpha/rshift.asm
+++ b/rts/gmp/mpn/alpha/rshift.asm
diff --git a/ghc/rts/gmp/mpn/alpha/sub_n.asm b/rts/gmp/mpn/alpha/sub_n.asm
index 718f657141..718f657141 100644
--- a/ghc/rts/gmp/mpn/alpha/sub_n.asm
+++ b/rts/gmp/mpn/alpha/sub_n.asm
diff --git a/ghc/rts/gmp/mpn/alpha/submul_1.asm b/rts/gmp/mpn/alpha/submul_1.asm
index caec1a720b..caec1a720b 100644
--- a/ghc/rts/gmp/mpn/alpha/submul_1.asm
+++ b/rts/gmp/mpn/alpha/submul_1.asm
diff --git a/ghc/rts/gmp/mpn/alpha/udiv_qrnnd.S b/rts/gmp/mpn/alpha/udiv_qrnnd.S
index 53814bbcb0..53814bbcb0 100644
--- a/ghc/rts/gmp/mpn/alpha/udiv_qrnnd.S
+++ b/rts/gmp/mpn/alpha/udiv_qrnnd.S
diff --git a/ghc/rts/gmp/mpn/alpha/umul.asm b/rts/gmp/mpn/alpha/umul.asm
index 44428ed5f5..44428ed5f5 100644
--- a/ghc/rts/gmp/mpn/alpha/umul.asm
+++ b/rts/gmp/mpn/alpha/umul.asm
diff --git a/ghc/rts/gmp/mpn/alpha/unicos.m4 b/rts/gmp/mpn/alpha/unicos.m4
index 7ff26c090c..7ff26c090c 100644
--- a/ghc/rts/gmp/mpn/alpha/unicos.m4
+++ b/rts/gmp/mpn/alpha/unicos.m4
diff --git a/ghc/rts/gmp/mpn/arm/add_n.S b/rts/gmp/mpn/arm/add_n.S
index fb3f8f703b..fb3f8f703b 100644
--- a/ghc/rts/gmp/mpn/arm/add_n.S
+++ b/rts/gmp/mpn/arm/add_n.S
diff --git a/ghc/rts/gmp/mpn/arm/addmul_1.S b/rts/gmp/mpn/arm/addmul_1.S
index 396fff77a3..396fff77a3 100644
--- a/ghc/rts/gmp/mpn/arm/addmul_1.S
+++ b/rts/gmp/mpn/arm/addmul_1.S
diff --git a/ghc/rts/gmp/mpn/arm/gmp-mparam.h b/rts/gmp/mpn/arm/gmp-mparam.h
index a35b0c7b66..a35b0c7b66 100644
--- a/ghc/rts/gmp/mpn/arm/gmp-mparam.h
+++ b/rts/gmp/mpn/arm/gmp-mparam.h
diff --git a/ghc/rts/gmp/mpn/arm/mul_1.S b/rts/gmp/mpn/arm/mul_1.S
index bae526a0f0..bae526a0f0 100644
--- a/ghc/rts/gmp/mpn/arm/mul_1.S
+++ b/rts/gmp/mpn/arm/mul_1.S
diff --git a/ghc/rts/gmp/mpn/arm/sub_n.S b/rts/gmp/mpn/arm/sub_n.S
index 856505fe21..856505fe21 100644
--- a/ghc/rts/gmp/mpn/arm/sub_n.S
+++ b/rts/gmp/mpn/arm/sub_n.S
diff --git a/ghc/rts/gmp/mpn/asm-defs.m4 b/rts/gmp/mpn/asm-defs.m4
index aa2024138b..aa2024138b 100644
--- a/ghc/rts/gmp/mpn/asm-defs.m4
+++ b/rts/gmp/mpn/asm-defs.m4
diff --git a/ghc/rts/gmp/mpn/clipper/add_n.s b/rts/gmp/mpn/clipper/add_n.s
index 538a1caed0..538a1caed0 100644
--- a/ghc/rts/gmp/mpn/clipper/add_n.s
+++ b/rts/gmp/mpn/clipper/add_n.s
diff --git a/ghc/rts/gmp/mpn/clipper/mul_1.s b/rts/gmp/mpn/clipper/mul_1.s
index c0c756488c..c0c756488c 100644
--- a/ghc/rts/gmp/mpn/clipper/mul_1.s
+++ b/rts/gmp/mpn/clipper/mul_1.s
diff --git a/ghc/rts/gmp/mpn/clipper/sub_n.s b/rts/gmp/mpn/clipper/sub_n.s
index 44d8797289..44d8797289 100644
--- a/ghc/rts/gmp/mpn/clipper/sub_n.s
+++ b/rts/gmp/mpn/clipper/sub_n.s
diff --git a/ghc/rts/gmp/mpn/cray/README b/rts/gmp/mpn/cray/README
index 8195c67e21..8195c67e21 100644
--- a/ghc/rts/gmp/mpn/cray/README
+++ b/rts/gmp/mpn/cray/README
diff --git a/ghc/rts/gmp/mpn/cray/add_n.c b/rts/gmp/mpn/cray/add_n.c
index 1fdb394993..1fdb394993 100644
--- a/ghc/rts/gmp/mpn/cray/add_n.c
+++ b/rts/gmp/mpn/cray/add_n.c
diff --git a/ghc/rts/gmp/mpn/cray/addmul_1.c b/rts/gmp/mpn/cray/addmul_1.c
index 031b4e8e8d..031b4e8e8d 100644
--- a/ghc/rts/gmp/mpn/cray/addmul_1.c
+++ b/rts/gmp/mpn/cray/addmul_1.c
diff --git a/ghc/rts/gmp/mpn/cray/gmp-mparam.h b/rts/gmp/mpn/cray/gmp-mparam.h
index 14f7b8e05b..14f7b8e05b 100644
--- a/ghc/rts/gmp/mpn/cray/gmp-mparam.h
+++ b/rts/gmp/mpn/cray/gmp-mparam.h
diff --git a/ghc/rts/gmp/mpn/cray/mul_1.c b/rts/gmp/mpn/cray/mul_1.c
index 0c8750b4ac..0c8750b4ac 100644
--- a/ghc/rts/gmp/mpn/cray/mul_1.c
+++ b/rts/gmp/mpn/cray/mul_1.c
diff --git a/ghc/rts/gmp/mpn/cray/mulww.f b/rts/gmp/mpn/cray/mulww.f
index 99507c1e44..99507c1e44 100644
--- a/ghc/rts/gmp/mpn/cray/mulww.f
+++ b/rts/gmp/mpn/cray/mulww.f
diff --git a/ghc/rts/gmp/mpn/cray/mulww.s b/rts/gmp/mpn/cray/mulww.s
index 890cdcf94d..890cdcf94d 100644
--- a/ghc/rts/gmp/mpn/cray/mulww.s
+++ b/rts/gmp/mpn/cray/mulww.s
diff --git a/ghc/rts/gmp/mpn/cray/sub_n.c b/rts/gmp/mpn/cray/sub_n.c
index 902e07a727..902e07a727 100644
--- a/ghc/rts/gmp/mpn/cray/sub_n.c
+++ b/rts/gmp/mpn/cray/sub_n.c
diff --git a/ghc/rts/gmp/mpn/cray/submul_1.c b/rts/gmp/mpn/cray/submul_1.c
index 4d2fb13c62..4d2fb13c62 100644
--- a/ghc/rts/gmp/mpn/cray/submul_1.c
+++ b/rts/gmp/mpn/cray/submul_1.c
diff --git a/ghc/rts/gmp/mpn/generic/add_n.c b/rts/gmp/mpn/generic/add_n.c
index 5fcb7e4835..5fcb7e4835 100644
--- a/ghc/rts/gmp/mpn/generic/add_n.c
+++ b/rts/gmp/mpn/generic/add_n.c
diff --git a/ghc/rts/gmp/mpn/generic/addmul_1.c b/rts/gmp/mpn/generic/addmul_1.c
index 746ae31307..746ae31307 100644
--- a/ghc/rts/gmp/mpn/generic/addmul_1.c
+++ b/rts/gmp/mpn/generic/addmul_1.c
diff --git a/ghc/rts/gmp/mpn/generic/addsub_n.c b/rts/gmp/mpn/generic/addsub_n.c
index c9bab3ef60..c9bab3ef60 100644
--- a/ghc/rts/gmp/mpn/generic/addsub_n.c
+++ b/rts/gmp/mpn/generic/addsub_n.c
diff --git a/ghc/rts/gmp/mpn/generic/bdivmod.c b/rts/gmp/mpn/generic/bdivmod.c
index c4bcb414e6..c4bcb414e6 100644
--- a/ghc/rts/gmp/mpn/generic/bdivmod.c
+++ b/rts/gmp/mpn/generic/bdivmod.c
diff --git a/ghc/rts/gmp/mpn/generic/bz_divrem_n.c b/rts/gmp/mpn/generic/bz_divrem_n.c
index d234b22af5..d234b22af5 100644
--- a/ghc/rts/gmp/mpn/generic/bz_divrem_n.c
+++ b/rts/gmp/mpn/generic/bz_divrem_n.c
diff --git a/ghc/rts/gmp/mpn/generic/cmp.c b/rts/gmp/mpn/generic/cmp.c
index 8e9792f54e..8e9792f54e 100644
--- a/ghc/rts/gmp/mpn/generic/cmp.c
+++ b/rts/gmp/mpn/generic/cmp.c
diff --git a/ghc/rts/gmp/mpn/generic/diveby3.c b/rts/gmp/mpn/generic/diveby3.c
index a2fb552bfa..a2fb552bfa 100644
--- a/ghc/rts/gmp/mpn/generic/diveby3.c
+++ b/rts/gmp/mpn/generic/diveby3.c
diff --git a/ghc/rts/gmp/mpn/generic/divrem.c b/rts/gmp/mpn/generic/divrem.c
index 30673e76d9..30673e76d9 100644
--- a/ghc/rts/gmp/mpn/generic/divrem.c
+++ b/rts/gmp/mpn/generic/divrem.c
diff --git a/ghc/rts/gmp/mpn/generic/divrem_1.c b/rts/gmp/mpn/generic/divrem_1.c
index e93f241c9d..e93f241c9d 100644
--- a/ghc/rts/gmp/mpn/generic/divrem_1.c
+++ b/rts/gmp/mpn/generic/divrem_1.c
diff --git a/ghc/rts/gmp/mpn/generic/divrem_2.c b/rts/gmp/mpn/generic/divrem_2.c
index 0bc31ae2e7..0bc31ae2e7 100644
--- a/ghc/rts/gmp/mpn/generic/divrem_2.c
+++ b/rts/gmp/mpn/generic/divrem_2.c
diff --git a/ghc/rts/gmp/mpn/generic/dump.c b/rts/gmp/mpn/generic/dump.c
index 66f375c74b..66f375c74b 100644
--- a/ghc/rts/gmp/mpn/generic/dump.c
+++ b/rts/gmp/mpn/generic/dump.c
diff --git a/ghc/rts/gmp/mpn/generic/gcd.c b/rts/gmp/mpn/generic/gcd.c
index 059e219a06..059e219a06 100644
--- a/ghc/rts/gmp/mpn/generic/gcd.c
+++ b/rts/gmp/mpn/generic/gcd.c
diff --git a/ghc/rts/gmp/mpn/generic/gcd_1.c b/rts/gmp/mpn/generic/gcd_1.c
index 1832636636..1832636636 100644
--- a/ghc/rts/gmp/mpn/generic/gcd_1.c
+++ b/rts/gmp/mpn/generic/gcd_1.c
diff --git a/ghc/rts/gmp/mpn/generic/gcdext.c b/rts/gmp/mpn/generic/gcdext.c
index fe22d779a6..fe22d779a6 100644
--- a/ghc/rts/gmp/mpn/generic/gcdext.c
+++ b/rts/gmp/mpn/generic/gcdext.c
diff --git a/ghc/rts/gmp/mpn/generic/get_str.c b/rts/gmp/mpn/generic/get_str.c
index a713b61825..a713b61825 100644
--- a/ghc/rts/gmp/mpn/generic/get_str.c
+++ b/rts/gmp/mpn/generic/get_str.c
diff --git a/ghc/rts/gmp/mpn/generic/gmp-mparam.h b/rts/gmp/mpn/generic/gmp-mparam.h
index 14bcaece83..14bcaece83 100644
--- a/ghc/rts/gmp/mpn/generic/gmp-mparam.h
+++ b/rts/gmp/mpn/generic/gmp-mparam.h
diff --git a/ghc/rts/gmp/mpn/generic/hamdist.c b/rts/gmp/mpn/generic/hamdist.c
index 35c10e8450..35c10e8450 100644
--- a/ghc/rts/gmp/mpn/generic/hamdist.c
+++ b/rts/gmp/mpn/generic/hamdist.c
diff --git a/ghc/rts/gmp/mpn/generic/inlines.c b/rts/gmp/mpn/generic/inlines.c
index 9487e58cf2..9487e58cf2 100644
--- a/ghc/rts/gmp/mpn/generic/inlines.c
+++ b/rts/gmp/mpn/generic/inlines.c
diff --git a/ghc/rts/gmp/mpn/generic/jacbase.c b/rts/gmp/mpn/generic/jacbase.c
index dd437f1ac1..dd437f1ac1 100644
--- a/ghc/rts/gmp/mpn/generic/jacbase.c
+++ b/rts/gmp/mpn/generic/jacbase.c
diff --git a/ghc/rts/gmp/mpn/generic/lshift.c b/rts/gmp/mpn/generic/lshift.c
index 0b58389658..0b58389658 100644
--- a/ghc/rts/gmp/mpn/generic/lshift.c
+++ b/rts/gmp/mpn/generic/lshift.c
diff --git a/ghc/rts/gmp/mpn/generic/mod_1.c b/rts/gmp/mpn/generic/mod_1.c
index 168ec9df49..168ec9df49 100644
--- a/ghc/rts/gmp/mpn/generic/mod_1.c
+++ b/rts/gmp/mpn/generic/mod_1.c
diff --git a/ghc/rts/gmp/mpn/generic/mod_1_rs.c b/rts/gmp/mpn/generic/mod_1_rs.c
index 62aaa94b92..62aaa94b92 100644
--- a/ghc/rts/gmp/mpn/generic/mod_1_rs.c
+++ b/rts/gmp/mpn/generic/mod_1_rs.c
diff --git a/ghc/rts/gmp/mpn/generic/mul.c b/rts/gmp/mpn/generic/mul.c
index cecfa19ca1..cecfa19ca1 100644
--- a/ghc/rts/gmp/mpn/generic/mul.c
+++ b/rts/gmp/mpn/generic/mul.c
diff --git a/ghc/rts/gmp/mpn/generic/mul_1.c b/rts/gmp/mpn/generic/mul_1.c
index 1c36b5fb1f..1c36b5fb1f 100644
--- a/ghc/rts/gmp/mpn/generic/mul_1.c
+++ b/rts/gmp/mpn/generic/mul_1.c
diff --git a/ghc/rts/gmp/mpn/generic/mul_basecase.c b/rts/gmp/mpn/generic/mul_basecase.c
index 00c06aa5c4..00c06aa5c4 100644
--- a/ghc/rts/gmp/mpn/generic/mul_basecase.c
+++ b/rts/gmp/mpn/generic/mul_basecase.c
diff --git a/ghc/rts/gmp/mpn/generic/mul_fft.c b/rts/gmp/mpn/generic/mul_fft.c
index 00fd6d72de..00fd6d72de 100644
--- a/ghc/rts/gmp/mpn/generic/mul_fft.c
+++ b/rts/gmp/mpn/generic/mul_fft.c
diff --git a/ghc/rts/gmp/mpn/generic/mul_n.c b/rts/gmp/mpn/generic/mul_n.c
index b7563be2d3..b7563be2d3 100644
--- a/ghc/rts/gmp/mpn/generic/mul_n.c
+++ b/rts/gmp/mpn/generic/mul_n.c
diff --git a/ghc/rts/gmp/mpn/generic/perfsqr.c b/rts/gmp/mpn/generic/perfsqr.c
index 42ee3405d7..42ee3405d7 100644
--- a/ghc/rts/gmp/mpn/generic/perfsqr.c
+++ b/rts/gmp/mpn/generic/perfsqr.c
diff --git a/ghc/rts/gmp/mpn/generic/popcount.c b/rts/gmp/mpn/generic/popcount.c
index 387be9536d..387be9536d 100644
--- a/ghc/rts/gmp/mpn/generic/popcount.c
+++ b/rts/gmp/mpn/generic/popcount.c
diff --git a/ghc/rts/gmp/mpn/generic/pre_mod_1.c b/rts/gmp/mpn/generic/pre_mod_1.c
index 27179683b3..27179683b3 100644
--- a/ghc/rts/gmp/mpn/generic/pre_mod_1.c
+++ b/rts/gmp/mpn/generic/pre_mod_1.c
diff --git a/ghc/rts/gmp/mpn/generic/random.c b/rts/gmp/mpn/generic/random.c
index dea4e20e56..dea4e20e56 100644
--- a/ghc/rts/gmp/mpn/generic/random.c
+++ b/rts/gmp/mpn/generic/random.c
diff --git a/ghc/rts/gmp/mpn/generic/random2.c b/rts/gmp/mpn/generic/random2.c
index 86682f81fa..86682f81fa 100644
--- a/ghc/rts/gmp/mpn/generic/random2.c
+++ b/rts/gmp/mpn/generic/random2.c
diff --git a/ghc/rts/gmp/mpn/generic/rshift.c b/rts/gmp/mpn/generic/rshift.c
index 59caf73529..59caf73529 100644
--- a/ghc/rts/gmp/mpn/generic/rshift.c
+++ b/rts/gmp/mpn/generic/rshift.c
diff --git a/ghc/rts/gmp/mpn/generic/sb_divrem_mn.c b/rts/gmp/mpn/generic/sb_divrem_mn.c
index a269e34f5f..a269e34f5f 100644
--- a/ghc/rts/gmp/mpn/generic/sb_divrem_mn.c
+++ b/rts/gmp/mpn/generic/sb_divrem_mn.c
diff --git a/ghc/rts/gmp/mpn/generic/scan0.c b/rts/gmp/mpn/generic/scan0.c
index 96f05ce854..96f05ce854 100644
--- a/ghc/rts/gmp/mpn/generic/scan0.c
+++ b/rts/gmp/mpn/generic/scan0.c
diff --git a/ghc/rts/gmp/mpn/generic/scan1.c b/rts/gmp/mpn/generic/scan1.c
index 98e2e0dcc0..98e2e0dcc0 100644
--- a/ghc/rts/gmp/mpn/generic/scan1.c
+++ b/rts/gmp/mpn/generic/scan1.c
diff --git a/ghc/rts/gmp/mpn/generic/set_str.c b/rts/gmp/mpn/generic/set_str.c
index e6ccc92154..e6ccc92154 100644
--- a/ghc/rts/gmp/mpn/generic/set_str.c
+++ b/rts/gmp/mpn/generic/set_str.c
diff --git a/ghc/rts/gmp/mpn/generic/sqr_basecase.c b/rts/gmp/mpn/generic/sqr_basecase.c
index 760258a3e0..760258a3e0 100644
--- a/ghc/rts/gmp/mpn/generic/sqr_basecase.c
+++ b/rts/gmp/mpn/generic/sqr_basecase.c
diff --git a/ghc/rts/gmp/mpn/generic/sqrtrem.c b/rts/gmp/mpn/generic/sqrtrem.c
index ee3b5144dd..ee3b5144dd 100644
--- a/ghc/rts/gmp/mpn/generic/sqrtrem.c
+++ b/rts/gmp/mpn/generic/sqrtrem.c
diff --git a/ghc/rts/gmp/mpn/generic/sub_n.c b/rts/gmp/mpn/generic/sub_n.c
index 4f2f06099c..4f2f06099c 100644
--- a/ghc/rts/gmp/mpn/generic/sub_n.c
+++ b/rts/gmp/mpn/generic/sub_n.c
diff --git a/ghc/rts/gmp/mpn/generic/submul_1.c b/rts/gmp/mpn/generic/submul_1.c
index c7c08ee4af..c7c08ee4af 100644
--- a/ghc/rts/gmp/mpn/generic/submul_1.c
+++ b/rts/gmp/mpn/generic/submul_1.c
diff --git a/ghc/rts/gmp/mpn/generic/tdiv_qr.c b/rts/gmp/mpn/generic/tdiv_qr.c
index b748b5d810..b748b5d810 100644
--- a/ghc/rts/gmp/mpn/generic/tdiv_qr.c
+++ b/rts/gmp/mpn/generic/tdiv_qr.c
diff --git a/ghc/rts/gmp/mpn/generic/udiv_w_sdiv.c b/rts/gmp/mpn/generic/udiv_w_sdiv.c
index 061cce86e1..061cce86e1 100644
--- a/ghc/rts/gmp/mpn/generic/udiv_w_sdiv.c
+++ b/rts/gmp/mpn/generic/udiv_w_sdiv.c
diff --git a/ghc/rts/gmp/mpn/hppa/README b/rts/gmp/mpn/hppa/README
index 97e7abe011..97e7abe011 100644
--- a/ghc/rts/gmp/mpn/hppa/README
+++ b/rts/gmp/mpn/hppa/README
diff --git a/ghc/rts/gmp/mpn/hppa/add_n.s b/rts/gmp/mpn/hppa/add_n.s
index c53b2f71b3..c53b2f71b3 100644
--- a/ghc/rts/gmp/mpn/hppa/add_n.s
+++ b/rts/gmp/mpn/hppa/add_n.s
diff --git a/ghc/rts/gmp/mpn/hppa/gmp-mparam.h b/rts/gmp/mpn/hppa/gmp-mparam.h
index 98b6d9ce3c..98b6d9ce3c 100644
--- a/ghc/rts/gmp/mpn/hppa/gmp-mparam.h
+++ b/rts/gmp/mpn/hppa/gmp-mparam.h
diff --git a/ghc/rts/gmp/mpn/hppa/hppa1_1/addmul_1.s b/rts/gmp/mpn/hppa/hppa1_1/addmul_1.s
index c7d218f922..c7d218f922 100644
--- a/ghc/rts/gmp/mpn/hppa/hppa1_1/addmul_1.s
+++ b/rts/gmp/mpn/hppa/hppa1_1/addmul_1.s
diff --git a/ghc/rts/gmp/mpn/hppa/hppa1_1/mul_1.s b/rts/gmp/mpn/hppa/hppa1_1/mul_1.s
index 4512fddec9..4512fddec9 100644
--- a/ghc/rts/gmp/mpn/hppa/hppa1_1/mul_1.s
+++ b/rts/gmp/mpn/hppa/hppa1_1/mul_1.s
diff --git a/ghc/rts/gmp/mpn/hppa/hppa1_1/pa7100/add_n.s b/rts/gmp/mpn/hppa/hppa1_1/pa7100/add_n.s
index 4f4be08b37..4f4be08b37 100644
--- a/ghc/rts/gmp/mpn/hppa/hppa1_1/pa7100/add_n.s
+++ b/rts/gmp/mpn/hppa/hppa1_1/pa7100/add_n.s
diff --git a/ghc/rts/gmp/mpn/hppa/hppa1_1/pa7100/addmul_1.S b/rts/gmp/mpn/hppa/hppa1_1/pa7100/addmul_1.S
index 04db06822e..04db06822e 100644
--- a/ghc/rts/gmp/mpn/hppa/hppa1_1/pa7100/addmul_1.S
+++ b/rts/gmp/mpn/hppa/hppa1_1/pa7100/addmul_1.S
diff --git a/ghc/rts/gmp/mpn/hppa/hppa1_1/pa7100/lshift.s b/rts/gmp/mpn/hppa/hppa1_1/pa7100/lshift.s
index 31669b1a55..31669b1a55 100644
--- a/ghc/rts/gmp/mpn/hppa/hppa1_1/pa7100/lshift.s
+++ b/rts/gmp/mpn/hppa/hppa1_1/pa7100/lshift.s
diff --git a/ghc/rts/gmp/mpn/hppa/hppa1_1/pa7100/rshift.s b/rts/gmp/mpn/hppa/hppa1_1/pa7100/rshift.s
index d32b10b4b1..d32b10b4b1 100644
--- a/ghc/rts/gmp/mpn/hppa/hppa1_1/pa7100/rshift.s
+++ b/rts/gmp/mpn/hppa/hppa1_1/pa7100/rshift.s
diff --git a/ghc/rts/gmp/mpn/hppa/hppa1_1/pa7100/sub_n.s b/rts/gmp/mpn/hppa/hppa1_1/pa7100/sub_n.s
index 0eec41c4b3..0eec41c4b3 100644
--- a/ghc/rts/gmp/mpn/hppa/hppa1_1/pa7100/sub_n.s
+++ b/rts/gmp/mpn/hppa/hppa1_1/pa7100/sub_n.s
diff --git a/ghc/rts/gmp/mpn/hppa/hppa1_1/pa7100/submul_1.S b/rts/gmp/mpn/hppa/hppa1_1/pa7100/submul_1.S
index 0fba21dcef..0fba21dcef 100644
--- a/ghc/rts/gmp/mpn/hppa/hppa1_1/pa7100/submul_1.S
+++ b/rts/gmp/mpn/hppa/hppa1_1/pa7100/submul_1.S
diff --git a/ghc/rts/gmp/mpn/hppa/hppa1_1/submul_1.s b/rts/gmp/mpn/hppa/hppa1_1/submul_1.s
index 20a5b5ce0a..20a5b5ce0a 100644
--- a/ghc/rts/gmp/mpn/hppa/hppa1_1/submul_1.s
+++ b/rts/gmp/mpn/hppa/hppa1_1/submul_1.s
diff --git a/ghc/rts/gmp/mpn/hppa/hppa1_1/udiv_qrnnd.S b/rts/gmp/mpn/hppa/hppa1_1/udiv_qrnnd.S
index b83d6f4dd2..b83d6f4dd2 100644
--- a/ghc/rts/gmp/mpn/hppa/hppa1_1/udiv_qrnnd.S
+++ b/rts/gmp/mpn/hppa/hppa1_1/udiv_qrnnd.S
diff --git a/ghc/rts/gmp/mpn/hppa/hppa1_1/umul.s b/rts/gmp/mpn/hppa/hppa1_1/umul.s
index 1f1300ac9b..1f1300ac9b 100644
--- a/ghc/rts/gmp/mpn/hppa/hppa1_1/umul.s
+++ b/rts/gmp/mpn/hppa/hppa1_1/umul.s
diff --git a/ghc/rts/gmp/mpn/hppa/hppa2_0/add_n.s b/rts/gmp/mpn/hppa/hppa2_0/add_n.s
index 6e97278a39..6e97278a39 100644
--- a/ghc/rts/gmp/mpn/hppa/hppa2_0/add_n.s
+++ b/rts/gmp/mpn/hppa/hppa2_0/add_n.s
diff --git a/ghc/rts/gmp/mpn/hppa/hppa2_0/sub_n.s b/rts/gmp/mpn/hppa/hppa2_0/sub_n.s
index 7d9b50fc27..7d9b50fc27 100644
--- a/ghc/rts/gmp/mpn/hppa/hppa2_0/sub_n.s
+++ b/rts/gmp/mpn/hppa/hppa2_0/sub_n.s
diff --git a/ghc/rts/gmp/mpn/hppa/lshift.s b/rts/gmp/mpn/hppa/lshift.s
index f5a2daad60..f5a2daad60 100644
--- a/ghc/rts/gmp/mpn/hppa/lshift.s
+++ b/rts/gmp/mpn/hppa/lshift.s
diff --git a/ghc/rts/gmp/mpn/hppa/rshift.s b/rts/gmp/mpn/hppa/rshift.s
index e05e2f10b5..e05e2f10b5 100644
--- a/ghc/rts/gmp/mpn/hppa/rshift.s
+++ b/rts/gmp/mpn/hppa/rshift.s
diff --git a/ghc/rts/gmp/mpn/hppa/sub_n.s b/rts/gmp/mpn/hppa/sub_n.s
index 8f770ad1ad..8f770ad1ad 100644
--- a/ghc/rts/gmp/mpn/hppa/sub_n.s
+++ b/rts/gmp/mpn/hppa/sub_n.s
diff --git a/ghc/rts/gmp/mpn/hppa/udiv_qrnnd.s b/rts/gmp/mpn/hppa/udiv_qrnnd.s
index 9aa3b8a830..9aa3b8a830 100644
--- a/ghc/rts/gmp/mpn/hppa/udiv_qrnnd.s
+++ b/rts/gmp/mpn/hppa/udiv_qrnnd.s
diff --git a/ghc/rts/gmp/mpn/i960/README b/rts/gmp/mpn/i960/README
index d68a0a83eb..d68a0a83eb 100644
--- a/ghc/rts/gmp/mpn/i960/README
+++ b/rts/gmp/mpn/i960/README
diff --git a/ghc/rts/gmp/mpn/i960/add_n.s b/rts/gmp/mpn/i960/add_n.s
index 387317a397..387317a397 100644
--- a/ghc/rts/gmp/mpn/i960/add_n.s
+++ b/rts/gmp/mpn/i960/add_n.s
diff --git a/ghc/rts/gmp/mpn/i960/addmul_1.s b/rts/gmp/mpn/i960/addmul_1.s
index 7df1418356..7df1418356 100644
--- a/ghc/rts/gmp/mpn/i960/addmul_1.s
+++ b/rts/gmp/mpn/i960/addmul_1.s
diff --git a/ghc/rts/gmp/mpn/i960/mul_1.s b/rts/gmp/mpn/i960/mul_1.s
index 5c0c985aa5..5c0c985aa5 100644
--- a/ghc/rts/gmp/mpn/i960/mul_1.s
+++ b/rts/gmp/mpn/i960/mul_1.s
diff --git a/ghc/rts/gmp/mpn/i960/sub_n.s b/rts/gmp/mpn/i960/sub_n.s
index 2db2d46aad..2db2d46aad 100644
--- a/ghc/rts/gmp/mpn/i960/sub_n.s
+++ b/rts/gmp/mpn/i960/sub_n.s
diff --git a/ghc/rts/gmp/mpn/lisp/gmpasm-mode.el b/rts/gmp/mpn/lisp/gmpasm-mode.el
index 5d9da7fa1f..5d9da7fa1f 100644
--- a/ghc/rts/gmp/mpn/lisp/gmpasm-mode.el
+++ b/rts/gmp/mpn/lisp/gmpasm-mode.el
diff --git a/ghc/rts/gmp/mpn/m68k/add_n.S b/rts/gmp/mpn/m68k/add_n.S
index 9e1d89d64f..9e1d89d64f 100644
--- a/ghc/rts/gmp/mpn/m68k/add_n.S
+++ b/rts/gmp/mpn/m68k/add_n.S
diff --git a/ghc/rts/gmp/mpn/m68k/lshift.S b/rts/gmp/mpn/m68k/lshift.S
index a539d5d42e..a539d5d42e 100644
--- a/ghc/rts/gmp/mpn/m68k/lshift.S
+++ b/rts/gmp/mpn/m68k/lshift.S
diff --git a/ghc/rts/gmp/mpn/m68k/mc68020/addmul_1.S b/rts/gmp/mpn/m68k/mc68020/addmul_1.S
index 6638115d71..6638115d71 100644
--- a/ghc/rts/gmp/mpn/m68k/mc68020/addmul_1.S
+++ b/rts/gmp/mpn/m68k/mc68020/addmul_1.S
diff --git a/ghc/rts/gmp/mpn/m68k/mc68020/mul_1.S b/rts/gmp/mpn/m68k/mc68020/mul_1.S
index fdd4c39d70..fdd4c39d70 100644
--- a/ghc/rts/gmp/mpn/m68k/mc68020/mul_1.S
+++ b/rts/gmp/mpn/m68k/mc68020/mul_1.S
diff --git a/ghc/rts/gmp/mpn/m68k/mc68020/submul_1.S b/rts/gmp/mpn/m68k/mc68020/submul_1.S
index 3c36b70166..3c36b70166 100644
--- a/ghc/rts/gmp/mpn/m68k/mc68020/submul_1.S
+++ b/rts/gmp/mpn/m68k/mc68020/submul_1.S
diff --git a/ghc/rts/gmp/mpn/m68k/mc68020/udiv.S b/rts/gmp/mpn/m68k/mc68020/udiv.S
index d00cf13558..d00cf13558 100644
--- a/ghc/rts/gmp/mpn/m68k/mc68020/udiv.S
+++ b/rts/gmp/mpn/m68k/mc68020/udiv.S
diff --git a/ghc/rts/gmp/mpn/m68k/mc68020/umul.S b/rts/gmp/mpn/m68k/mc68020/umul.S
index a34ae6c543..a34ae6c543 100644
--- a/ghc/rts/gmp/mpn/m68k/mc68020/umul.S
+++ b/rts/gmp/mpn/m68k/mc68020/umul.S
diff --git a/ghc/rts/gmp/mpn/m68k/rshift.S b/rts/gmp/mpn/m68k/rshift.S
index b47a48e52a..b47a48e52a 100644
--- a/ghc/rts/gmp/mpn/m68k/rshift.S
+++ b/rts/gmp/mpn/m68k/rshift.S
diff --git a/ghc/rts/gmp/mpn/m68k/sub_n.S b/rts/gmp/mpn/m68k/sub_n.S
index ce45b24db5..ce45b24db5 100644
--- a/ghc/rts/gmp/mpn/m68k/sub_n.S
+++ b/rts/gmp/mpn/m68k/sub_n.S
diff --git a/ghc/rts/gmp/mpn/m68k/syntax.h b/rts/gmp/mpn/m68k/syntax.h
index 9eec279c06..9eec279c06 100644
--- a/ghc/rts/gmp/mpn/m68k/syntax.h
+++ b/rts/gmp/mpn/m68k/syntax.h
diff --git a/ghc/rts/gmp/mpn/m88k/add_n.s b/rts/gmp/mpn/m88k/add_n.s
index 0b776c618a..0b776c618a 100644
--- a/ghc/rts/gmp/mpn/m88k/add_n.s
+++ b/rts/gmp/mpn/m88k/add_n.s
diff --git a/ghc/rts/gmp/mpn/m88k/mc88110/add_n.S b/rts/gmp/mpn/m88k/mc88110/add_n.S
index 843a50dded..843a50dded 100644
--- a/ghc/rts/gmp/mpn/m88k/mc88110/add_n.S
+++ b/rts/gmp/mpn/m88k/mc88110/add_n.S
diff --git a/ghc/rts/gmp/mpn/m88k/mc88110/addmul_1.s b/rts/gmp/mpn/m88k/mc88110/addmul_1.s
index 7d97c87c79..7d97c87c79 100644
--- a/ghc/rts/gmp/mpn/m88k/mc88110/addmul_1.s
+++ b/rts/gmp/mpn/m88k/mc88110/addmul_1.s
diff --git a/ghc/rts/gmp/mpn/m88k/mc88110/mul_1.s b/rts/gmp/mpn/m88k/mc88110/mul_1.s
index b8483afa91..b8483afa91 100644
--- a/ghc/rts/gmp/mpn/m88k/mc88110/mul_1.s
+++ b/rts/gmp/mpn/m88k/mc88110/mul_1.s
diff --git a/ghc/rts/gmp/mpn/m88k/mc88110/sub_n.S b/rts/gmp/mpn/m88k/mc88110/sub_n.S
index 715a3faf25..715a3faf25 100644
--- a/ghc/rts/gmp/mpn/m88k/mc88110/sub_n.S
+++ b/rts/gmp/mpn/m88k/mc88110/sub_n.S
diff --git a/ghc/rts/gmp/mpn/m88k/mul_1.s b/rts/gmp/mpn/m88k/mul_1.s
index 06370837ef..06370837ef 100644
--- a/ghc/rts/gmp/mpn/m88k/mul_1.s
+++ b/rts/gmp/mpn/m88k/mul_1.s
diff --git a/ghc/rts/gmp/mpn/m88k/sub_n.s b/rts/gmp/mpn/m88k/sub_n.s
index 2fd345a135..2fd345a135 100644
--- a/ghc/rts/gmp/mpn/m88k/sub_n.s
+++ b/rts/gmp/mpn/m88k/sub_n.s
diff --git a/ghc/rts/gmp/mpn/mips2/add_n.s b/rts/gmp/mpn/mips2/add_n.s
index 5c3c7fc8a1..5c3c7fc8a1 100644
--- a/ghc/rts/gmp/mpn/mips2/add_n.s
+++ b/rts/gmp/mpn/mips2/add_n.s
diff --git a/ghc/rts/gmp/mpn/mips2/addmul_1.s b/rts/gmp/mpn/mips2/addmul_1.s
index 1e5037751b..1e5037751b 100644
--- a/ghc/rts/gmp/mpn/mips2/addmul_1.s
+++ b/rts/gmp/mpn/mips2/addmul_1.s
diff --git a/ghc/rts/gmp/mpn/mips2/lshift.s b/rts/gmp/mpn/mips2/lshift.s
index 2ca3a3c800..2ca3a3c800 100644
--- a/ghc/rts/gmp/mpn/mips2/lshift.s
+++ b/rts/gmp/mpn/mips2/lshift.s
diff --git a/ghc/rts/gmp/mpn/mips2/mul_1.s b/rts/gmp/mpn/mips2/mul_1.s
index ea8aa26809..ea8aa26809 100644
--- a/ghc/rts/gmp/mpn/mips2/mul_1.s
+++ b/rts/gmp/mpn/mips2/mul_1.s
diff --git a/ghc/rts/gmp/mpn/mips2/rshift.s b/rts/gmp/mpn/mips2/rshift.s
index 37c8f39cb4..37c8f39cb4 100644
--- a/ghc/rts/gmp/mpn/mips2/rshift.s
+++ b/rts/gmp/mpn/mips2/rshift.s
diff --git a/ghc/rts/gmp/mpn/mips2/sub_n.s b/rts/gmp/mpn/mips2/sub_n.s
index 51d34f3ac3..51d34f3ac3 100644
--- a/ghc/rts/gmp/mpn/mips2/sub_n.s
+++ b/rts/gmp/mpn/mips2/sub_n.s
diff --git a/ghc/rts/gmp/mpn/mips2/submul_1.s b/rts/gmp/mpn/mips2/submul_1.s
index 495dea3ba2..495dea3ba2 100644
--- a/ghc/rts/gmp/mpn/mips2/submul_1.s
+++ b/rts/gmp/mpn/mips2/submul_1.s
diff --git a/ghc/rts/gmp/mpn/mips2/umul.s b/rts/gmp/mpn/mips2/umul.s
index 40e847614c..40e847614c 100644
--- a/ghc/rts/gmp/mpn/mips2/umul.s
+++ b/rts/gmp/mpn/mips2/umul.s
diff --git a/ghc/rts/gmp/mpn/mips3/README b/rts/gmp/mpn/mips3/README
index e94b2c7460..e94b2c7460 100644
--- a/ghc/rts/gmp/mpn/mips3/README
+++ b/rts/gmp/mpn/mips3/README
diff --git a/ghc/rts/gmp/mpn/mips3/add_n.s b/rts/gmp/mpn/mips3/add_n.s
index adad0beaef..adad0beaef 100644
--- a/ghc/rts/gmp/mpn/mips3/add_n.s
+++ b/rts/gmp/mpn/mips3/add_n.s
diff --git a/ghc/rts/gmp/mpn/mips3/addmul_1.s b/rts/gmp/mpn/mips3/addmul_1.s
index d390e2298e..d390e2298e 100644
--- a/ghc/rts/gmp/mpn/mips3/addmul_1.s
+++ b/rts/gmp/mpn/mips3/addmul_1.s
diff --git a/ghc/rts/gmp/mpn/mips3/gmp-mparam.h b/rts/gmp/mpn/mips3/gmp-mparam.h
index 656e90c7b0..656e90c7b0 100644
--- a/ghc/rts/gmp/mpn/mips3/gmp-mparam.h
+++ b/rts/gmp/mpn/mips3/gmp-mparam.h
diff --git a/ghc/rts/gmp/mpn/mips3/lshift.s b/rts/gmp/mpn/mips3/lshift.s
index 372606fddf..372606fddf 100644
--- a/ghc/rts/gmp/mpn/mips3/lshift.s
+++ b/rts/gmp/mpn/mips3/lshift.s
diff --git a/ghc/rts/gmp/mpn/mips3/mul_1.s b/rts/gmp/mpn/mips3/mul_1.s
index 6659e2b4eb..6659e2b4eb 100644
--- a/ghc/rts/gmp/mpn/mips3/mul_1.s
+++ b/rts/gmp/mpn/mips3/mul_1.s
diff --git a/ghc/rts/gmp/mpn/mips3/rshift.s b/rts/gmp/mpn/mips3/rshift.s
index 59c7fd3492..59c7fd3492 100644
--- a/ghc/rts/gmp/mpn/mips3/rshift.s
+++ b/rts/gmp/mpn/mips3/rshift.s
diff --git a/ghc/rts/gmp/mpn/mips3/sub_n.s b/rts/gmp/mpn/mips3/sub_n.s
index c57c824b04..c57c824b04 100644
--- a/ghc/rts/gmp/mpn/mips3/sub_n.s
+++ b/rts/gmp/mpn/mips3/sub_n.s
diff --git a/ghc/rts/gmp/mpn/mips3/submul_1.s b/rts/gmp/mpn/mips3/submul_1.s
index 531f9705a6..531f9705a6 100644
--- a/ghc/rts/gmp/mpn/mips3/submul_1.s
+++ b/rts/gmp/mpn/mips3/submul_1.s
diff --git a/ghc/rts/gmp/mpn/mp_bases.c b/rts/gmp/mpn/mp_bases.c
index 011c328c80..011c328c80 100644
--- a/ghc/rts/gmp/mpn/mp_bases.c
+++ b/rts/gmp/mpn/mp_bases.c
diff --git a/ghc/rts/gmp/mpn/ns32k/add_n.s b/rts/gmp/mpn/ns32k/add_n.s
index bd063d07d9..bd063d07d9 100644
--- a/ghc/rts/gmp/mpn/ns32k/add_n.s
+++ b/rts/gmp/mpn/ns32k/add_n.s
diff --git a/ghc/rts/gmp/mpn/ns32k/addmul_1.s b/rts/gmp/mpn/ns32k/addmul_1.s
index df0dcdd4af..df0dcdd4af 100644
--- a/ghc/rts/gmp/mpn/ns32k/addmul_1.s
+++ b/rts/gmp/mpn/ns32k/addmul_1.s
diff --git a/ghc/rts/gmp/mpn/ns32k/mul_1.s b/rts/gmp/mpn/ns32k/mul_1.s
index 0a77efba29..0a77efba29 100644
--- a/ghc/rts/gmp/mpn/ns32k/mul_1.s
+++ b/rts/gmp/mpn/ns32k/mul_1.s
diff --git a/ghc/rts/gmp/mpn/ns32k/sub_n.s b/rts/gmp/mpn/ns32k/sub_n.s
index cd89f4fd3f..cd89f4fd3f 100644
--- a/ghc/rts/gmp/mpn/ns32k/sub_n.s
+++ b/rts/gmp/mpn/ns32k/sub_n.s
diff --git a/ghc/rts/gmp/mpn/ns32k/submul_1.s b/rts/gmp/mpn/ns32k/submul_1.s
index f811aedcf1..f811aedcf1 100644
--- a/ghc/rts/gmp/mpn/ns32k/submul_1.s
+++ b/rts/gmp/mpn/ns32k/submul_1.s
diff --git a/ghc/rts/gmp/mpn/pa64/README b/rts/gmp/mpn/pa64/README
index 8d2976dabc..8d2976dabc 100644
--- a/ghc/rts/gmp/mpn/pa64/README
+++ b/rts/gmp/mpn/pa64/README
diff --git a/ghc/rts/gmp/mpn/pa64/add_n.s b/rts/gmp/mpn/pa64/add_n.s
index 22ff19c184..22ff19c184 100644
--- a/ghc/rts/gmp/mpn/pa64/add_n.s
+++ b/rts/gmp/mpn/pa64/add_n.s
diff --git a/ghc/rts/gmp/mpn/pa64/addmul_1.S b/rts/gmp/mpn/pa64/addmul_1.S
index b1885b432c..b1885b432c 100644
--- a/ghc/rts/gmp/mpn/pa64/addmul_1.S
+++ b/rts/gmp/mpn/pa64/addmul_1.S
diff --git a/ghc/rts/gmp/mpn/pa64/gmp-mparam.h b/rts/gmp/mpn/pa64/gmp-mparam.h
index 847735b987..847735b987 100644
--- a/ghc/rts/gmp/mpn/pa64/gmp-mparam.h
+++ b/rts/gmp/mpn/pa64/gmp-mparam.h
diff --git a/ghc/rts/gmp/mpn/pa64/lshift.s b/rts/gmp/mpn/pa64/lshift.s
index 994bc1c4d6..994bc1c4d6 100644
--- a/ghc/rts/gmp/mpn/pa64/lshift.s
+++ b/rts/gmp/mpn/pa64/lshift.s
diff --git a/ghc/rts/gmp/mpn/pa64/mul_1.S b/rts/gmp/mpn/pa64/mul_1.S
index ab310c1264..ab310c1264 100644
--- a/ghc/rts/gmp/mpn/pa64/mul_1.S
+++ b/rts/gmp/mpn/pa64/mul_1.S
diff --git a/ghc/rts/gmp/mpn/pa64/rshift.s b/rts/gmp/mpn/pa64/rshift.s
index f0730e2a91..f0730e2a91 100644
--- a/ghc/rts/gmp/mpn/pa64/rshift.s
+++ b/rts/gmp/mpn/pa64/rshift.s
diff --git a/ghc/rts/gmp/mpn/pa64/sub_n.s b/rts/gmp/mpn/pa64/sub_n.s
index dda1f54b34..dda1f54b34 100644
--- a/ghc/rts/gmp/mpn/pa64/sub_n.s
+++ b/rts/gmp/mpn/pa64/sub_n.s
diff --git a/ghc/rts/gmp/mpn/pa64/submul_1.S b/rts/gmp/mpn/pa64/submul_1.S
index 27666b99df..27666b99df 100644
--- a/ghc/rts/gmp/mpn/pa64/submul_1.S
+++ b/rts/gmp/mpn/pa64/submul_1.S
diff --git a/ghc/rts/gmp/mpn/pa64/udiv_qrnnd.c b/rts/gmp/mpn/pa64/udiv_qrnnd.c
index 1c9fe084db..1c9fe084db 100644
--- a/ghc/rts/gmp/mpn/pa64/udiv_qrnnd.c
+++ b/rts/gmp/mpn/pa64/udiv_qrnnd.c
diff --git a/ghc/rts/gmp/mpn/pa64/umul_ppmm.S b/rts/gmp/mpn/pa64/umul_ppmm.S
index ceff2d752f..ceff2d752f 100644
--- a/ghc/rts/gmp/mpn/pa64/umul_ppmm.S
+++ b/rts/gmp/mpn/pa64/umul_ppmm.S
diff --git a/ghc/rts/gmp/mpn/pa64w/README b/rts/gmp/mpn/pa64w/README
index cf590a7b98..cf590a7b98 100644
--- a/ghc/rts/gmp/mpn/pa64w/README
+++ b/rts/gmp/mpn/pa64w/README
diff --git a/ghc/rts/gmp/mpn/pa64w/add_n.s b/rts/gmp/mpn/pa64w/add_n.s
index 1bb9e8fbc7..1bb9e8fbc7 100644
--- a/ghc/rts/gmp/mpn/pa64w/add_n.s
+++ b/rts/gmp/mpn/pa64w/add_n.s
diff --git a/ghc/rts/gmp/mpn/pa64w/addmul_1.S b/rts/gmp/mpn/pa64w/addmul_1.S
index 4799f90fc5..4799f90fc5 100644
--- a/ghc/rts/gmp/mpn/pa64w/addmul_1.S
+++ b/rts/gmp/mpn/pa64w/addmul_1.S
diff --git a/ghc/rts/gmp/mpn/pa64w/gmp-mparam.h b/rts/gmp/mpn/pa64w/gmp-mparam.h
index ee5a0a3ab7..ee5a0a3ab7 100644
--- a/ghc/rts/gmp/mpn/pa64w/gmp-mparam.h
+++ b/rts/gmp/mpn/pa64w/gmp-mparam.h
diff --git a/ghc/rts/gmp/mpn/pa64w/lshift.s b/rts/gmp/mpn/pa64w/lshift.s
index 84f925a105..84f925a105 100644
--- a/ghc/rts/gmp/mpn/pa64w/lshift.s
+++ b/rts/gmp/mpn/pa64w/lshift.s
diff --git a/ghc/rts/gmp/mpn/pa64w/mul_1.S b/rts/gmp/mpn/pa64w/mul_1.S
index 48f13fbd1b..48f13fbd1b 100644
--- a/ghc/rts/gmp/mpn/pa64w/mul_1.S
+++ b/rts/gmp/mpn/pa64w/mul_1.S
diff --git a/ghc/rts/gmp/mpn/pa64w/rshift.s b/rts/gmp/mpn/pa64w/rshift.s
index 2517cb1f87..2517cb1f87 100644
--- a/ghc/rts/gmp/mpn/pa64w/rshift.s
+++ b/rts/gmp/mpn/pa64w/rshift.s
diff --git a/ghc/rts/gmp/mpn/pa64w/sub_n.s b/rts/gmp/mpn/pa64w/sub_n.s
index ad01e24aa7..ad01e24aa7 100644
--- a/ghc/rts/gmp/mpn/pa64w/sub_n.s
+++ b/rts/gmp/mpn/pa64w/sub_n.s
diff --git a/ghc/rts/gmp/mpn/pa64w/submul_1.S b/rts/gmp/mpn/pa64w/submul_1.S
index 294f6239b2..294f6239b2 100644
--- a/ghc/rts/gmp/mpn/pa64w/submul_1.S
+++ b/rts/gmp/mpn/pa64w/submul_1.S
diff --git a/ghc/rts/gmp/mpn/pa64w/udiv_qrnnd.c b/rts/gmp/mpn/pa64w/udiv_qrnnd.c
index 1852913000..1852913000 100644
--- a/ghc/rts/gmp/mpn/pa64w/udiv_qrnnd.c
+++ b/rts/gmp/mpn/pa64w/udiv_qrnnd.c
diff --git a/ghc/rts/gmp/mpn/pa64w/umul_ppmm.S b/rts/gmp/mpn/pa64w/umul_ppmm.S
index d9fb92be8c..d9fb92be8c 100644
--- a/ghc/rts/gmp/mpn/pa64w/umul_ppmm.S
+++ b/rts/gmp/mpn/pa64w/umul_ppmm.S
diff --git a/ghc/rts/gmp/mpn/power/add_n.s b/rts/gmp/mpn/power/add_n.s
index 0f9f48f1cc..0f9f48f1cc 100644
--- a/ghc/rts/gmp/mpn/power/add_n.s
+++ b/rts/gmp/mpn/power/add_n.s
diff --git a/ghc/rts/gmp/mpn/power/addmul_1.s b/rts/gmp/mpn/power/addmul_1.s
index 8ecc651579..8ecc651579 100644
--- a/ghc/rts/gmp/mpn/power/addmul_1.s
+++ b/rts/gmp/mpn/power/addmul_1.s
diff --git a/ghc/rts/gmp/mpn/power/lshift.s b/rts/gmp/mpn/power/lshift.s
index ab71fb7727..ab71fb7727 100644
--- a/ghc/rts/gmp/mpn/power/lshift.s
+++ b/rts/gmp/mpn/power/lshift.s
diff --git a/ghc/rts/gmp/mpn/power/mul_1.s b/rts/gmp/mpn/power/mul_1.s
index 4e08ade583..4e08ade583 100644
--- a/ghc/rts/gmp/mpn/power/mul_1.s
+++ b/rts/gmp/mpn/power/mul_1.s
diff --git a/ghc/rts/gmp/mpn/power/rshift.s b/rts/gmp/mpn/power/rshift.s
index 65b3945f8a..65b3945f8a 100644
--- a/ghc/rts/gmp/mpn/power/rshift.s
+++ b/rts/gmp/mpn/power/rshift.s
diff --git a/ghc/rts/gmp/mpn/power/sdiv.s b/rts/gmp/mpn/power/sdiv.s
index 81da622fbc..81da622fbc 100644
--- a/ghc/rts/gmp/mpn/power/sdiv.s
+++ b/rts/gmp/mpn/power/sdiv.s
diff --git a/ghc/rts/gmp/mpn/power/sub_n.s b/rts/gmp/mpn/power/sub_n.s
index aa09cf5bc1..aa09cf5bc1 100644
--- a/ghc/rts/gmp/mpn/power/sub_n.s
+++ b/rts/gmp/mpn/power/sub_n.s
diff --git a/ghc/rts/gmp/mpn/power/submul_1.s b/rts/gmp/mpn/power/submul_1.s
index bc01b7c95d..bc01b7c95d 100644
--- a/ghc/rts/gmp/mpn/power/submul_1.s
+++ b/rts/gmp/mpn/power/submul_1.s
diff --git a/ghc/rts/gmp/mpn/power/umul.s b/rts/gmp/mpn/power/umul.s
index 8c77496380..8c77496380 100644
--- a/ghc/rts/gmp/mpn/power/umul.s
+++ b/rts/gmp/mpn/power/umul.s
diff --git a/ghc/rts/gmp/mpn/powerpc32/add_n.asm b/rts/gmp/mpn/powerpc32/add_n.asm
index 81ed04b162..81ed04b162 100644
--- a/ghc/rts/gmp/mpn/powerpc32/add_n.asm
+++ b/rts/gmp/mpn/powerpc32/add_n.asm
diff --git a/ghc/rts/gmp/mpn/powerpc32/addmul_1.asm b/rts/gmp/mpn/powerpc32/addmul_1.asm
index 3ef75b1532..3ef75b1532 100644
--- a/ghc/rts/gmp/mpn/powerpc32/addmul_1.asm
+++ b/rts/gmp/mpn/powerpc32/addmul_1.asm
diff --git a/ghc/rts/gmp/mpn/powerpc32/aix.m4 b/rts/gmp/mpn/powerpc32/aix.m4
index 2bd8425817..2bd8425817 100644
--- a/ghc/rts/gmp/mpn/powerpc32/aix.m4
+++ b/rts/gmp/mpn/powerpc32/aix.m4
diff --git a/ghc/rts/gmp/mpn/powerpc32/gmp-mparam.h b/rts/gmp/mpn/powerpc32/gmp-mparam.h
index b283185789..b283185789 100644
--- a/ghc/rts/gmp/mpn/powerpc32/gmp-mparam.h
+++ b/rts/gmp/mpn/powerpc32/gmp-mparam.h
diff --git a/ghc/rts/gmp/mpn/powerpc32/lshift.asm b/rts/gmp/mpn/powerpc32/lshift.asm
index 73a85430ab..73a85430ab 100644
--- a/ghc/rts/gmp/mpn/powerpc32/lshift.asm
+++ b/rts/gmp/mpn/powerpc32/lshift.asm
diff --git a/ghc/rts/gmp/mpn/powerpc32/mul_1.asm b/rts/gmp/mpn/powerpc32/mul_1.asm
index ec878b54d5..ec878b54d5 100644
--- a/ghc/rts/gmp/mpn/powerpc32/mul_1.asm
+++ b/rts/gmp/mpn/powerpc32/mul_1.asm
diff --git a/ghc/rts/gmp/mpn/powerpc32/regmap.m4 b/rts/gmp/mpn/powerpc32/regmap.m4
index 978f18902a..978f18902a 100644
--- a/ghc/rts/gmp/mpn/powerpc32/regmap.m4
+++ b/rts/gmp/mpn/powerpc32/regmap.m4
diff --git a/ghc/rts/gmp/mpn/powerpc32/rshift.asm b/rts/gmp/mpn/powerpc32/rshift.asm
index a09ba04938..a09ba04938 100644
--- a/ghc/rts/gmp/mpn/powerpc32/rshift.asm
+++ b/rts/gmp/mpn/powerpc32/rshift.asm
diff --git a/ghc/rts/gmp/mpn/powerpc32/sub_n.asm b/rts/gmp/mpn/powerpc32/sub_n.asm
index b04b4192ef..b04b4192ef 100644
--- a/ghc/rts/gmp/mpn/powerpc32/sub_n.asm
+++ b/rts/gmp/mpn/powerpc32/sub_n.asm
diff --git a/ghc/rts/gmp/mpn/powerpc32/submul_1.asm b/rts/gmp/mpn/powerpc32/submul_1.asm
index a129e9f9ea..a129e9f9ea 100644
--- a/ghc/rts/gmp/mpn/powerpc32/submul_1.asm
+++ b/rts/gmp/mpn/powerpc32/submul_1.asm
diff --git a/ghc/rts/gmp/mpn/powerpc32/umul.asm b/rts/gmp/mpn/powerpc32/umul.asm
index eeaa0a4dc8..eeaa0a4dc8 100644
--- a/ghc/rts/gmp/mpn/powerpc32/umul.asm
+++ b/rts/gmp/mpn/powerpc32/umul.asm
diff --git a/ghc/rts/gmp/mpn/powerpc64/README b/rts/gmp/mpn/powerpc64/README
index c779276917..c779276917 100644
--- a/ghc/rts/gmp/mpn/powerpc64/README
+++ b/rts/gmp/mpn/powerpc64/README
diff --git a/ghc/rts/gmp/mpn/powerpc64/add_n.asm b/rts/gmp/mpn/powerpc64/add_n.asm
index c3325376dc..c3325376dc 100644
--- a/ghc/rts/gmp/mpn/powerpc64/add_n.asm
+++ b/rts/gmp/mpn/powerpc64/add_n.asm
diff --git a/ghc/rts/gmp/mpn/powerpc64/addmul_1.asm b/rts/gmp/mpn/powerpc64/addmul_1.asm
index 81774482fe..81774482fe 100644
--- a/ghc/rts/gmp/mpn/powerpc64/addmul_1.asm
+++ b/rts/gmp/mpn/powerpc64/addmul_1.asm
diff --git a/ghc/rts/gmp/mpn/powerpc64/addsub_n.asm b/rts/gmp/mpn/powerpc64/addsub_n.asm
index 4ed40d71ae..4ed40d71ae 100644
--- a/ghc/rts/gmp/mpn/powerpc64/addsub_n.asm
+++ b/rts/gmp/mpn/powerpc64/addsub_n.asm
diff --git a/ghc/rts/gmp/mpn/powerpc64/aix.m4 b/rts/gmp/mpn/powerpc64/aix.m4
index aee9f1f97a..aee9f1f97a 100644
--- a/ghc/rts/gmp/mpn/powerpc64/aix.m4
+++ b/rts/gmp/mpn/powerpc64/aix.m4
diff --git a/ghc/rts/gmp/mpn/powerpc64/copyd.asm b/rts/gmp/mpn/powerpc64/copyd.asm
index d06e8c25fd..d06e8c25fd 100644
--- a/ghc/rts/gmp/mpn/powerpc64/copyd.asm
+++ b/rts/gmp/mpn/powerpc64/copyd.asm
diff --git a/ghc/rts/gmp/mpn/powerpc64/copyi.asm b/rts/gmp/mpn/powerpc64/copyi.asm
index a1bedc4c5b..a1bedc4c5b 100644
--- a/ghc/rts/gmp/mpn/powerpc64/copyi.asm
+++ b/rts/gmp/mpn/powerpc64/copyi.asm
diff --git a/ghc/rts/gmp/mpn/powerpc64/gmp-mparam.h b/rts/gmp/mpn/powerpc64/gmp-mparam.h
index 6fefb960cd..6fefb960cd 100644
--- a/ghc/rts/gmp/mpn/powerpc64/gmp-mparam.h
+++ b/rts/gmp/mpn/powerpc64/gmp-mparam.h
diff --git a/ghc/rts/gmp/mpn/powerpc64/lshift.asm b/rts/gmp/mpn/powerpc64/lshift.asm
index cef3a81fdd..cef3a81fdd 100644
--- a/ghc/rts/gmp/mpn/powerpc64/lshift.asm
+++ b/rts/gmp/mpn/powerpc64/lshift.asm
diff --git a/ghc/rts/gmp/mpn/powerpc64/mul_1.asm b/rts/gmp/mpn/powerpc64/mul_1.asm
index 47597283ff..47597283ff 100644
--- a/ghc/rts/gmp/mpn/powerpc64/mul_1.asm
+++ b/rts/gmp/mpn/powerpc64/mul_1.asm
diff --git a/ghc/rts/gmp/mpn/powerpc64/rshift.asm b/rts/gmp/mpn/powerpc64/rshift.asm
index 88272c7fa9..88272c7fa9 100644
--- a/ghc/rts/gmp/mpn/powerpc64/rshift.asm
+++ b/rts/gmp/mpn/powerpc64/rshift.asm
diff --git a/ghc/rts/gmp/mpn/powerpc64/sub_n.asm b/rts/gmp/mpn/powerpc64/sub_n.asm
index 4de3de69c7..4de3de69c7 100644
--- a/ghc/rts/gmp/mpn/powerpc64/sub_n.asm
+++ b/rts/gmp/mpn/powerpc64/sub_n.asm
diff --git a/ghc/rts/gmp/mpn/powerpc64/submul_1.asm b/rts/gmp/mpn/powerpc64/submul_1.asm
index 17f6369a38..17f6369a38 100644
--- a/ghc/rts/gmp/mpn/powerpc64/submul_1.asm
+++ b/rts/gmp/mpn/powerpc64/submul_1.asm
diff --git a/ghc/rts/gmp/mpn/pyr/add_n.s b/rts/gmp/mpn/pyr/add_n.s
index e1fc535846..e1fc535846 100644
--- a/ghc/rts/gmp/mpn/pyr/add_n.s
+++ b/rts/gmp/mpn/pyr/add_n.s
diff --git a/ghc/rts/gmp/mpn/pyr/addmul_1.s b/rts/gmp/mpn/pyr/addmul_1.s
index 65c3f8f008..65c3f8f008 100644
--- a/ghc/rts/gmp/mpn/pyr/addmul_1.s
+++ b/rts/gmp/mpn/pyr/addmul_1.s
diff --git a/ghc/rts/gmp/mpn/pyr/mul_1.s b/rts/gmp/mpn/pyr/mul_1.s
index 1272297c42..1272297c42 100644
--- a/ghc/rts/gmp/mpn/pyr/mul_1.s
+++ b/rts/gmp/mpn/pyr/mul_1.s
diff --git a/ghc/rts/gmp/mpn/pyr/sub_n.s b/rts/gmp/mpn/pyr/sub_n.s
index 1fd2eb0f17..1fd2eb0f17 100644
--- a/ghc/rts/gmp/mpn/pyr/sub_n.s
+++ b/rts/gmp/mpn/pyr/sub_n.s
diff --git a/ghc/rts/gmp/mpn/sh/add_n.s b/rts/gmp/mpn/sh/add_n.s
index df388b31a3..df388b31a3 100644
--- a/ghc/rts/gmp/mpn/sh/add_n.s
+++ b/rts/gmp/mpn/sh/add_n.s
diff --git a/ghc/rts/gmp/mpn/sh/sh2/addmul_1.s b/rts/gmp/mpn/sh/sh2/addmul_1.s
index f34a7f0503..f34a7f0503 100644
--- a/ghc/rts/gmp/mpn/sh/sh2/addmul_1.s
+++ b/rts/gmp/mpn/sh/sh2/addmul_1.s
diff --git a/ghc/rts/gmp/mpn/sh/sh2/mul_1.s b/rts/gmp/mpn/sh/sh2/mul_1.s
index 2a117a3175..2a117a3175 100644
--- a/ghc/rts/gmp/mpn/sh/sh2/mul_1.s
+++ b/rts/gmp/mpn/sh/sh2/mul_1.s
diff --git a/ghc/rts/gmp/mpn/sh/sh2/submul_1.s b/rts/gmp/mpn/sh/sh2/submul_1.s
index eb9a27dde3..eb9a27dde3 100644
--- a/ghc/rts/gmp/mpn/sh/sh2/submul_1.s
+++ b/rts/gmp/mpn/sh/sh2/submul_1.s
diff --git a/ghc/rts/gmp/mpn/sh/sub_n.s b/rts/gmp/mpn/sh/sub_n.s
index 5f818c95a8..5f818c95a8 100644
--- a/ghc/rts/gmp/mpn/sh/sub_n.s
+++ b/rts/gmp/mpn/sh/sub_n.s
diff --git a/ghc/rts/gmp/mpn/sparc32/README b/rts/gmp/mpn/sparc32/README
index 7c19df7bc4..7c19df7bc4 100644
--- a/ghc/rts/gmp/mpn/sparc32/README
+++ b/rts/gmp/mpn/sparc32/README
diff --git a/ghc/rts/gmp/mpn/sparc32/add_n.asm b/rts/gmp/mpn/sparc32/add_n.asm
index 5f1d00c0e0..5f1d00c0e0 100644
--- a/ghc/rts/gmp/mpn/sparc32/add_n.asm
+++ b/rts/gmp/mpn/sparc32/add_n.asm
diff --git a/ghc/rts/gmp/mpn/sparc32/addmul_1.asm b/rts/gmp/mpn/sparc32/addmul_1.asm
index 80c94e4251..80c94e4251 100644
--- a/ghc/rts/gmp/mpn/sparc32/addmul_1.asm
+++ b/rts/gmp/mpn/sparc32/addmul_1.asm
diff --git a/ghc/rts/gmp/mpn/sparc32/lshift.asm b/rts/gmp/mpn/sparc32/lshift.asm
index 529733ac2d..529733ac2d 100644
--- a/ghc/rts/gmp/mpn/sparc32/lshift.asm
+++ b/rts/gmp/mpn/sparc32/lshift.asm
diff --git a/ghc/rts/gmp/mpn/sparc32/mul_1.asm b/rts/gmp/mpn/sparc32/mul_1.asm
index e5fedeabaa..e5fedeabaa 100644
--- a/ghc/rts/gmp/mpn/sparc32/mul_1.asm
+++ b/rts/gmp/mpn/sparc32/mul_1.asm
diff --git a/ghc/rts/gmp/mpn/sparc32/rshift.asm b/rts/gmp/mpn/sparc32/rshift.asm
index 9187dbaa6f..9187dbaa6f 100644
--- a/ghc/rts/gmp/mpn/sparc32/rshift.asm
+++ b/rts/gmp/mpn/sparc32/rshift.asm
diff --git a/ghc/rts/gmp/mpn/sparc32/sub_n.asm b/rts/gmp/mpn/sparc32/sub_n.asm
index 071909a1b6..071909a1b6 100644
--- a/ghc/rts/gmp/mpn/sparc32/sub_n.asm
+++ b/rts/gmp/mpn/sparc32/sub_n.asm
diff --git a/ghc/rts/gmp/mpn/sparc32/submul_1.asm b/rts/gmp/mpn/sparc32/submul_1.asm
index 12abd844ce..12abd844ce 100644
--- a/ghc/rts/gmp/mpn/sparc32/submul_1.asm
+++ b/rts/gmp/mpn/sparc32/submul_1.asm
diff --git a/ghc/rts/gmp/mpn/sparc32/udiv_fp.asm b/rts/gmp/mpn/sparc32/udiv_fp.asm
index e340e147d2..e340e147d2 100644
--- a/ghc/rts/gmp/mpn/sparc32/udiv_fp.asm
+++ b/rts/gmp/mpn/sparc32/udiv_fp.asm
diff --git a/ghc/rts/gmp/mpn/sparc32/udiv_nfp.asm b/rts/gmp/mpn/sparc32/udiv_nfp.asm
index ae19f4c6e9..ae19f4c6e9 100644
--- a/ghc/rts/gmp/mpn/sparc32/udiv_nfp.asm
+++ b/rts/gmp/mpn/sparc32/udiv_nfp.asm
diff --git a/ghc/rts/gmp/mpn/sparc32/umul.asm b/rts/gmp/mpn/sparc32/umul.asm
index efa56851d6..efa56851d6 100644
--- a/ghc/rts/gmp/mpn/sparc32/umul.asm
+++ b/rts/gmp/mpn/sparc32/umul.asm
diff --git a/ghc/rts/gmp/mpn/sparc32/v8/addmul_1.asm b/rts/gmp/mpn/sparc32/v8/addmul_1.asm
index da44644b51..da44644b51 100644
--- a/ghc/rts/gmp/mpn/sparc32/v8/addmul_1.asm
+++ b/rts/gmp/mpn/sparc32/v8/addmul_1.asm
diff --git a/ghc/rts/gmp/mpn/sparc32/v8/mul_1.asm b/rts/gmp/mpn/sparc32/v8/mul_1.asm
index 801247553a..801247553a 100644
--- a/ghc/rts/gmp/mpn/sparc32/v8/mul_1.asm
+++ b/rts/gmp/mpn/sparc32/v8/mul_1.asm
diff --git a/ghc/rts/gmp/mpn/sparc32/v8/submul_1.asm b/rts/gmp/mpn/sparc32/v8/submul_1.asm
index 9ed132f4c1..9ed132f4c1 100644
--- a/ghc/rts/gmp/mpn/sparc32/v8/submul_1.asm
+++ b/rts/gmp/mpn/sparc32/v8/submul_1.asm
diff --git a/ghc/rts/gmp/mpn/sparc32/v8/supersparc/udiv.asm b/rts/gmp/mpn/sparc32/v8/supersparc/udiv.asm
index 0d5e8d415d..0d5e8d415d 100644
--- a/ghc/rts/gmp/mpn/sparc32/v8/supersparc/udiv.asm
+++ b/rts/gmp/mpn/sparc32/v8/supersparc/udiv.asm
diff --git a/ghc/rts/gmp/mpn/sparc32/v8/umul.asm b/rts/gmp/mpn/sparc32/v8/umul.asm
index ae8f692a0a..ae8f692a0a 100644
--- a/ghc/rts/gmp/mpn/sparc32/v8/umul.asm
+++ b/rts/gmp/mpn/sparc32/v8/umul.asm
diff --git a/ghc/rts/gmp/mpn/sparc32/v9/README b/rts/gmp/mpn/sparc32/v9/README
index 9b39713271..9b39713271 100644
--- a/ghc/rts/gmp/mpn/sparc32/v9/README
+++ b/rts/gmp/mpn/sparc32/v9/README
diff --git a/ghc/rts/gmp/mpn/sparc32/v9/addmul_1.asm b/rts/gmp/mpn/sparc32/v9/addmul_1.asm
index c1762cc41f..c1762cc41f 100644
--- a/ghc/rts/gmp/mpn/sparc32/v9/addmul_1.asm
+++ b/rts/gmp/mpn/sparc32/v9/addmul_1.asm
diff --git a/ghc/rts/gmp/mpn/sparc32/v9/gmp-mparam.h b/rts/gmp/mpn/sparc32/v9/gmp-mparam.h
index f946b900f0..f946b900f0 100644
--- a/ghc/rts/gmp/mpn/sparc32/v9/gmp-mparam.h
+++ b/rts/gmp/mpn/sparc32/v9/gmp-mparam.h
diff --git a/ghc/rts/gmp/mpn/sparc32/v9/mul_1.asm b/rts/gmp/mpn/sparc32/v9/mul_1.asm
index f8f0fdd8c2..f8f0fdd8c2 100644
--- a/ghc/rts/gmp/mpn/sparc32/v9/mul_1.asm
+++ b/rts/gmp/mpn/sparc32/v9/mul_1.asm
diff --git a/ghc/rts/gmp/mpn/sparc32/v9/submul_1.asm b/rts/gmp/mpn/sparc32/v9/submul_1.asm
index 6195ea88ea..6195ea88ea 100644
--- a/ghc/rts/gmp/mpn/sparc32/v9/submul_1.asm
+++ b/rts/gmp/mpn/sparc32/v9/submul_1.asm
diff --git a/ghc/rts/gmp/mpn/sparc64/README b/rts/gmp/mpn/sparc64/README
index 6923a133f3..6923a133f3 100644
--- a/ghc/rts/gmp/mpn/sparc64/README
+++ b/rts/gmp/mpn/sparc64/README
diff --git a/ghc/rts/gmp/mpn/sparc64/add_n.asm b/rts/gmp/mpn/sparc64/add_n.asm
index 72b3895a5b..72b3895a5b 100644
--- a/ghc/rts/gmp/mpn/sparc64/add_n.asm
+++ b/rts/gmp/mpn/sparc64/add_n.asm
diff --git a/ghc/rts/gmp/mpn/sparc64/addmul1h.asm b/rts/gmp/mpn/sparc64/addmul1h.asm
index 96cb5f7369..96cb5f7369 100644
--- a/ghc/rts/gmp/mpn/sparc64/addmul1h.asm
+++ b/rts/gmp/mpn/sparc64/addmul1h.asm
diff --git a/ghc/rts/gmp/mpn/sparc64/addmul_1.asm b/rts/gmp/mpn/sparc64/addmul_1.asm
index c3f04cea6a..c3f04cea6a 100644
--- a/ghc/rts/gmp/mpn/sparc64/addmul_1.asm
+++ b/rts/gmp/mpn/sparc64/addmul_1.asm
diff --git a/ghc/rts/gmp/mpn/sparc64/copyi.asm b/rts/gmp/mpn/sparc64/copyi.asm
index d9957e3c90..d9957e3c90 100644
--- a/ghc/rts/gmp/mpn/sparc64/copyi.asm
+++ b/rts/gmp/mpn/sparc64/copyi.asm
diff --git a/ghc/rts/gmp/mpn/sparc64/gmp-mparam.h b/rts/gmp/mpn/sparc64/gmp-mparam.h
index 74f61661c1..74f61661c1 100644
--- a/ghc/rts/gmp/mpn/sparc64/gmp-mparam.h
+++ b/rts/gmp/mpn/sparc64/gmp-mparam.h
diff --git a/ghc/rts/gmp/mpn/sparc64/lshift.asm b/rts/gmp/mpn/sparc64/lshift.asm
index 2d2edc50a7..2d2edc50a7 100644
--- a/ghc/rts/gmp/mpn/sparc64/lshift.asm
+++ b/rts/gmp/mpn/sparc64/lshift.asm
diff --git a/ghc/rts/gmp/mpn/sparc64/mul_1.asm b/rts/gmp/mpn/sparc64/mul_1.asm
index f2f2821d51..f2f2821d51 100644
--- a/ghc/rts/gmp/mpn/sparc64/mul_1.asm
+++ b/rts/gmp/mpn/sparc64/mul_1.asm
diff --git a/ghc/rts/gmp/mpn/sparc64/mul_1h.asm b/rts/gmp/mpn/sparc64/mul_1h.asm
index 5078c01c3f..5078c01c3f 100644
--- a/ghc/rts/gmp/mpn/sparc64/mul_1h.asm
+++ b/rts/gmp/mpn/sparc64/mul_1h.asm
diff --git a/ghc/rts/gmp/mpn/sparc64/rshift.asm b/rts/gmp/mpn/sparc64/rshift.asm
index baf7920efb..baf7920efb 100644
--- a/ghc/rts/gmp/mpn/sparc64/rshift.asm
+++ b/rts/gmp/mpn/sparc64/rshift.asm
diff --git a/ghc/rts/gmp/mpn/sparc64/sub_n.asm b/rts/gmp/mpn/sparc64/sub_n.asm
index 61547138e0..61547138e0 100644
--- a/ghc/rts/gmp/mpn/sparc64/sub_n.asm
+++ b/rts/gmp/mpn/sparc64/sub_n.asm
diff --git a/ghc/rts/gmp/mpn/sparc64/submul1h.asm b/rts/gmp/mpn/sparc64/submul1h.asm
index 7f51ba59c6..7f51ba59c6 100644
--- a/ghc/rts/gmp/mpn/sparc64/submul1h.asm
+++ b/rts/gmp/mpn/sparc64/submul1h.asm
diff --git a/ghc/rts/gmp/mpn/sparc64/submul_1.asm b/rts/gmp/mpn/sparc64/submul_1.asm
index 7c6af0a98b..7c6af0a98b 100644
--- a/ghc/rts/gmp/mpn/sparc64/submul_1.asm
+++ b/rts/gmp/mpn/sparc64/submul_1.asm
diff --git a/ghc/rts/gmp/mpn/thumb/add_n.s b/rts/gmp/mpn/thumb/add_n.s
index c1eeb6ca87..c1eeb6ca87 100644
--- a/ghc/rts/gmp/mpn/thumb/add_n.s
+++ b/rts/gmp/mpn/thumb/add_n.s
diff --git a/ghc/rts/gmp/mpn/thumb/sub_n.s b/rts/gmp/mpn/thumb/sub_n.s
index 53c292375f..53c292375f 100644
--- a/ghc/rts/gmp/mpn/thumb/sub_n.s
+++ b/rts/gmp/mpn/thumb/sub_n.s
diff --git a/ghc/rts/gmp/mpn/underscore.h b/rts/gmp/mpn/underscore.h
index 240dae0f63..240dae0f63 100644
--- a/ghc/rts/gmp/mpn/underscore.h
+++ b/rts/gmp/mpn/underscore.h
diff --git a/ghc/rts/gmp/mpn/vax/add_n.s b/rts/gmp/mpn/vax/add_n.s
index cf4060f521..cf4060f521 100644
--- a/ghc/rts/gmp/mpn/vax/add_n.s
+++ b/rts/gmp/mpn/vax/add_n.s
diff --git a/ghc/rts/gmp/mpn/vax/addmul_1.s b/rts/gmp/mpn/vax/addmul_1.s
index 379061dcb7..379061dcb7 100644
--- a/ghc/rts/gmp/mpn/vax/addmul_1.s
+++ b/rts/gmp/mpn/vax/addmul_1.s
diff --git a/ghc/rts/gmp/mpn/vax/lshift.s b/rts/gmp/mpn/vax/lshift.s
index fd311a9782..fd311a9782 100644
--- a/ghc/rts/gmp/mpn/vax/lshift.s
+++ b/rts/gmp/mpn/vax/lshift.s
diff --git a/ghc/rts/gmp/mpn/vax/mul_1.s b/rts/gmp/mpn/vax/mul_1.s
index 708e8ca6ca..708e8ca6ca 100644
--- a/ghc/rts/gmp/mpn/vax/mul_1.s
+++ b/rts/gmp/mpn/vax/mul_1.s
diff --git a/ghc/rts/gmp/mpn/vax/rshift.s b/rts/gmp/mpn/vax/rshift.s
index 515813208d..515813208d 100644
--- a/ghc/rts/gmp/mpn/vax/rshift.s
+++ b/rts/gmp/mpn/vax/rshift.s
diff --git a/ghc/rts/gmp/mpn/vax/sub_n.s b/rts/gmp/mpn/vax/sub_n.s
index eff4b1c044..eff4b1c044 100644
--- a/ghc/rts/gmp/mpn/vax/sub_n.s
+++ b/rts/gmp/mpn/vax/sub_n.s
diff --git a/ghc/rts/gmp/mpn/vax/submul_1.s b/rts/gmp/mpn/vax/submul_1.s
index be42286935..be42286935 100644
--- a/ghc/rts/gmp/mpn/vax/submul_1.s
+++ b/rts/gmp/mpn/vax/submul_1.s
diff --git a/ghc/rts/gmp/mpn/x86/README b/rts/gmp/mpn/x86/README
index 3507548b8c..3507548b8c 100644
--- a/ghc/rts/gmp/mpn/x86/README
+++ b/rts/gmp/mpn/x86/README
diff --git a/ghc/rts/gmp/mpn/x86/README.family b/rts/gmp/mpn/x86/README.family
index 3bc73f58b0..3bc73f58b0 100644
--- a/ghc/rts/gmp/mpn/x86/README.family
+++ b/rts/gmp/mpn/x86/README.family
diff --git a/ghc/rts/gmp/mpn/x86/addsub_n.S b/rts/gmp/mpn/x86/addsub_n.S
index fe6f648f53..fe6f648f53 100644
--- a/ghc/rts/gmp/mpn/x86/addsub_n.S
+++ b/rts/gmp/mpn/x86/addsub_n.S
diff --git a/ghc/rts/gmp/mpn/x86/aors_n.asm b/rts/gmp/mpn/x86/aors_n.asm
index 18ef816b4d..18ef816b4d 100644
--- a/ghc/rts/gmp/mpn/x86/aors_n.asm
+++ b/rts/gmp/mpn/x86/aors_n.asm
diff --git a/ghc/rts/gmp/mpn/x86/aorsmul_1.asm b/rts/gmp/mpn/x86/aorsmul_1.asm
index f32ad83989..f32ad83989 100644
--- a/ghc/rts/gmp/mpn/x86/aorsmul_1.asm
+++ b/rts/gmp/mpn/x86/aorsmul_1.asm
diff --git a/ghc/rts/gmp/mpn/x86/copyd.asm b/rts/gmp/mpn/x86/copyd.asm
index 439640e836..439640e836 100644
--- a/ghc/rts/gmp/mpn/x86/copyd.asm
+++ b/rts/gmp/mpn/x86/copyd.asm
diff --git a/ghc/rts/gmp/mpn/x86/copyi.asm b/rts/gmp/mpn/x86/copyi.asm
index 5bc4e36689..5bc4e36689 100644
--- a/ghc/rts/gmp/mpn/x86/copyi.asm
+++ b/rts/gmp/mpn/x86/copyi.asm
diff --git a/ghc/rts/gmp/mpn/x86/diveby3.asm b/rts/gmp/mpn/x86/diveby3.asm
index df879da9e1..df879da9e1 100644
--- a/ghc/rts/gmp/mpn/x86/diveby3.asm
+++ b/rts/gmp/mpn/x86/diveby3.asm
diff --git a/ghc/rts/gmp/mpn/x86/divrem_1.asm b/rts/gmp/mpn/x86/divrem_1.asm
index 12f14676d6..12f14676d6 100644
--- a/ghc/rts/gmp/mpn/x86/divrem_1.asm
+++ b/rts/gmp/mpn/x86/divrem_1.asm
diff --git a/ghc/rts/gmp/mpn/x86/k6/README b/rts/gmp/mpn/x86/k6/README
index 3ad96c8b89..3ad96c8b89 100644
--- a/ghc/rts/gmp/mpn/x86/k6/README
+++ b/rts/gmp/mpn/x86/k6/README
diff --git a/ghc/rts/gmp/mpn/x86/k6/aors_n.asm b/rts/gmp/mpn/x86/k6/aors_n.asm
index 31b05ada51..31b05ada51 100644
--- a/ghc/rts/gmp/mpn/x86/k6/aors_n.asm
+++ b/rts/gmp/mpn/x86/k6/aors_n.asm
diff --git a/ghc/rts/gmp/mpn/x86/k6/aorsmul_1.asm b/rts/gmp/mpn/x86/k6/aorsmul_1.asm
index da4120fe2f..da4120fe2f 100644
--- a/ghc/rts/gmp/mpn/x86/k6/aorsmul_1.asm
+++ b/rts/gmp/mpn/x86/k6/aorsmul_1.asm
diff --git a/ghc/rts/gmp/mpn/x86/k6/cross.pl b/rts/gmp/mpn/x86/k6/cross.pl
index 21734f3e52..21734f3e52 100644
--- a/ghc/rts/gmp/mpn/x86/k6/cross.pl
+++ b/rts/gmp/mpn/x86/k6/cross.pl
diff --git a/ghc/rts/gmp/mpn/x86/k6/diveby3.asm b/rts/gmp/mpn/x86/k6/diveby3.asm
index ffb97bc380..ffb97bc380 100644
--- a/ghc/rts/gmp/mpn/x86/k6/diveby3.asm
+++ b/rts/gmp/mpn/x86/k6/diveby3.asm
diff --git a/ghc/rts/gmp/mpn/x86/k6/gmp-mparam.h b/rts/gmp/mpn/x86/k6/gmp-mparam.h
index 77f3948d77..77f3948d77 100644
--- a/ghc/rts/gmp/mpn/x86/k6/gmp-mparam.h
+++ b/rts/gmp/mpn/x86/k6/gmp-mparam.h
diff --git a/ghc/rts/gmp/mpn/x86/k6/k62mmx/copyd.asm b/rts/gmp/mpn/x86/k6/k62mmx/copyd.asm
index 20a33e6ccf..20a33e6ccf 100644
--- a/ghc/rts/gmp/mpn/x86/k6/k62mmx/copyd.asm
+++ b/rts/gmp/mpn/x86/k6/k62mmx/copyd.asm
diff --git a/ghc/rts/gmp/mpn/x86/k6/k62mmx/copyi.asm b/rts/gmp/mpn/x86/k6/k62mmx/copyi.asm
index 215d805f2e..215d805f2e 100644
--- a/ghc/rts/gmp/mpn/x86/k6/k62mmx/copyi.asm
+++ b/rts/gmp/mpn/x86/k6/k62mmx/copyi.asm
diff --git a/ghc/rts/gmp/mpn/x86/k6/k62mmx/lshift.asm b/rts/gmp/mpn/x86/k6/k62mmx/lshift.asm
index f6d54f97a8..f6d54f97a8 100644
--- a/ghc/rts/gmp/mpn/x86/k6/k62mmx/lshift.asm
+++ b/rts/gmp/mpn/x86/k6/k62mmx/lshift.asm
diff --git a/ghc/rts/gmp/mpn/x86/k6/k62mmx/rshift.asm b/rts/gmp/mpn/x86/k6/k62mmx/rshift.asm
index 8a8c144241..8a8c144241 100644
--- a/ghc/rts/gmp/mpn/x86/k6/k62mmx/rshift.asm
+++ b/rts/gmp/mpn/x86/k6/k62mmx/rshift.asm
diff --git a/ghc/rts/gmp/mpn/x86/k6/mmx/com_n.asm b/rts/gmp/mpn/x86/k6/mmx/com_n.asm
index 8915080f0f..8915080f0f 100644
--- a/ghc/rts/gmp/mpn/x86/k6/mmx/com_n.asm
+++ b/rts/gmp/mpn/x86/k6/mmx/com_n.asm
diff --git a/ghc/rts/gmp/mpn/x86/k6/mmx/logops_n.asm b/rts/gmp/mpn/x86/k6/mmx/logops_n.asm
index 46cb3b7ea5..46cb3b7ea5 100644
--- a/ghc/rts/gmp/mpn/x86/k6/mmx/logops_n.asm
+++ b/rts/gmp/mpn/x86/k6/mmx/logops_n.asm
diff --git a/ghc/rts/gmp/mpn/x86/k6/mmx/lshift.asm b/rts/gmp/mpn/x86/k6/mmx/lshift.asm
index f1dc83db46..f1dc83db46 100644
--- a/ghc/rts/gmp/mpn/x86/k6/mmx/lshift.asm
+++ b/rts/gmp/mpn/x86/k6/mmx/lshift.asm
diff --git a/ghc/rts/gmp/mpn/x86/k6/mmx/popham.asm b/rts/gmp/mpn/x86/k6/mmx/popham.asm
index 2c619252bb..2c619252bb 100644
--- a/ghc/rts/gmp/mpn/x86/k6/mmx/popham.asm
+++ b/rts/gmp/mpn/x86/k6/mmx/popham.asm
diff --git a/ghc/rts/gmp/mpn/x86/k6/mmx/rshift.asm b/rts/gmp/mpn/x86/k6/mmx/rshift.asm
index cc5948f26c..cc5948f26c 100644
--- a/ghc/rts/gmp/mpn/x86/k6/mmx/rshift.asm
+++ b/rts/gmp/mpn/x86/k6/mmx/rshift.asm
diff --git a/ghc/rts/gmp/mpn/x86/k6/mul_1.asm b/rts/gmp/mpn/x86/k6/mul_1.asm
index c2220fe4ca..c2220fe4ca 100644
--- a/ghc/rts/gmp/mpn/x86/k6/mul_1.asm
+++ b/rts/gmp/mpn/x86/k6/mul_1.asm
diff --git a/ghc/rts/gmp/mpn/x86/k6/mul_basecase.asm b/rts/gmp/mpn/x86/k6/mul_basecase.asm
index 1f5a3a4b4b..1f5a3a4b4b 100644
--- a/ghc/rts/gmp/mpn/x86/k6/mul_basecase.asm
+++ b/rts/gmp/mpn/x86/k6/mul_basecase.asm
diff --git a/ghc/rts/gmp/mpn/x86/k6/sqr_basecase.asm b/rts/gmp/mpn/x86/k6/sqr_basecase.asm
index 70d49b3e57..70d49b3e57 100644
--- a/ghc/rts/gmp/mpn/x86/k6/sqr_basecase.asm
+++ b/rts/gmp/mpn/x86/k6/sqr_basecase.asm
diff --git a/ghc/rts/gmp/mpn/x86/k7/README b/rts/gmp/mpn/x86/k7/README
index c34315c401..c34315c401 100644
--- a/ghc/rts/gmp/mpn/x86/k7/README
+++ b/rts/gmp/mpn/x86/k7/README
diff --git a/ghc/rts/gmp/mpn/x86/k7/aors_n.asm b/rts/gmp/mpn/x86/k7/aors_n.asm
index 85fa9d3036..85fa9d3036 100644
--- a/ghc/rts/gmp/mpn/x86/k7/aors_n.asm
+++ b/rts/gmp/mpn/x86/k7/aors_n.asm
diff --git a/ghc/rts/gmp/mpn/x86/k7/aorsmul_1.asm b/rts/gmp/mpn/x86/k7/aorsmul_1.asm
index 9f9c3daaf4..9f9c3daaf4 100644
--- a/ghc/rts/gmp/mpn/x86/k7/aorsmul_1.asm
+++ b/rts/gmp/mpn/x86/k7/aorsmul_1.asm
diff --git a/ghc/rts/gmp/mpn/x86/k7/diveby3.asm b/rts/gmp/mpn/x86/k7/diveby3.asm
index 57684958a5..57684958a5 100644
--- a/ghc/rts/gmp/mpn/x86/k7/diveby3.asm
+++ b/rts/gmp/mpn/x86/k7/diveby3.asm
diff --git a/ghc/rts/gmp/mpn/x86/k7/gmp-mparam.h b/rts/gmp/mpn/x86/k7/gmp-mparam.h
index c3bba0afc4..c3bba0afc4 100644
--- a/ghc/rts/gmp/mpn/x86/k7/gmp-mparam.h
+++ b/rts/gmp/mpn/x86/k7/gmp-mparam.h
diff --git a/ghc/rts/gmp/mpn/x86/k7/mmx/copyd.asm b/rts/gmp/mpn/x86/k7/mmx/copyd.asm
index 33214daa1f..33214daa1f 100644
--- a/ghc/rts/gmp/mpn/x86/k7/mmx/copyd.asm
+++ b/rts/gmp/mpn/x86/k7/mmx/copyd.asm
diff --git a/ghc/rts/gmp/mpn/x86/k7/mmx/copyi.asm b/rts/gmp/mpn/x86/k7/mmx/copyi.asm
index b234a1628c..b234a1628c 100644
--- a/ghc/rts/gmp/mpn/x86/k7/mmx/copyi.asm
+++ b/rts/gmp/mpn/x86/k7/mmx/copyi.asm
diff --git a/ghc/rts/gmp/mpn/x86/k7/mmx/divrem_1.asm b/rts/gmp/mpn/x86/k7/mmx/divrem_1.asm
index 483ad6a9a1..483ad6a9a1 100644
--- a/ghc/rts/gmp/mpn/x86/k7/mmx/divrem_1.asm
+++ b/rts/gmp/mpn/x86/k7/mmx/divrem_1.asm
diff --git a/ghc/rts/gmp/mpn/x86/k7/mmx/lshift.asm b/rts/gmp/mpn/x86/k7/mmx/lshift.asm
index 4d17c881ec..4d17c881ec 100644
--- a/ghc/rts/gmp/mpn/x86/k7/mmx/lshift.asm
+++ b/rts/gmp/mpn/x86/k7/mmx/lshift.asm
diff --git a/ghc/rts/gmp/mpn/x86/k7/mmx/mod_1.asm b/rts/gmp/mpn/x86/k7/mmx/mod_1.asm
index 545ca56ddf..545ca56ddf 100644
--- a/ghc/rts/gmp/mpn/x86/k7/mmx/mod_1.asm
+++ b/rts/gmp/mpn/x86/k7/mmx/mod_1.asm
diff --git a/ghc/rts/gmp/mpn/x86/k7/mmx/popham.asm b/rts/gmp/mpn/x86/k7/mmx/popham.asm
index fa7c8c04a5..fa7c8c04a5 100644
--- a/ghc/rts/gmp/mpn/x86/k7/mmx/popham.asm
+++ b/rts/gmp/mpn/x86/k7/mmx/popham.asm
diff --git a/ghc/rts/gmp/mpn/x86/k7/mmx/rshift.asm b/rts/gmp/mpn/x86/k7/mmx/rshift.asm
index abb546cd5b..abb546cd5b 100644
--- a/ghc/rts/gmp/mpn/x86/k7/mmx/rshift.asm
+++ b/rts/gmp/mpn/x86/k7/mmx/rshift.asm
diff --git a/ghc/rts/gmp/mpn/x86/k7/mul_1.asm b/rts/gmp/mpn/x86/k7/mul_1.asm
index 07f7085b10..07f7085b10 100644
--- a/ghc/rts/gmp/mpn/x86/k7/mul_1.asm
+++ b/rts/gmp/mpn/x86/k7/mul_1.asm
diff --git a/ghc/rts/gmp/mpn/x86/k7/mul_basecase.asm b/rts/gmp/mpn/x86/k7/mul_basecase.asm
index c4be62e633..c4be62e633 100644
--- a/ghc/rts/gmp/mpn/x86/k7/mul_basecase.asm
+++ b/rts/gmp/mpn/x86/k7/mul_basecase.asm
diff --git a/ghc/rts/gmp/mpn/x86/k7/sqr_basecase.asm b/rts/gmp/mpn/x86/k7/sqr_basecase.asm
index 84861ea66b..84861ea66b 100644
--- a/ghc/rts/gmp/mpn/x86/k7/sqr_basecase.asm
+++ b/rts/gmp/mpn/x86/k7/sqr_basecase.asm
diff --git a/ghc/rts/gmp/mpn/x86/lshift.asm b/rts/gmp/mpn/x86/lshift.asm
index 4735335cbe..4735335cbe 100644
--- a/ghc/rts/gmp/mpn/x86/lshift.asm
+++ b/rts/gmp/mpn/x86/lshift.asm
diff --git a/ghc/rts/gmp/mpn/x86/mod_1.asm b/rts/gmp/mpn/x86/mod_1.asm
index 3908161b3e..3908161b3e 100644
--- a/ghc/rts/gmp/mpn/x86/mod_1.asm
+++ b/rts/gmp/mpn/x86/mod_1.asm
diff --git a/ghc/rts/gmp/mpn/x86/mul_1.asm b/rts/gmp/mpn/x86/mul_1.asm
index 8817f291bc..8817f291bc 100644
--- a/ghc/rts/gmp/mpn/x86/mul_1.asm
+++ b/rts/gmp/mpn/x86/mul_1.asm
diff --git a/ghc/rts/gmp/mpn/x86/mul_basecase.asm b/rts/gmp/mpn/x86/mul_basecase.asm
index 3a9b73895b..3a9b73895b 100644
--- a/ghc/rts/gmp/mpn/x86/mul_basecase.asm
+++ b/rts/gmp/mpn/x86/mul_basecase.asm
diff --git a/ghc/rts/gmp/mpn/x86/p6/README b/rts/gmp/mpn/x86/p6/README
index 7dbc905a0d..7dbc905a0d 100644
--- a/ghc/rts/gmp/mpn/x86/p6/README
+++ b/rts/gmp/mpn/x86/p6/README
diff --git a/ghc/rts/gmp/mpn/x86/p6/aorsmul_1.asm b/rts/gmp/mpn/x86/p6/aorsmul_1.asm
index feb364ec0b..feb364ec0b 100644
--- a/ghc/rts/gmp/mpn/x86/p6/aorsmul_1.asm
+++ b/rts/gmp/mpn/x86/p6/aorsmul_1.asm
diff --git a/ghc/rts/gmp/mpn/x86/p6/diveby3.asm b/rts/gmp/mpn/x86/p6/diveby3.asm
index a77703ea89..a77703ea89 100644
--- a/ghc/rts/gmp/mpn/x86/p6/diveby3.asm
+++ b/rts/gmp/mpn/x86/p6/diveby3.asm
diff --git a/ghc/rts/gmp/mpn/x86/p6/gmp-mparam.h b/rts/gmp/mpn/x86/p6/gmp-mparam.h
index d7bfb6d60c..d7bfb6d60c 100644
--- a/ghc/rts/gmp/mpn/x86/p6/gmp-mparam.h
+++ b/rts/gmp/mpn/x86/p6/gmp-mparam.h
diff --git a/ghc/rts/gmp/mpn/x86/p6/mmx/divrem_1.asm b/rts/gmp/mpn/x86/p6/mmx/divrem_1.asm
index f1b011b623..f1b011b623 100644
--- a/ghc/rts/gmp/mpn/x86/p6/mmx/divrem_1.asm
+++ b/rts/gmp/mpn/x86/p6/mmx/divrem_1.asm
diff --git a/ghc/rts/gmp/mpn/x86/p6/mmx/mod_1.asm b/rts/gmp/mpn/x86/p6/mmx/mod_1.asm
index e7d8d94d33..e7d8d94d33 100644
--- a/ghc/rts/gmp/mpn/x86/p6/mmx/mod_1.asm
+++ b/rts/gmp/mpn/x86/p6/mmx/mod_1.asm
diff --git a/ghc/rts/gmp/mpn/x86/p6/mmx/popham.asm b/rts/gmp/mpn/x86/p6/mmx/popham.asm
index 50f9a11218..50f9a11218 100644
--- a/ghc/rts/gmp/mpn/x86/p6/mmx/popham.asm
+++ b/rts/gmp/mpn/x86/p6/mmx/popham.asm
diff --git a/ghc/rts/gmp/mpn/x86/p6/p3mmx/popham.asm b/rts/gmp/mpn/x86/p6/p3mmx/popham.asm
index e63fbf334b..e63fbf334b 100644
--- a/ghc/rts/gmp/mpn/x86/p6/p3mmx/popham.asm
+++ b/rts/gmp/mpn/x86/p6/p3mmx/popham.asm
diff --git a/ghc/rts/gmp/mpn/x86/p6/sqr_basecase.asm b/rts/gmp/mpn/x86/p6/sqr_basecase.asm
index 174c78406a..174c78406a 100644
--- a/ghc/rts/gmp/mpn/x86/p6/sqr_basecase.asm
+++ b/rts/gmp/mpn/x86/p6/sqr_basecase.asm
diff --git a/ghc/rts/gmp/mpn/x86/pentium/README b/rts/gmp/mpn/x86/pentium/README
index 3b9ec8ac6f..3b9ec8ac6f 100644
--- a/ghc/rts/gmp/mpn/x86/pentium/README
+++ b/rts/gmp/mpn/x86/pentium/README
diff --git a/ghc/rts/gmp/mpn/x86/pentium/aors_n.asm b/rts/gmp/mpn/x86/pentium/aors_n.asm
index a61082a456..a61082a456 100644
--- a/ghc/rts/gmp/mpn/x86/pentium/aors_n.asm
+++ b/rts/gmp/mpn/x86/pentium/aors_n.asm
diff --git a/ghc/rts/gmp/mpn/x86/pentium/aorsmul_1.asm b/rts/gmp/mpn/x86/pentium/aorsmul_1.asm
index 147b55610f..147b55610f 100644
--- a/ghc/rts/gmp/mpn/x86/pentium/aorsmul_1.asm
+++ b/rts/gmp/mpn/x86/pentium/aorsmul_1.asm
diff --git a/ghc/rts/gmp/mpn/x86/pentium/diveby3.asm b/rts/gmp/mpn/x86/pentium/diveby3.asm
index dbac81642f..dbac81642f 100644
--- a/ghc/rts/gmp/mpn/x86/pentium/diveby3.asm
+++ b/rts/gmp/mpn/x86/pentium/diveby3.asm
diff --git a/ghc/rts/gmp/mpn/x86/pentium/gmp-mparam.h b/rts/gmp/mpn/x86/pentium/gmp-mparam.h
index d3ed3d73ce..d3ed3d73ce 100644
--- a/ghc/rts/gmp/mpn/x86/pentium/gmp-mparam.h
+++ b/rts/gmp/mpn/x86/pentium/gmp-mparam.h
diff --git a/ghc/rts/gmp/mpn/x86/pentium/lshift.asm b/rts/gmp/mpn/x86/pentium/lshift.asm
index e1e35d4c57..e1e35d4c57 100644
--- a/ghc/rts/gmp/mpn/x86/pentium/lshift.asm
+++ b/rts/gmp/mpn/x86/pentium/lshift.asm
diff --git a/ghc/rts/gmp/mpn/x86/pentium/mmx/gmp-mparam.h b/rts/gmp/mpn/x86/pentium/mmx/gmp-mparam.h
index 2379077d0c..2379077d0c 100644
--- a/ghc/rts/gmp/mpn/x86/pentium/mmx/gmp-mparam.h
+++ b/rts/gmp/mpn/x86/pentium/mmx/gmp-mparam.h
diff --git a/ghc/rts/gmp/mpn/x86/pentium/mmx/lshift.asm b/rts/gmp/mpn/x86/pentium/mmx/lshift.asm
index 2225438658..2225438658 100644
--- a/ghc/rts/gmp/mpn/x86/pentium/mmx/lshift.asm
+++ b/rts/gmp/mpn/x86/pentium/mmx/lshift.asm
diff --git a/ghc/rts/gmp/mpn/x86/pentium/mmx/popham.asm b/rts/gmp/mpn/x86/pentium/mmx/popham.asm
index 587a07ab3d..587a07ab3d 100644
--- a/ghc/rts/gmp/mpn/x86/pentium/mmx/popham.asm
+++ b/rts/gmp/mpn/x86/pentium/mmx/popham.asm
diff --git a/ghc/rts/gmp/mpn/x86/pentium/mmx/rshift.asm b/rts/gmp/mpn/x86/pentium/mmx/rshift.asm
index 7672630d57..7672630d57 100644
--- a/ghc/rts/gmp/mpn/x86/pentium/mmx/rshift.asm
+++ b/rts/gmp/mpn/x86/pentium/mmx/rshift.asm
diff --git a/ghc/rts/gmp/mpn/x86/pentium/mul_1.asm b/rts/gmp/mpn/x86/pentium/mul_1.asm
index 08639eca09..08639eca09 100644
--- a/ghc/rts/gmp/mpn/x86/pentium/mul_1.asm
+++ b/rts/gmp/mpn/x86/pentium/mul_1.asm
diff --git a/ghc/rts/gmp/mpn/x86/pentium/mul_basecase.asm b/rts/gmp/mpn/x86/pentium/mul_basecase.asm
index d9f79a0831..d9f79a0831 100644
--- a/ghc/rts/gmp/mpn/x86/pentium/mul_basecase.asm
+++ b/rts/gmp/mpn/x86/pentium/mul_basecase.asm
diff --git a/ghc/rts/gmp/mpn/x86/pentium/rshift.asm b/rts/gmp/mpn/x86/pentium/rshift.asm
index e8f5ae8ec8..e8f5ae8ec8 100644
--- a/ghc/rts/gmp/mpn/x86/pentium/rshift.asm
+++ b/rts/gmp/mpn/x86/pentium/rshift.asm
diff --git a/ghc/rts/gmp/mpn/x86/pentium/sqr_basecase.asm b/rts/gmp/mpn/x86/pentium/sqr_basecase.asm
index c8584df13c..c8584df13c 100644
--- a/ghc/rts/gmp/mpn/x86/pentium/sqr_basecase.asm
+++ b/rts/gmp/mpn/x86/pentium/sqr_basecase.asm
diff --git a/ghc/rts/gmp/mpn/x86/rshift.asm b/rts/gmp/mpn/x86/rshift.asm
index c9881fd966..c9881fd966 100644
--- a/ghc/rts/gmp/mpn/x86/rshift.asm
+++ b/rts/gmp/mpn/x86/rshift.asm
diff --git a/ghc/rts/gmp/mpn/x86/udiv.asm b/rts/gmp/mpn/x86/udiv.asm
index 9fe022b107..9fe022b107 100644
--- a/ghc/rts/gmp/mpn/x86/udiv.asm
+++ b/rts/gmp/mpn/x86/udiv.asm
diff --git a/ghc/rts/gmp/mpn/x86/umul.asm b/rts/gmp/mpn/x86/umul.asm
index 3d289d1784..3d289d1784 100644
--- a/ghc/rts/gmp/mpn/x86/umul.asm
+++ b/rts/gmp/mpn/x86/umul.asm
diff --git a/ghc/rts/gmp/mpn/x86/x86-defs.m4 b/rts/gmp/mpn/x86/x86-defs.m4
index 2dad698002..2dad698002 100644
--- a/ghc/rts/gmp/mpn/x86/x86-defs.m4
+++ b/rts/gmp/mpn/x86/x86-defs.m4
diff --git a/ghc/rts/gmp/mpn/z8000/add_n.s b/rts/gmp/mpn/z8000/add_n.s
index 3a136107fe..3a136107fe 100644
--- a/ghc/rts/gmp/mpn/z8000/add_n.s
+++ b/rts/gmp/mpn/z8000/add_n.s
diff --git a/ghc/rts/gmp/mpn/z8000/gmp-mparam.h b/rts/gmp/mpn/z8000/gmp-mparam.h
index 4216df673c..4216df673c 100644
--- a/ghc/rts/gmp/mpn/z8000/gmp-mparam.h
+++ b/rts/gmp/mpn/z8000/gmp-mparam.h
diff --git a/ghc/rts/gmp/mpn/z8000/mul_1.s b/rts/gmp/mpn/z8000/mul_1.s
index 20fadd340a..20fadd340a 100644
--- a/ghc/rts/gmp/mpn/z8000/mul_1.s
+++ b/rts/gmp/mpn/z8000/mul_1.s
diff --git a/ghc/rts/gmp/mpn/z8000/sub_n.s b/rts/gmp/mpn/z8000/sub_n.s
index bd9a7ad409..bd9a7ad409 100644
--- a/ghc/rts/gmp/mpn/z8000/sub_n.s
+++ b/rts/gmp/mpn/z8000/sub_n.s
diff --git a/ghc/rts/gmp/mpn/z8000x/add_n.s b/rts/gmp/mpn/z8000x/add_n.s
index 7f130785c5..7f130785c5 100644
--- a/ghc/rts/gmp/mpn/z8000x/add_n.s
+++ b/rts/gmp/mpn/z8000x/add_n.s
diff --git a/ghc/rts/gmp/mpn/z8000x/sub_n.s b/rts/gmp/mpn/z8000x/sub_n.s
index f416d1d6eb..f416d1d6eb 100644
--- a/ghc/rts/gmp/mpn/z8000x/sub_n.s
+++ b/rts/gmp/mpn/z8000x/sub_n.s
diff --git a/ghc/rts/gmp/mpz/Makefile.am b/rts/gmp/mpz/Makefile.am
index cd6fec4e21..cd6fec4e21 100644
--- a/ghc/rts/gmp/mpz/Makefile.am
+++ b/rts/gmp/mpz/Makefile.am
diff --git a/ghc/rts/gmp/mpz/Makefile.in b/rts/gmp/mpz/Makefile.in
index e0f2cdc133..e0f2cdc133 100644
--- a/ghc/rts/gmp/mpz/Makefile.in
+++ b/rts/gmp/mpz/Makefile.in
diff --git a/ghc/rts/gmp/mpz/README b/rts/gmp/mpz/README
index 06b481d770..06b481d770 100644
--- a/ghc/rts/gmp/mpz/README
+++ b/rts/gmp/mpz/README
diff --git a/ghc/rts/gmp/mpz/abs.c b/rts/gmp/mpz/abs.c
index 0b5eab1ce6..0b5eab1ce6 100644
--- a/ghc/rts/gmp/mpz/abs.c
+++ b/rts/gmp/mpz/abs.c
diff --git a/ghc/rts/gmp/mpz/add.c b/rts/gmp/mpz/add.c
index a22c3778fb..a22c3778fb 100644
--- a/ghc/rts/gmp/mpz/add.c
+++ b/rts/gmp/mpz/add.c
diff --git a/ghc/rts/gmp/mpz/add_ui.c b/rts/gmp/mpz/add_ui.c
index 28dbd71f45..28dbd71f45 100644
--- a/ghc/rts/gmp/mpz/add_ui.c
+++ b/rts/gmp/mpz/add_ui.c
diff --git a/ghc/rts/gmp/mpz/addmul_ui.c b/rts/gmp/mpz/addmul_ui.c
index 7b38d3624d..7b38d3624d 100644
--- a/ghc/rts/gmp/mpz/addmul_ui.c
+++ b/rts/gmp/mpz/addmul_ui.c
diff --git a/ghc/rts/gmp/mpz/and.c b/rts/gmp/mpz/and.c
index 354e9455bf..354e9455bf 100644
--- a/ghc/rts/gmp/mpz/and.c
+++ b/rts/gmp/mpz/and.c
diff --git a/ghc/rts/gmp/mpz/array_init.c b/rts/gmp/mpz/array_init.c
index 1c22046986..1c22046986 100644
--- a/ghc/rts/gmp/mpz/array_init.c
+++ b/rts/gmp/mpz/array_init.c
diff --git a/ghc/rts/gmp/mpz/bin_ui.c b/rts/gmp/mpz/bin_ui.c
index a7a6c98218..a7a6c98218 100644
--- a/ghc/rts/gmp/mpz/bin_ui.c
+++ b/rts/gmp/mpz/bin_ui.c
diff --git a/ghc/rts/gmp/mpz/bin_uiui.c b/rts/gmp/mpz/bin_uiui.c
index b37541ba54..b37541ba54 100644
--- a/ghc/rts/gmp/mpz/bin_uiui.c
+++ b/rts/gmp/mpz/bin_uiui.c
diff --git a/ghc/rts/gmp/mpz/cdiv_q.c b/rts/gmp/mpz/cdiv_q.c
index b15ba8aaa9..b15ba8aaa9 100644
--- a/ghc/rts/gmp/mpz/cdiv_q.c
+++ b/rts/gmp/mpz/cdiv_q.c
diff --git a/ghc/rts/gmp/mpz/cdiv_q_ui.c b/rts/gmp/mpz/cdiv_q_ui.c
index 74f3a90b83..74f3a90b83 100644
--- a/ghc/rts/gmp/mpz/cdiv_q_ui.c
+++ b/rts/gmp/mpz/cdiv_q_ui.c
diff --git a/ghc/rts/gmp/mpz/cdiv_qr.c b/rts/gmp/mpz/cdiv_qr.c
index 29c7c41a4e..29c7c41a4e 100644
--- a/ghc/rts/gmp/mpz/cdiv_qr.c
+++ b/rts/gmp/mpz/cdiv_qr.c
diff --git a/ghc/rts/gmp/mpz/cdiv_qr_ui.c b/rts/gmp/mpz/cdiv_qr_ui.c
index a7873c6e20..a7873c6e20 100644
--- a/ghc/rts/gmp/mpz/cdiv_qr_ui.c
+++ b/rts/gmp/mpz/cdiv_qr_ui.c
diff --git a/ghc/rts/gmp/mpz/cdiv_r.c b/rts/gmp/mpz/cdiv_r.c
index e96ce7e677..e96ce7e677 100644
--- a/ghc/rts/gmp/mpz/cdiv_r.c
+++ b/rts/gmp/mpz/cdiv_r.c
diff --git a/ghc/rts/gmp/mpz/cdiv_r_ui.c b/rts/gmp/mpz/cdiv_r_ui.c
index e17e2381c0..e17e2381c0 100644
--- a/ghc/rts/gmp/mpz/cdiv_r_ui.c
+++ b/rts/gmp/mpz/cdiv_r_ui.c
diff --git a/ghc/rts/gmp/mpz/cdiv_ui.c b/rts/gmp/mpz/cdiv_ui.c
index 63547a78c0..63547a78c0 100644
--- a/ghc/rts/gmp/mpz/cdiv_ui.c
+++ b/rts/gmp/mpz/cdiv_ui.c
diff --git a/ghc/rts/gmp/mpz/clear.c b/rts/gmp/mpz/clear.c
index 5224553f9e..5224553f9e 100644
--- a/ghc/rts/gmp/mpz/clear.c
+++ b/rts/gmp/mpz/clear.c
diff --git a/ghc/rts/gmp/mpz/clrbit.c b/rts/gmp/mpz/clrbit.c
index 865d84902f..865d84902f 100644
--- a/ghc/rts/gmp/mpz/clrbit.c
+++ b/rts/gmp/mpz/clrbit.c
diff --git a/ghc/rts/gmp/mpz/cmp.c b/rts/gmp/mpz/cmp.c
index 60628348e5..60628348e5 100644
--- a/ghc/rts/gmp/mpz/cmp.c
+++ b/rts/gmp/mpz/cmp.c
diff --git a/ghc/rts/gmp/mpz/cmp_si.c b/rts/gmp/mpz/cmp_si.c
index 0c2212fbe9..0c2212fbe9 100644
--- a/ghc/rts/gmp/mpz/cmp_si.c
+++ b/rts/gmp/mpz/cmp_si.c
diff --git a/ghc/rts/gmp/mpz/cmp_ui.c b/rts/gmp/mpz/cmp_ui.c
index fd84f301c1..fd84f301c1 100644
--- a/ghc/rts/gmp/mpz/cmp_ui.c
+++ b/rts/gmp/mpz/cmp_ui.c
diff --git a/ghc/rts/gmp/mpz/cmpabs.c b/rts/gmp/mpz/cmpabs.c
index 037d7a9145..037d7a9145 100644
--- a/ghc/rts/gmp/mpz/cmpabs.c
+++ b/rts/gmp/mpz/cmpabs.c
diff --git a/ghc/rts/gmp/mpz/cmpabs_ui.c b/rts/gmp/mpz/cmpabs_ui.c
index db816b5820..db816b5820 100644
--- a/ghc/rts/gmp/mpz/cmpabs_ui.c
+++ b/rts/gmp/mpz/cmpabs_ui.c
diff --git a/ghc/rts/gmp/mpz/com.c b/rts/gmp/mpz/com.c
index 18d6427779..18d6427779 100644
--- a/ghc/rts/gmp/mpz/com.c
+++ b/rts/gmp/mpz/com.c
diff --git a/ghc/rts/gmp/mpz/divexact.c b/rts/gmp/mpz/divexact.c
index c2970454fd..c2970454fd 100644
--- a/ghc/rts/gmp/mpz/divexact.c
+++ b/rts/gmp/mpz/divexact.c
diff --git a/ghc/rts/gmp/mpz/dump.c b/rts/gmp/mpz/dump.c
index dc318ac8cf..dc318ac8cf 100644
--- a/ghc/rts/gmp/mpz/dump.c
+++ b/rts/gmp/mpz/dump.c
diff --git a/ghc/rts/gmp/mpz/fac_ui.c b/rts/gmp/mpz/fac_ui.c
index 85f40f271c..85f40f271c 100644
--- a/ghc/rts/gmp/mpz/fac_ui.c
+++ b/rts/gmp/mpz/fac_ui.c
diff --git a/ghc/rts/gmp/mpz/fdiv_q.c b/rts/gmp/mpz/fdiv_q.c
index 9d75ca33d2..9d75ca33d2 100644
--- a/ghc/rts/gmp/mpz/fdiv_q.c
+++ b/rts/gmp/mpz/fdiv_q.c
diff --git a/ghc/rts/gmp/mpz/fdiv_q_2exp.c b/rts/gmp/mpz/fdiv_q_2exp.c
index 8e02180ecc..8e02180ecc 100644
--- a/ghc/rts/gmp/mpz/fdiv_q_2exp.c
+++ b/rts/gmp/mpz/fdiv_q_2exp.c
diff --git a/ghc/rts/gmp/mpz/fdiv_q_ui.c b/rts/gmp/mpz/fdiv_q_ui.c
index 55d2498693..55d2498693 100644
--- a/ghc/rts/gmp/mpz/fdiv_q_ui.c
+++ b/rts/gmp/mpz/fdiv_q_ui.c
diff --git a/ghc/rts/gmp/mpz/fdiv_qr.c b/rts/gmp/mpz/fdiv_qr.c
index 06ce50607b..06ce50607b 100644
--- a/ghc/rts/gmp/mpz/fdiv_qr.c
+++ b/rts/gmp/mpz/fdiv_qr.c
diff --git a/ghc/rts/gmp/mpz/fdiv_qr_ui.c b/rts/gmp/mpz/fdiv_qr_ui.c
index 600c0dacfc..600c0dacfc 100644
--- a/ghc/rts/gmp/mpz/fdiv_qr_ui.c
+++ b/rts/gmp/mpz/fdiv_qr_ui.c
diff --git a/ghc/rts/gmp/mpz/fdiv_r.c b/rts/gmp/mpz/fdiv_r.c
index a3652838d2..a3652838d2 100644
--- a/ghc/rts/gmp/mpz/fdiv_r.c
+++ b/rts/gmp/mpz/fdiv_r.c
diff --git a/ghc/rts/gmp/mpz/fdiv_r_2exp.c b/rts/gmp/mpz/fdiv_r_2exp.c
index 081ce19203..081ce19203 100644
--- a/ghc/rts/gmp/mpz/fdiv_r_2exp.c
+++ b/rts/gmp/mpz/fdiv_r_2exp.c
diff --git a/ghc/rts/gmp/mpz/fdiv_r_ui.c b/rts/gmp/mpz/fdiv_r_ui.c
index dd5c743d27..dd5c743d27 100644
--- a/ghc/rts/gmp/mpz/fdiv_r_ui.c
+++ b/rts/gmp/mpz/fdiv_r_ui.c
diff --git a/ghc/rts/gmp/mpz/fdiv_ui.c b/rts/gmp/mpz/fdiv_ui.c
index f937b5f6d0..f937b5f6d0 100644
--- a/ghc/rts/gmp/mpz/fdiv_ui.c
+++ b/rts/gmp/mpz/fdiv_ui.c
diff --git a/ghc/rts/gmp/mpz/fib_ui.c b/rts/gmp/mpz/fib_ui.c
index 4bebb80d94..4bebb80d94 100644
--- a/ghc/rts/gmp/mpz/fib_ui.c
+++ b/rts/gmp/mpz/fib_ui.c
diff --git a/ghc/rts/gmp/mpz/fits_sint_p.c b/rts/gmp/mpz/fits_sint_p.c
index 82e32a24d5..82e32a24d5 100644
--- a/ghc/rts/gmp/mpz/fits_sint_p.c
+++ b/rts/gmp/mpz/fits_sint_p.c
diff --git a/ghc/rts/gmp/mpz/fits_slong_p.c b/rts/gmp/mpz/fits_slong_p.c
index e0669b5aaa..e0669b5aaa 100644
--- a/ghc/rts/gmp/mpz/fits_slong_p.c
+++ b/rts/gmp/mpz/fits_slong_p.c
diff --git a/ghc/rts/gmp/mpz/fits_sshort_p.c b/rts/gmp/mpz/fits_sshort_p.c
index 5b8e31afae..5b8e31afae 100644
--- a/ghc/rts/gmp/mpz/fits_sshort_p.c
+++ b/rts/gmp/mpz/fits_sshort_p.c
diff --git a/ghc/rts/gmp/mpz/fits_uint_p.c b/rts/gmp/mpz/fits_uint_p.c
index 72f62fa723..72f62fa723 100644
--- a/ghc/rts/gmp/mpz/fits_uint_p.c
+++ b/rts/gmp/mpz/fits_uint_p.c
diff --git a/ghc/rts/gmp/mpz/fits_ulong_p.c b/rts/gmp/mpz/fits_ulong_p.c
index 92eb42e86e..92eb42e86e 100644
--- a/ghc/rts/gmp/mpz/fits_ulong_p.c
+++ b/rts/gmp/mpz/fits_ulong_p.c
diff --git a/ghc/rts/gmp/mpz/fits_ushort_p.c b/rts/gmp/mpz/fits_ushort_p.c
index bde0edae6e..bde0edae6e 100644
--- a/ghc/rts/gmp/mpz/fits_ushort_p.c
+++ b/rts/gmp/mpz/fits_ushort_p.c
diff --git a/ghc/rts/gmp/mpz/gcd.c b/rts/gmp/mpz/gcd.c
index 0d950dd609..0d950dd609 100644
--- a/ghc/rts/gmp/mpz/gcd.c
+++ b/rts/gmp/mpz/gcd.c
diff --git a/ghc/rts/gmp/mpz/gcd_ui.c b/rts/gmp/mpz/gcd_ui.c
index f3bec58829..f3bec58829 100644
--- a/ghc/rts/gmp/mpz/gcd_ui.c
+++ b/rts/gmp/mpz/gcd_ui.c
diff --git a/ghc/rts/gmp/mpz/gcdext.c b/rts/gmp/mpz/gcdext.c
index 3ba04c84ff..3ba04c84ff 100644
--- a/ghc/rts/gmp/mpz/gcdext.c
+++ b/rts/gmp/mpz/gcdext.c
diff --git a/ghc/rts/gmp/mpz/get_d.c b/rts/gmp/mpz/get_d.c
index 6a7c5856bb..6a7c5856bb 100644
--- a/ghc/rts/gmp/mpz/get_d.c
+++ b/rts/gmp/mpz/get_d.c
diff --git a/ghc/rts/gmp/mpz/get_si.c b/rts/gmp/mpz/get_si.c
index 8a5d0e4803..8a5d0e4803 100644
--- a/ghc/rts/gmp/mpz/get_si.c
+++ b/rts/gmp/mpz/get_si.c
diff --git a/ghc/rts/gmp/mpz/get_str.c b/rts/gmp/mpz/get_str.c
index c7278afb52..c7278afb52 100644
--- a/ghc/rts/gmp/mpz/get_str.c
+++ b/rts/gmp/mpz/get_str.c
diff --git a/ghc/rts/gmp/mpz/get_ui.c b/rts/gmp/mpz/get_ui.c
index a8ec9e01a4..a8ec9e01a4 100644
--- a/ghc/rts/gmp/mpz/get_ui.c
+++ b/rts/gmp/mpz/get_ui.c
diff --git a/ghc/rts/gmp/mpz/getlimbn.c b/rts/gmp/mpz/getlimbn.c
index b772ed05c4..b772ed05c4 100644
--- a/ghc/rts/gmp/mpz/getlimbn.c
+++ b/rts/gmp/mpz/getlimbn.c
diff --git a/ghc/rts/gmp/mpz/hamdist.c b/rts/gmp/mpz/hamdist.c
index b039a653d2..b039a653d2 100644
--- a/ghc/rts/gmp/mpz/hamdist.c
+++ b/rts/gmp/mpz/hamdist.c
diff --git a/ghc/rts/gmp/mpz/init.c b/rts/gmp/mpz/init.c
index 2e8e4d2cbd..2e8e4d2cbd 100644
--- a/ghc/rts/gmp/mpz/init.c
+++ b/rts/gmp/mpz/init.c
diff --git a/ghc/rts/gmp/mpz/inp_raw.c b/rts/gmp/mpz/inp_raw.c
index 15e601229d..15e601229d 100644
--- a/ghc/rts/gmp/mpz/inp_raw.c
+++ b/rts/gmp/mpz/inp_raw.c
diff --git a/ghc/rts/gmp/mpz/inp_str.c b/rts/gmp/mpz/inp_str.c
index 7aa5e1fc30..7aa5e1fc30 100644
--- a/ghc/rts/gmp/mpz/inp_str.c
+++ b/rts/gmp/mpz/inp_str.c
diff --git a/ghc/rts/gmp/mpz/invert.c b/rts/gmp/mpz/invert.c
index 749a0969fc..749a0969fc 100644
--- a/ghc/rts/gmp/mpz/invert.c
+++ b/rts/gmp/mpz/invert.c
diff --git a/ghc/rts/gmp/mpz/ior.c b/rts/gmp/mpz/ior.c
index 0bb5a806dc..0bb5a806dc 100644
--- a/ghc/rts/gmp/mpz/ior.c
+++ b/rts/gmp/mpz/ior.c
diff --git a/ghc/rts/gmp/mpz/iset.c b/rts/gmp/mpz/iset.c
index 114bc2d542..114bc2d542 100644
--- a/ghc/rts/gmp/mpz/iset.c
+++ b/rts/gmp/mpz/iset.c
diff --git a/ghc/rts/gmp/mpz/iset_d.c b/rts/gmp/mpz/iset_d.c
index 502a8933e2..502a8933e2 100644
--- a/ghc/rts/gmp/mpz/iset_d.c
+++ b/rts/gmp/mpz/iset_d.c
diff --git a/ghc/rts/gmp/mpz/iset_si.c b/rts/gmp/mpz/iset_si.c
index 842db140ef..842db140ef 100644
--- a/ghc/rts/gmp/mpz/iset_si.c
+++ b/rts/gmp/mpz/iset_si.c
diff --git a/ghc/rts/gmp/mpz/iset_str.c b/rts/gmp/mpz/iset_str.c
index dfb8c6b230..dfb8c6b230 100644
--- a/ghc/rts/gmp/mpz/iset_str.c
+++ b/rts/gmp/mpz/iset_str.c
diff --git a/ghc/rts/gmp/mpz/iset_ui.c b/rts/gmp/mpz/iset_ui.c
index 759182c556..759182c556 100644
--- a/ghc/rts/gmp/mpz/iset_ui.c
+++ b/rts/gmp/mpz/iset_ui.c
diff --git a/ghc/rts/gmp/mpz/jacobi.c b/rts/gmp/mpz/jacobi.c
index 9d49e1d0c6..9d49e1d0c6 100644
--- a/ghc/rts/gmp/mpz/jacobi.c
+++ b/rts/gmp/mpz/jacobi.c
diff --git a/ghc/rts/gmp/mpz/kronsz.c b/rts/gmp/mpz/kronsz.c
index c8c6752224..c8c6752224 100644
--- a/ghc/rts/gmp/mpz/kronsz.c
+++ b/rts/gmp/mpz/kronsz.c
diff --git a/ghc/rts/gmp/mpz/kronuz.c b/rts/gmp/mpz/kronuz.c
index b877e6f64c..b877e6f64c 100644
--- a/ghc/rts/gmp/mpz/kronuz.c
+++ b/rts/gmp/mpz/kronuz.c
diff --git a/ghc/rts/gmp/mpz/kronzs.c b/rts/gmp/mpz/kronzs.c
index edfb465976..edfb465976 100644
--- a/ghc/rts/gmp/mpz/kronzs.c
+++ b/rts/gmp/mpz/kronzs.c
diff --git a/ghc/rts/gmp/mpz/kronzu.c b/rts/gmp/mpz/kronzu.c
index 749be5df07..749be5df07 100644
--- a/ghc/rts/gmp/mpz/kronzu.c
+++ b/rts/gmp/mpz/kronzu.c
diff --git a/ghc/rts/gmp/mpz/lcm.c b/rts/gmp/mpz/lcm.c
index 7495882ae5..7495882ae5 100644
--- a/ghc/rts/gmp/mpz/lcm.c
+++ b/rts/gmp/mpz/lcm.c
diff --git a/ghc/rts/gmp/mpz/legendre.c b/rts/gmp/mpz/legendre.c
index ab665f70d0..ab665f70d0 100644
--- a/ghc/rts/gmp/mpz/legendre.c
+++ b/rts/gmp/mpz/legendre.c
diff --git a/ghc/rts/gmp/mpz/mod.c b/rts/gmp/mpz/mod.c
index 87033b333b..87033b333b 100644
--- a/ghc/rts/gmp/mpz/mod.c
+++ b/rts/gmp/mpz/mod.c
diff --git a/ghc/rts/gmp/mpz/mul.c b/rts/gmp/mpz/mul.c
index 7854788e50..7854788e50 100644
--- a/ghc/rts/gmp/mpz/mul.c
+++ b/rts/gmp/mpz/mul.c
diff --git a/ghc/rts/gmp/mpz/mul_2exp.c b/rts/gmp/mpz/mul_2exp.c
index abea5fed2c..abea5fed2c 100644
--- a/ghc/rts/gmp/mpz/mul_2exp.c
+++ b/rts/gmp/mpz/mul_2exp.c
diff --git a/ghc/rts/gmp/mpz/mul_siui.c b/rts/gmp/mpz/mul_siui.c
index 9849cd41b0..9849cd41b0 100644
--- a/ghc/rts/gmp/mpz/mul_siui.c
+++ b/rts/gmp/mpz/mul_siui.c
diff --git a/ghc/rts/gmp/mpz/neg.c b/rts/gmp/mpz/neg.c
index 566c3a95aa..566c3a95aa 100644
--- a/ghc/rts/gmp/mpz/neg.c
+++ b/rts/gmp/mpz/neg.c
diff --git a/ghc/rts/gmp/mpz/nextprime.c b/rts/gmp/mpz/nextprime.c
index f024dd1206..f024dd1206 100644
--- a/ghc/rts/gmp/mpz/nextprime.c
+++ b/rts/gmp/mpz/nextprime.c
diff --git a/ghc/rts/gmp/mpz/out_raw.c b/rts/gmp/mpz/out_raw.c
index 62709479c5..62709479c5 100644
--- a/ghc/rts/gmp/mpz/out_raw.c
+++ b/rts/gmp/mpz/out_raw.c
diff --git a/ghc/rts/gmp/mpz/out_str.c b/rts/gmp/mpz/out_str.c
index bf971b0057..bf971b0057 100644
--- a/ghc/rts/gmp/mpz/out_str.c
+++ b/rts/gmp/mpz/out_str.c
diff --git a/ghc/rts/gmp/mpz/perfpow.c b/rts/gmp/mpz/perfpow.c
index e71670a0be..e71670a0be 100644
--- a/ghc/rts/gmp/mpz/perfpow.c
+++ b/rts/gmp/mpz/perfpow.c
diff --git a/ghc/rts/gmp/mpz/perfsqr.c b/rts/gmp/mpz/perfsqr.c
index 92e8d08ea9..92e8d08ea9 100644
--- a/ghc/rts/gmp/mpz/perfsqr.c
+++ b/rts/gmp/mpz/perfsqr.c
diff --git a/ghc/rts/gmp/mpz/popcount.c b/rts/gmp/mpz/popcount.c
index 3105258e26..3105258e26 100644
--- a/ghc/rts/gmp/mpz/popcount.c
+++ b/rts/gmp/mpz/popcount.c
diff --git a/ghc/rts/gmp/mpz/pow_ui.c b/rts/gmp/mpz/pow_ui.c
index 96ca114e4d..96ca114e4d 100644
--- a/ghc/rts/gmp/mpz/pow_ui.c
+++ b/rts/gmp/mpz/pow_ui.c
diff --git a/ghc/rts/gmp/mpz/powm.c b/rts/gmp/mpz/powm.c
index e6af855a71..e6af855a71 100644
--- a/ghc/rts/gmp/mpz/powm.c
+++ b/rts/gmp/mpz/powm.c
diff --git a/ghc/rts/gmp/mpz/powm_ui.c b/rts/gmp/mpz/powm_ui.c
index 00f70bd563..00f70bd563 100644
--- a/ghc/rts/gmp/mpz/powm_ui.c
+++ b/rts/gmp/mpz/powm_ui.c
diff --git a/ghc/rts/gmp/mpz/pprime_p.c b/rts/gmp/mpz/pprime_p.c
index 82eb678238..82eb678238 100644
--- a/ghc/rts/gmp/mpz/pprime_p.c
+++ b/rts/gmp/mpz/pprime_p.c
diff --git a/ghc/rts/gmp/mpz/random.c b/rts/gmp/mpz/random.c
index 60d9113991..60d9113991 100644
--- a/ghc/rts/gmp/mpz/random.c
+++ b/rts/gmp/mpz/random.c
diff --git a/ghc/rts/gmp/mpz/random2.c b/rts/gmp/mpz/random2.c
index a90af115e9..a90af115e9 100644
--- a/ghc/rts/gmp/mpz/random2.c
+++ b/rts/gmp/mpz/random2.c
diff --git a/ghc/rts/gmp/mpz/realloc.c b/rts/gmp/mpz/realloc.c
index 0b9e447ec3..0b9e447ec3 100644
--- a/ghc/rts/gmp/mpz/realloc.c
+++ b/rts/gmp/mpz/realloc.c
diff --git a/ghc/rts/gmp/mpz/remove.c b/rts/gmp/mpz/remove.c
index bc6675f972..bc6675f972 100644
--- a/ghc/rts/gmp/mpz/remove.c
+++ b/rts/gmp/mpz/remove.c
diff --git a/ghc/rts/gmp/mpz/root.c b/rts/gmp/mpz/root.c
index 0920bf22d3..0920bf22d3 100644
--- a/ghc/rts/gmp/mpz/root.c
+++ b/rts/gmp/mpz/root.c
diff --git a/ghc/rts/gmp/mpz/rrandomb.c b/rts/gmp/mpz/rrandomb.c
index 7d78243674..7d78243674 100644
--- a/ghc/rts/gmp/mpz/rrandomb.c
+++ b/rts/gmp/mpz/rrandomb.c
diff --git a/ghc/rts/gmp/mpz/scan0.c b/rts/gmp/mpz/scan0.c
index 6c59cf8939..6c59cf8939 100644
--- a/ghc/rts/gmp/mpz/scan0.c
+++ b/rts/gmp/mpz/scan0.c
diff --git a/ghc/rts/gmp/mpz/scan1.c b/rts/gmp/mpz/scan1.c
index 3b84e3420c..3b84e3420c 100644
--- a/ghc/rts/gmp/mpz/scan1.c
+++ b/rts/gmp/mpz/scan1.c
diff --git a/ghc/rts/gmp/mpz/set.c b/rts/gmp/mpz/set.c
index 06b2eef511..06b2eef511 100644
--- a/ghc/rts/gmp/mpz/set.c
+++ b/rts/gmp/mpz/set.c
diff --git a/ghc/rts/gmp/mpz/set_d.c b/rts/gmp/mpz/set_d.c
index e90ed9bc2f..e90ed9bc2f 100644
--- a/ghc/rts/gmp/mpz/set_d.c
+++ b/rts/gmp/mpz/set_d.c
diff --git a/ghc/rts/gmp/mpz/set_f.c b/rts/gmp/mpz/set_f.c
index 2273953dfd..2273953dfd 100644
--- a/ghc/rts/gmp/mpz/set_f.c
+++ b/rts/gmp/mpz/set_f.c
diff --git a/ghc/rts/gmp/mpz/set_q.c b/rts/gmp/mpz/set_q.c
index 72d3222a80..72d3222a80 100644
--- a/ghc/rts/gmp/mpz/set_q.c
+++ b/rts/gmp/mpz/set_q.c
diff --git a/ghc/rts/gmp/mpz/set_si.c b/rts/gmp/mpz/set_si.c
index 9ba2fbaf30..9ba2fbaf30 100644
--- a/ghc/rts/gmp/mpz/set_si.c
+++ b/rts/gmp/mpz/set_si.c
diff --git a/ghc/rts/gmp/mpz/set_str.c b/rts/gmp/mpz/set_str.c
index 3ab79c0e89..3ab79c0e89 100644
--- a/ghc/rts/gmp/mpz/set_str.c
+++ b/rts/gmp/mpz/set_str.c
diff --git a/ghc/rts/gmp/mpz/set_ui.c b/rts/gmp/mpz/set_ui.c
index d6097c170a..d6097c170a 100644
--- a/ghc/rts/gmp/mpz/set_ui.c
+++ b/rts/gmp/mpz/set_ui.c
diff --git a/ghc/rts/gmp/mpz/setbit.c b/rts/gmp/mpz/setbit.c
index d4249a434e..d4249a434e 100644
--- a/ghc/rts/gmp/mpz/setbit.c
+++ b/rts/gmp/mpz/setbit.c
diff --git a/ghc/rts/gmp/mpz/size.c b/rts/gmp/mpz/size.c
index 6574756783..6574756783 100644
--- a/ghc/rts/gmp/mpz/size.c
+++ b/rts/gmp/mpz/size.c
diff --git a/ghc/rts/gmp/mpz/sizeinbase.c b/rts/gmp/mpz/sizeinbase.c
index 734f9c4532..734f9c4532 100644
--- a/ghc/rts/gmp/mpz/sizeinbase.c
+++ b/rts/gmp/mpz/sizeinbase.c
diff --git a/ghc/rts/gmp/mpz/sqrt.c b/rts/gmp/mpz/sqrt.c
index fe82fe407a..fe82fe407a 100644
--- a/ghc/rts/gmp/mpz/sqrt.c
+++ b/rts/gmp/mpz/sqrt.c
diff --git a/ghc/rts/gmp/mpz/sqrtrem.c b/rts/gmp/mpz/sqrtrem.c
index 99a6453122..99a6453122 100644
--- a/ghc/rts/gmp/mpz/sqrtrem.c
+++ b/rts/gmp/mpz/sqrtrem.c
diff --git a/ghc/rts/gmp/mpz/sub.c b/rts/gmp/mpz/sub.c
index f3ae7c23a0..f3ae7c23a0 100644
--- a/ghc/rts/gmp/mpz/sub.c
+++ b/rts/gmp/mpz/sub.c
diff --git a/ghc/rts/gmp/mpz/sub_ui.c b/rts/gmp/mpz/sub_ui.c
index 327add8503..327add8503 100644
--- a/ghc/rts/gmp/mpz/sub_ui.c
+++ b/rts/gmp/mpz/sub_ui.c
diff --git a/ghc/rts/gmp/mpz/swap.c b/rts/gmp/mpz/swap.c
index 0070d6ff24..0070d6ff24 100644
--- a/ghc/rts/gmp/mpz/swap.c
+++ b/rts/gmp/mpz/swap.c
diff --git a/ghc/rts/gmp/mpz/tdiv_q.c b/rts/gmp/mpz/tdiv_q.c
index 21db4ab385..21db4ab385 100644
--- a/ghc/rts/gmp/mpz/tdiv_q.c
+++ b/rts/gmp/mpz/tdiv_q.c
diff --git a/ghc/rts/gmp/mpz/tdiv_q_2exp.c b/rts/gmp/mpz/tdiv_q_2exp.c
index 03d1e01f89..03d1e01f89 100644
--- a/ghc/rts/gmp/mpz/tdiv_q_2exp.c
+++ b/rts/gmp/mpz/tdiv_q_2exp.c
diff --git a/ghc/rts/gmp/mpz/tdiv_q_ui.c b/rts/gmp/mpz/tdiv_q_ui.c
index a2e3462b76..a2e3462b76 100644
--- a/ghc/rts/gmp/mpz/tdiv_q_ui.c
+++ b/rts/gmp/mpz/tdiv_q_ui.c
diff --git a/ghc/rts/gmp/mpz/tdiv_qr.c b/rts/gmp/mpz/tdiv_qr.c
index d66f57d9e5..d66f57d9e5 100644
--- a/ghc/rts/gmp/mpz/tdiv_qr.c
+++ b/rts/gmp/mpz/tdiv_qr.c
diff --git a/ghc/rts/gmp/mpz/tdiv_qr_ui.c b/rts/gmp/mpz/tdiv_qr_ui.c
index 10368cd340..10368cd340 100644
--- a/ghc/rts/gmp/mpz/tdiv_qr_ui.c
+++ b/rts/gmp/mpz/tdiv_qr_ui.c
diff --git a/ghc/rts/gmp/mpz/tdiv_r.c b/rts/gmp/mpz/tdiv_r.c
index 9eb87dfabf..9eb87dfabf 100644
--- a/ghc/rts/gmp/mpz/tdiv_r.c
+++ b/rts/gmp/mpz/tdiv_r.c
diff --git a/ghc/rts/gmp/mpz/tdiv_r_2exp.c b/rts/gmp/mpz/tdiv_r_2exp.c
index 91de170f5c..91de170f5c 100644
--- a/ghc/rts/gmp/mpz/tdiv_r_2exp.c
+++ b/rts/gmp/mpz/tdiv_r_2exp.c
diff --git a/ghc/rts/gmp/mpz/tdiv_r_ui.c b/rts/gmp/mpz/tdiv_r_ui.c
index 2ea411fda1..2ea411fda1 100644
--- a/ghc/rts/gmp/mpz/tdiv_r_ui.c
+++ b/rts/gmp/mpz/tdiv_r_ui.c
diff --git a/ghc/rts/gmp/mpz/tdiv_ui.c b/rts/gmp/mpz/tdiv_ui.c
index 7a40a6a7f7..7a40a6a7f7 100644
--- a/ghc/rts/gmp/mpz/tdiv_ui.c
+++ b/rts/gmp/mpz/tdiv_ui.c
diff --git a/ghc/rts/gmp/mpz/tstbit.c b/rts/gmp/mpz/tstbit.c
index b0a8b0b31a..b0a8b0b31a 100644
--- a/ghc/rts/gmp/mpz/tstbit.c
+++ b/rts/gmp/mpz/tstbit.c
diff --git a/ghc/rts/gmp/mpz/ui_pow_ui.c b/rts/gmp/mpz/ui_pow_ui.c
index edd2dee625..edd2dee625 100644
--- a/ghc/rts/gmp/mpz/ui_pow_ui.c
+++ b/rts/gmp/mpz/ui_pow_ui.c
diff --git a/ghc/rts/gmp/mpz/urandomb.c b/rts/gmp/mpz/urandomb.c
index caca086e05..caca086e05 100644
--- a/ghc/rts/gmp/mpz/urandomb.c
+++ b/rts/gmp/mpz/urandomb.c
diff --git a/ghc/rts/gmp/mpz/urandomm.c b/rts/gmp/mpz/urandomm.c
index 69e1bae78a..69e1bae78a 100644
--- a/ghc/rts/gmp/mpz/urandomm.c
+++ b/rts/gmp/mpz/urandomm.c
diff --git a/ghc/rts/gmp/mpz/xor.c b/rts/gmp/mpz/xor.c
index 69898d1791..69898d1791 100644
--- a/ghc/rts/gmp/mpz/xor.c
+++ b/rts/gmp/mpz/xor.c
diff --git a/ghc/rts/gmp/rand.c b/rts/gmp/rand.c
index d1f9354511..d1f9354511 100644
--- a/ghc/rts/gmp/rand.c
+++ b/rts/gmp/rand.c
diff --git a/ghc/rts/gmp/randclr.c b/rts/gmp/randclr.c
index 5cb0291165..5cb0291165 100644
--- a/ghc/rts/gmp/randclr.c
+++ b/rts/gmp/randclr.c
diff --git a/ghc/rts/gmp/randlc.c b/rts/gmp/randlc.c
index 7079db827e..7079db827e 100644
--- a/ghc/rts/gmp/randlc.c
+++ b/rts/gmp/randlc.c
diff --git a/ghc/rts/gmp/randlc2x.c b/rts/gmp/randlc2x.c
index dbd5f041ee..dbd5f041ee 100644
--- a/ghc/rts/gmp/randlc2x.c
+++ b/rts/gmp/randlc2x.c
diff --git a/ghc/rts/gmp/randraw.c b/rts/gmp/randraw.c
index c0c3889d33..c0c3889d33 100644
--- a/ghc/rts/gmp/randraw.c
+++ b/rts/gmp/randraw.c
diff --git a/ghc/rts/gmp/randsd.c b/rts/gmp/randsd.c
index 3bed14b578..3bed14b578 100644
--- a/ghc/rts/gmp/randsd.c
+++ b/rts/gmp/randsd.c
diff --git a/ghc/rts/gmp/randsdui.c b/rts/gmp/randsdui.c
index 92f412f3ea..92f412f3ea 100644
--- a/ghc/rts/gmp/randsdui.c
+++ b/rts/gmp/randsdui.c
diff --git a/ghc/rts/gmp/stack-alloc.c b/rts/gmp/stack-alloc.c
index 9ab98fe5f9..9ab98fe5f9 100644
--- a/ghc/rts/gmp/stack-alloc.c
+++ b/rts/gmp/stack-alloc.c
diff --git a/ghc/rts/gmp/stack-alloc.h b/rts/gmp/stack-alloc.h
index f59beec266..f59beec266 100644
--- a/ghc/rts/gmp/stack-alloc.h
+++ b/rts/gmp/stack-alloc.h
diff --git a/ghc/rts/gmp/stamp-h.in b/rts/gmp/stamp-h.in
index 9788f70238..9788f70238 100644
--- a/ghc/rts/gmp/stamp-h.in
+++ b/rts/gmp/stamp-h.in
diff --git a/ghc/rts/gmp/stamp-vti b/rts/gmp/stamp-vti
index e3186186b2..e3186186b2 100644
--- a/ghc/rts/gmp/stamp-vti
+++ b/rts/gmp/stamp-vti
diff --git a/ghc/rts/gmp/urandom.h b/rts/gmp/urandom.h
index 313479e8b7..313479e8b7 100644
--- a/ghc/rts/gmp/urandom.h
+++ b/rts/gmp/urandom.h
diff --git a/ghc/rts/gmp/version.c b/rts/gmp/version.c
index 9d544ee1d8..9d544ee1d8 100644
--- a/ghc/rts/gmp/version.c
+++ b/rts/gmp/version.c
diff --git a/ghc/rts/gmp/version.texi b/rts/gmp/version.texi
index e3186186b2..e3186186b2 100644
--- a/ghc/rts/gmp/version.texi
+++ b/rts/gmp/version.texi
diff --git a/ghc/rts/hooks/FlagDefaults.c b/rts/hooks/FlagDefaults.c
index 393d39bc39..393d39bc39 100644
--- a/ghc/rts/hooks/FlagDefaults.c
+++ b/rts/hooks/FlagDefaults.c
diff --git a/ghc/rts/hooks/InitEachPE.c b/rts/hooks/InitEachPE.c
index cc9cdc0dba..cc9cdc0dba 100644
--- a/ghc/rts/hooks/InitEachPE.c
+++ b/rts/hooks/InitEachPE.c
diff --git a/ghc/rts/hooks/MallocFail.c b/rts/hooks/MallocFail.c
index 1218d1d8d0..1218d1d8d0 100644
--- a/ghc/rts/hooks/MallocFail.c
+++ b/rts/hooks/MallocFail.c
diff --git a/ghc/rts/hooks/OnExit.c b/rts/hooks/OnExit.c
index dd4c3b4bb0..dd4c3b4bb0 100644
--- a/ghc/rts/hooks/OnExit.c
+++ b/rts/hooks/OnExit.c
diff --git a/ghc/rts/hooks/OutOfHeap.c b/rts/hooks/OutOfHeap.c
index 98db0d7d49..98db0d7d49 100644
--- a/ghc/rts/hooks/OutOfHeap.c
+++ b/rts/hooks/OutOfHeap.c
diff --git a/ghc/rts/hooks/RtsOpts.c b/rts/hooks/RtsOpts.c
index b934b05f1b..b934b05f1b 100644
--- a/ghc/rts/hooks/RtsOpts.c
+++ b/rts/hooks/RtsOpts.c
diff --git a/ghc/rts/hooks/ShutdownEachPEHook.c b/rts/hooks/ShutdownEachPEHook.c
index f5e3ba9344..f5e3ba9344 100644
--- a/ghc/rts/hooks/ShutdownEachPEHook.c
+++ b/rts/hooks/ShutdownEachPEHook.c
diff --git a/ghc/rts/hooks/StackOverflow.c b/rts/hooks/StackOverflow.c
index a395a3a1a5..a395a3a1a5 100644
--- a/ghc/rts/hooks/StackOverflow.c
+++ b/rts/hooks/StackOverflow.c
diff --git a/ghc/rts/package.conf.in b/rts/package.conf.in
index 2550415e5a..935b71d6a6 100644
--- a/ghc/rts/package.conf.in
+++ b/rts/package.conf.in
@@ -21,9 +21,9 @@ library-dirs:		LIB_DIR
 			/* force the dist-provided gcc-lib/ into scope. */
 # endif
 #else /* !INSTALLING */
-library-dirs:		FPTOOLS_TOP_ABS"/ghc/rts"
+library-dirs:		FPTOOLS_TOP_ABS"/rts"
 # if !defined(HAVE_LIBGMP) && !defined(HAVE_FRAMEWORK_GMP)
-			, FPTOOLS_TOP_ABS"/ghc/rts/gmp"
+			, FPTOOLS_TOP_ABS"/rts/gmp"
 # endif
 #endif
 
@@ -60,7 +60,7 @@ include-dirs:		INCLUDE_DIR
 			, INCLUDE_DIR"/mingw"
 # endif
 #else /* !INSTALLING */
-include-dirs:		FPTOOLS_TOP_ABS"/ghc/includes"
+include-dirs:		FPTOOLS_TOP_ABS"/includes"
 #endif
 
 includes:		Stg.h
diff --git a/ghc/rts/parallel/0Hash.c b/rts/parallel/0Hash.c
index a471e30a66..a471e30a66 100644
--- a/ghc/rts/parallel/0Hash.c
+++ b/rts/parallel/0Hash.c
diff --git a/ghc/rts/parallel/0Parallel.h b/rts/parallel/0Parallel.h
index d52bf00fc2..d52bf00fc2 100644
--- a/ghc/rts/parallel/0Parallel.h
+++ b/rts/parallel/0Parallel.h
diff --git a/ghc/rts/parallel/0Unpack.c b/rts/parallel/0Unpack.c
index fc4a8e50c3..fc4a8e50c3 100644
--- a/ghc/rts/parallel/0Unpack.c
+++ b/rts/parallel/0Unpack.c
diff --git a/ghc/rts/parallel/Dist.c b/rts/parallel/Dist.c
index eeec780716..eeec780716 100644
--- a/ghc/rts/parallel/Dist.c
+++ b/rts/parallel/Dist.c
diff --git a/ghc/rts/parallel/Dist.h b/rts/parallel/Dist.h
index c67cce2748..c67cce2748 100644
--- a/ghc/rts/parallel/Dist.h
+++ b/rts/parallel/Dist.h
diff --git a/ghc/rts/parallel/FetchMe.h b/rts/parallel/FetchMe.h
index be5cbf6b54..be5cbf6b54 100644
--- a/ghc/rts/parallel/FetchMe.h
+++ b/rts/parallel/FetchMe.h
diff --git a/ghc/rts/parallel/FetchMe.hc b/rts/parallel/FetchMe.hc
index f142e9e514..f142e9e514 100644
--- a/ghc/rts/parallel/FetchMe.hc
+++ b/rts/parallel/FetchMe.hc
diff --git a/ghc/rts/parallel/Global.c b/rts/parallel/Global.c
index b2541357e1..b2541357e1 100644
--- a/ghc/rts/parallel/Global.c
+++ b/rts/parallel/Global.c
diff --git a/ghc/rts/parallel/GranSim.c b/rts/parallel/GranSim.c
index b1cc0962be..b1cc0962be 100644
--- a/ghc/rts/parallel/GranSim.c
+++ b/rts/parallel/GranSim.c
diff --git a/ghc/rts/parallel/GranSimRts.h b/rts/parallel/GranSimRts.h
index fc31a1f0a6..fc31a1f0a6 100644
--- a/ghc/rts/parallel/GranSimRts.h
+++ b/rts/parallel/GranSimRts.h
diff --git a/ghc/rts/parallel/HLC.h b/rts/parallel/HLC.h
index 793ac840f9..793ac840f9 100644
--- a/ghc/rts/parallel/HLC.h
+++ b/rts/parallel/HLC.h
diff --git a/ghc/rts/parallel/HLComms.c b/rts/parallel/HLComms.c
index b0982e441c..b0982e441c 100644
--- a/ghc/rts/parallel/HLComms.c
+++ b/rts/parallel/HLComms.c
diff --git a/ghc/rts/parallel/LLC.h b/rts/parallel/LLC.h
index 536e431bef..536e431bef 100644
--- a/ghc/rts/parallel/LLC.h
+++ b/rts/parallel/LLC.h
diff --git a/ghc/rts/parallel/LLComms.c b/rts/parallel/LLComms.c
index baa6dddf0c..baa6dddf0c 100644
--- a/ghc/rts/parallel/LLComms.c
+++ b/rts/parallel/LLComms.c
diff --git a/ghc/rts/parallel/PEOpCodes.h b/rts/parallel/PEOpCodes.h
index 2d18b439f2..2d18b439f2 100644
--- a/ghc/rts/parallel/PEOpCodes.h
+++ b/rts/parallel/PEOpCodes.h
diff --git a/ghc/rts/parallel/Pack.c b/rts/parallel/Pack.c
index e8653f6303..e8653f6303 100644
--- a/ghc/rts/parallel/Pack.c
+++ b/rts/parallel/Pack.c
diff --git a/ghc/rts/parallel/ParInit.c b/rts/parallel/ParInit.c
index 22c9119c89..22c9119c89 100644
--- a/ghc/rts/parallel/ParInit.c
+++ b/rts/parallel/ParInit.c
diff --git a/ghc/rts/parallel/ParInit.h b/rts/parallel/ParInit.h
index a22a50bae6..a22a50bae6 100644
--- a/ghc/rts/parallel/ParInit.h
+++ b/rts/parallel/ParInit.h
diff --git a/ghc/rts/parallel/ParTicky.c b/rts/parallel/ParTicky.c
index 347c2b8bca..347c2b8bca 100644
--- a/ghc/rts/parallel/ParTicky.c
+++ b/rts/parallel/ParTicky.c
diff --git a/ghc/rts/parallel/ParTicky.h b/rts/parallel/ParTicky.h
index 1d6e7435c9..1d6e7435c9 100644
--- a/ghc/rts/parallel/ParTicky.h
+++ b/rts/parallel/ParTicky.h
diff --git a/ghc/rts/parallel/ParTypes.h b/rts/parallel/ParTypes.h
index 910a6f2d99..910a6f2d99 100644
--- a/ghc/rts/parallel/ParTypes.h
+++ b/rts/parallel/ParTypes.h
diff --git a/ghc/rts/parallel/Parallel.c b/rts/parallel/Parallel.c
index 414b7e4406..414b7e4406 100644
--- a/ghc/rts/parallel/Parallel.c
+++ b/rts/parallel/Parallel.c
diff --git a/ghc/rts/parallel/ParallelDebug.c b/rts/parallel/ParallelDebug.c
index b357af6379..b357af6379 100644
--- a/ghc/rts/parallel/ParallelDebug.c
+++ b/rts/parallel/ParallelDebug.c
diff --git a/ghc/rts/parallel/ParallelDebug.h b/rts/parallel/ParallelDebug.h
index f8aaeb85d4..f8aaeb85d4 100644
--- a/ghc/rts/parallel/ParallelDebug.h
+++ b/rts/parallel/ParallelDebug.h
diff --git a/ghc/rts/parallel/ParallelRts.h b/rts/parallel/ParallelRts.h
index d421296d19..d421296d19 100644
--- a/ghc/rts/parallel/ParallelRts.h
+++ b/rts/parallel/ParallelRts.h
diff --git a/ghc/rts/parallel/RBH.c b/rts/parallel/RBH.c
index 1612209027..1612209027 100644
--- a/ghc/rts/parallel/RBH.c
+++ b/rts/parallel/RBH.c
diff --git a/ghc/rts/parallel/SysMan.c b/rts/parallel/SysMan.c
index 40bcf6a19e..40bcf6a19e 100644
--- a/ghc/rts/parallel/SysMan.c
+++ b/rts/parallel/SysMan.c
diff --git a/ghc/rts/posix/GetTime.c b/rts/posix/GetTime.c
index 3a0764cb91..3a0764cb91 100644
--- a/ghc/rts/posix/GetTime.c
+++ b/rts/posix/GetTime.c
diff --git a/ghc/rts/posix/Itimer.c b/rts/posix/Itimer.c
index 83ed84d6ef..83ed84d6ef 100644
--- a/ghc/rts/posix/Itimer.c
+++ b/rts/posix/Itimer.c
diff --git a/ghc/rts/posix/Itimer.h b/rts/posix/Itimer.h
index 09d01bde54..09d01bde54 100644
--- a/ghc/rts/posix/Itimer.h
+++ b/rts/posix/Itimer.h
diff --git a/ghc/rts/posix/OSThreads.c b/rts/posix/OSThreads.c
index 07bd762130..07bd762130 100644
--- a/ghc/rts/posix/OSThreads.c
+++ b/rts/posix/OSThreads.c
diff --git a/ghc/rts/posix/Select.c b/rts/posix/Select.c
index e21ced03ab..e21ced03ab 100644
--- a/ghc/rts/posix/Select.c
+++ b/rts/posix/Select.c
diff --git a/ghc/rts/posix/Select.h b/rts/posix/Select.h
index 8825562974..8825562974 100644
--- a/ghc/rts/posix/Select.h
+++ b/rts/posix/Select.h
diff --git a/ghc/rts/posix/Signals.c b/rts/posix/Signals.c
index 5f5f77fd39..5f5f77fd39 100644
--- a/ghc/rts/posix/Signals.c
+++ b/rts/posix/Signals.c
diff --git a/ghc/rts/posix/Signals.h b/rts/posix/Signals.h
index 39477f8c6a..39477f8c6a 100644
--- a/ghc/rts/posix/Signals.h
+++ b/rts/posix/Signals.h
diff --git a/ghc/rts/win32/AsyncIO.c b/rts/win32/AsyncIO.c
index 7bcf571cf8..7bcf571cf8 100644
--- a/ghc/rts/win32/AsyncIO.c
+++ b/rts/win32/AsyncIO.c
diff --git a/ghc/rts/win32/AsyncIO.h b/rts/win32/AsyncIO.h
index 2077ea0cf7..2077ea0cf7 100644
--- a/ghc/rts/win32/AsyncIO.h
+++ b/rts/win32/AsyncIO.h
diff --git a/ghc/rts/win32/AwaitEvent.c b/rts/win32/AwaitEvent.c
index 43e188fb34..43e188fb34 100644
--- a/ghc/rts/win32/AwaitEvent.c
+++ b/rts/win32/AwaitEvent.c
diff --git a/ghc/rts/win32/ConsoleHandler.c b/rts/win32/ConsoleHandler.c
index d7096db632..d7096db632 100644
--- a/ghc/rts/win32/ConsoleHandler.c
+++ b/rts/win32/ConsoleHandler.c
diff --git a/ghc/rts/win32/ConsoleHandler.h b/rts/win32/ConsoleHandler.h
index b09adf71cb..b09adf71cb 100644
--- a/ghc/rts/win32/ConsoleHandler.h
+++ b/rts/win32/ConsoleHandler.h
diff --git a/ghc/rts/win32/GetTime.c b/rts/win32/GetTime.c
index 584b994d53..584b994d53 100644
--- a/ghc/rts/win32/GetTime.c
+++ b/rts/win32/GetTime.c
diff --git a/ghc/rts/win32/IOManager.c b/rts/win32/IOManager.c
index a67c3504c1..a67c3504c1 100644
--- a/ghc/rts/win32/IOManager.c
+++ b/rts/win32/IOManager.c
diff --git a/ghc/rts/win32/IOManager.h b/rts/win32/IOManager.h
index 4893e2387c..4893e2387c 100644
--- a/ghc/rts/win32/IOManager.h
+++ b/rts/win32/IOManager.h
diff --git a/ghc/rts/win32/OSThreads.c b/rts/win32/OSThreads.c
index c772be38f4..c772be38f4 100644
--- a/ghc/rts/win32/OSThreads.c
+++ b/rts/win32/OSThreads.c
diff --git a/ghc/rts/win32/Ticker.c b/rts/win32/Ticker.c
index ab791d8dc7..ab791d8dc7 100644
--- a/ghc/rts/win32/Ticker.c
+++ b/rts/win32/Ticker.c
diff --git a/ghc/rts/win32/WorkQueue.c b/rts/win32/WorkQueue.c
index 85a23608be..85a23608be 100644
--- a/ghc/rts/win32/WorkQueue.c
+++ b/rts/win32/WorkQueue.c
diff --git a/ghc/rts/win32/WorkQueue.h b/rts/win32/WorkQueue.h
index bde82a3a77..bde82a3a77 100644
--- a/ghc/rts/win32/WorkQueue.h
+++ b/rts/win32/WorkQueue.h
diff --git a/ghc/utils/Makefile b/utils/Makefile
index 7348160a74..9416d7728b 100644
--- a/ghc/utils/Makefile
+++ b/utils/Makefile
@@ -3,12 +3,13 @@ include $(TOP)/mk/boilerplate.mk
 
 ifneq "$(BIN_DIST_NAME)" ""
 # We're doing a binary-dist, descend into a subset of the dirs.
-SUBDIRS = hp2ps stat2resid unlit
+SUBDIRS = hp2ps unlit
 else
 ifeq "$(BootingFromHc)" "YES"
-SUBDIRS = genapply genprimopcode ghc-pkg unlit
+SUBDIRS = mkdependC mkdirhier runstdtest genapply genprimopcode ghc-pkg unlit
 else
-SUBDIRS = hasktags ghc-pkg hp2ps hsc2hs parallel stat2resid prof unlit genprimopcode genapply runghc
+SUBDIRS = mkdependC mkdirhier runstdtest ghc-pkg hasktags hp2ps hsc2hs lndir \
+	  parallel prof unlit genprimopcode genapply runghc
 endif
 endif
 
@@ -16,8 +17,19 @@ ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 SUBDIRS += touchy
 endif
 
-# hstags died when the new parser was introduced.
-#	  hstags	\
+# Utils that we don't build by default:
+#	nofib-analyse
+
+# Utils that are old and/or bitrotted:
+#	stat2resid
+#	debugNCG
+#	ext-core
+#	genargs
+#	heap-view
+#	pvm
+#	verbatim
+#	ltx
+#	hstags
 
 # "heap-view" is not in the list because (a) it requires
 #  a Haskell compiler (which you may not have yet), and (b) you are
diff --git a/ghc/utils/debugNCG/Diff_Gcc_Nat.hs b/utils/debugNCG/Diff_Gcc_Nat.hs
index 02b642821e..02b642821e 100644
--- a/ghc/utils/debugNCG/Diff_Gcc_Nat.hs
+++ b/utils/debugNCG/Diff_Gcc_Nat.hs
diff --git a/ghc/utils/debugNCG/Makefile b/utils/debugNCG/Makefile
index 0ea51a1e06..0ea51a1e06 100644
--- a/ghc/utils/debugNCG/Makefile
+++ b/utils/debugNCG/Makefile
diff --git a/ghc/utils/debugNCG/README b/utils/debugNCG/README
index 90eb2197cc..90eb2197cc 100644
--- a/ghc/utils/debugNCG/README
+++ b/utils/debugNCG/README
diff --git a/ghc/utils/ext-core/Check.hs b/utils/ext-core/Check.hs
index a9a3eac8f4..a9a3eac8f4 100644
--- a/ghc/utils/ext-core/Check.hs
+++ b/utils/ext-core/Check.hs
diff --git a/ghc/utils/ext-core/Core.hs b/utils/ext-core/Core.hs
index 2f94f80b3e..2f94f80b3e 100644
--- a/ghc/utils/ext-core/Core.hs
+++ b/utils/ext-core/Core.hs
diff --git a/ghc/utils/ext-core/Driver.hs b/utils/ext-core/Driver.hs
index 2328eca22a..2328eca22a 100644
--- a/ghc/utils/ext-core/Driver.hs
+++ b/utils/ext-core/Driver.hs
diff --git a/ghc/utils/ext-core/Env.hs b/utils/ext-core/Env.hs
index 6f6973c558..6f6973c558 100644
--- a/ghc/utils/ext-core/Env.hs
+++ b/utils/ext-core/Env.hs
diff --git a/ghc/utils/ext-core/Interp.hs b/utils/ext-core/Interp.hs
index 1988ae9cf3..1988ae9cf3 100644
--- a/ghc/utils/ext-core/Interp.hs
+++ b/utils/ext-core/Interp.hs
diff --git a/ghc/utils/ext-core/Lex.hs b/utils/ext-core/Lex.hs
index ad9d2eb00f..ad9d2eb00f 100644
--- a/ghc/utils/ext-core/Lex.hs
+++ b/utils/ext-core/Lex.hs
diff --git a/ghc/utils/ext-core/ParseGlue.hs b/utils/ext-core/ParseGlue.hs
index 3dde0c3d75..3dde0c3d75 100644
--- a/ghc/utils/ext-core/ParseGlue.hs
+++ b/utils/ext-core/ParseGlue.hs
diff --git a/ghc/utils/ext-core/Parser.y b/utils/ext-core/Parser.y
index 1e1c6a3592..1e1c6a3592 100644
--- a/ghc/utils/ext-core/Parser.y
+++ b/utils/ext-core/Parser.y
diff --git a/ghc/utils/ext-core/Prep.hs b/utils/ext-core/Prep.hs
index ee65eaaba2..ee65eaaba2 100644
--- a/ghc/utils/ext-core/Prep.hs
+++ b/utils/ext-core/Prep.hs
diff --git a/ghc/utils/ext-core/Prims.hs b/utils/ext-core/Prims.hs
index fd6e827c39..fd6e827c39 100644
--- a/ghc/utils/ext-core/Prims.hs
+++ b/utils/ext-core/Prims.hs
diff --git a/ghc/utils/ext-core/Printer.hs b/utils/ext-core/Printer.hs
index ded48aadc2..ded48aadc2 100644
--- a/ghc/utils/ext-core/Printer.hs
+++ b/utils/ext-core/Printer.hs
diff --git a/ghc/utils/ext-core/README b/utils/ext-core/README
index 7ec8adf09a..7ec8adf09a 100644
--- a/ghc/utils/ext-core/README
+++ b/utils/ext-core/README
diff --git a/ghc/utils/genapply/GenApply.hs b/utils/genapply/GenApply.hs
index cdde66fa78..cdde66fa78 100644
--- a/ghc/utils/genapply/GenApply.hs
+++ b/utils/genapply/GenApply.hs
diff --git a/ghc/utils/genapply/Makefile b/utils/genapply/Makefile
index 41084d6c5c..f9a10a22de 100644
--- a/ghc/utils/genapply/Makefile
+++ b/utils/genapply/Makefile
@@ -3,7 +3,7 @@ include $(TOP)/mk/boilerplate.mk
 
 HS_PROG = $(GHC_GENAPPLY_PGM)
 
-# genapply is needed to boot in ghc/rts...
+# genapply is needed to boot in rts/...
 ifneq "$(BootingFromHc)" "YES"
 boot :: all
 endif
diff --git a/glafp-utils/genargs/Makefile b/utils/genargs/Makefile
index 3c31e6a39f..3c31e6a39f 100644
--- a/glafp-utils/genargs/Makefile
+++ b/utils/genargs/Makefile
diff --git a/glafp-utils/genargs/genargs.pl b/utils/genargs/genargs.pl
index 2ef2dfa3e6..2ef2dfa3e6 100644
--- a/glafp-utils/genargs/genargs.pl
+++ b/utils/genargs/genargs.pl
diff --git a/ghc/utils/genprimopcode/Main.hs b/utils/genprimopcode/Main.hs
index f08b7d5602..f08b7d5602 100644
--- a/ghc/utils/genprimopcode/Main.hs
+++ b/utils/genprimopcode/Main.hs
diff --git a/ghc/utils/genprimopcode/Makefile b/utils/genprimopcode/Makefile
index dbd69f6d42..dbd69f6d42 100644
--- a/ghc/utils/genprimopcode/Makefile
+++ b/utils/genprimopcode/Makefile
diff --git a/ghc/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs
index fb3ef07c3f..fb3ef07c3f 100644
--- a/ghc/utils/ghc-pkg/Main.hs
+++ b/utils/ghc-pkg/Main.hs
diff --git a/ghc/utils/ghc-pkg/Makefile b/utils/ghc-pkg/Makefile
index d513a91b1c..c8a075d5b7 100644
--- a/ghc/utils/ghc-pkg/Makefile
+++ b/utils/ghc-pkg/Makefile
@@ -1,5 +1,3 @@
-# -----------------------------------------------------------------------------
-
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
 
@@ -12,7 +10,7 @@ INSTALLING=1
 SRC_HC_OPTS += -cpp -Wall -fno-warn-name-shadowing -fno-warn-unused-matches
 
 # This causes libghccompat.a to be used:
-include $(GHC_LIB_COMPAT_DIR)/compat.mk
+include $(GHC_COMPAT_DIR)/compat.mk
 
 # This is required because libghccompat.a must be built with
 # $(GhcHcOpts) because it is linked to the compiler, and hence
@@ -43,7 +41,7 @@ EXTRA_SRCS += $(VERSION_HS)
 
 boot :: $(VERSION_HS)
 
-Version.hs : Makefile $(TOP)/mk/version.mk
+Version.hs : Makefile $(TOP)/mk/config.mk
 	@$(RM) -f $(VERSION_HS)
 	@echo "Creating $(VERSION_HS) ... "
 	@echo "module Version where" >>$(VERSION_HS)
@@ -66,8 +64,8 @@ GHCPKGBIN=$(libexecdir)/$(HS_PROG)
 PKGCONF=$(libdir)/package.conf
 endif # BIN_DIST
 else
-GHCPKGBIN=$(FPTOOLS_TOP_ABS)/ghc/utils/ghc-pkg/$(HS_PROG)
-PKGCONF=$(FPTOOLS_TOP_ABS_PLATFORM)/ghc/driver/package.conf.inplace
+GHCPKGBIN=$(FPTOOLS_TOP_ABS)/utils/ghc-pkg/$(HS_PROG)
+PKGCONF=$(FPTOOLS_TOP_ABS_PLATFORM)/driver/package.conf.inplace
 endif
 
 ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
@@ -102,7 +100,7 @@ clean distclean maintainer-clean ::
 	$(MAKE) INSTALLING=0 BIN_DIST=0 $(MFLAGS) $@
 endif
 
-# ghc-pkg is needed to boot in ghc/rts and library dirs
+# ghc-pkg is needed to boot in rts/ and library dirs
 # Do a recursive 'make all' after generating dependencies, because this
 # will work with 'make -j'.
 ifneq "$(BootingFromHc)" "YES"
diff --git a/ghc/utils/ghc-pkg/ghc-pkg.sh b/utils/ghc-pkg/ghc-pkg.sh
index d482fc094e..d482fc094e 100644
--- a/ghc/utils/ghc-pkg/ghc-pkg.sh
+++ b/utils/ghc-pkg/ghc-pkg.sh
diff --git a/ghc/utils/hasktags/HaskTags.hs b/utils/hasktags/HaskTags.hs
index f1840332d2..f1840332d2 100644
--- a/ghc/utils/hasktags/HaskTags.hs
+++ b/utils/hasktags/HaskTags.hs
diff --git a/ghc/utils/hasktags/Makefile b/utils/hasktags/Makefile
index 59a03d8abd..99afec685d 100644
--- a/ghc/utils/hasktags/Makefile
+++ b/utils/hasktags/Makefile
@@ -1,10 +1,6 @@
-
 TOP=../..
-
 include $(TOP)/mk/boilerplate.mk
 
-CURRENT_DIR=ghc/utils/hasktags
-
 HS_PROG = hasktags
 
 CLEAN_FILES += Main.hi
diff --git a/ghc/utils/hasktags/README b/utils/hasktags/README
index 77bac8881a..77bac8881a 100644
--- a/ghc/utils/hasktags/README
+++ b/utils/hasktags/README
diff --git a/ghc/utils/heap-view/Graph.lhs b/utils/heap-view/Graph.lhs
index b8e08dbb9b..b8e08dbb9b 100644
--- a/ghc/utils/heap-view/Graph.lhs
+++ b/utils/heap-view/Graph.lhs
diff --git a/ghc/utils/heap-view/HaskXLib.c b/utils/heap-view/HaskXLib.c
index b6cf1f137c..b6cf1f137c 100644
--- a/ghc/utils/heap-view/HaskXLib.c
+++ b/utils/heap-view/HaskXLib.c
diff --git a/ghc/utils/heap-view/HpView.lhs b/utils/heap-view/HpView.lhs
index a7b4cbb78e..a7b4cbb78e 100644
--- a/ghc/utils/heap-view/HpView.lhs
+++ b/utils/heap-view/HpView.lhs
diff --git a/ghc/utils/heap-view/HpView2.lhs b/utils/heap-view/HpView2.lhs
index fa8044b8b4..fa8044b8b4 100644
--- a/ghc/utils/heap-view/HpView2.lhs
+++ b/utils/heap-view/HpView2.lhs
diff --git a/ghc/utils/heap-view/MAIL b/utils/heap-view/MAIL
index 966fcdcfc7..966fcdcfc7 100644
--- a/ghc/utils/heap-view/MAIL
+++ b/utils/heap-view/MAIL
diff --git a/ghc/utils/heap-view/Makefile b/utils/heap-view/Makefile
index 2d8a819df3..e8fa8faf08 100644
--- a/ghc/utils/heap-view/Makefile
+++ b/utils/heap-view/Makefile
@@ -1,8 +1,3 @@
-#---------------------------------------------------------------------
-# $Id: Makefile,v 1.3 1997/03/13 09:36:28 sof Exp $
-#
-#---------------------------------------------------------------------
-
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
 
diff --git a/ghc/utils/heap-view/Makefile.original b/utils/heap-view/Makefile.original
index 1e35bc2e43..1e35bc2e43 100644
--- a/ghc/utils/heap-view/Makefile.original
+++ b/utils/heap-view/Makefile.original
diff --git a/ghc/utils/heap-view/Parse.lhs b/utils/heap-view/Parse.lhs
index 9d7652fdcc..9d7652fdcc 100644
--- a/ghc/utils/heap-view/Parse.lhs
+++ b/utils/heap-view/Parse.lhs
diff --git a/ghc/utils/heap-view/README b/utils/heap-view/README
index db9503abc4..db9503abc4 100644
--- a/ghc/utils/heap-view/README
+++ b/utils/heap-view/README
diff --git a/ghc/utils/heap-view/common-bits b/utils/heap-view/common-bits
index f41223b7f4..f41223b7f4 100644
--- a/ghc/utils/heap-view/common-bits
+++ b/utils/heap-view/common-bits
diff --git a/ghc/utils/hp2ps/AreaBelow.c b/utils/hp2ps/AreaBelow.c
index ec80e1ed48..ec80e1ed48 100644
--- a/ghc/utils/hp2ps/AreaBelow.c
+++ b/utils/hp2ps/AreaBelow.c
diff --git a/ghc/utils/hp2ps/AreaBelow.h b/utils/hp2ps/AreaBelow.h
index d7f713f2b4..d7f713f2b4 100644
--- a/ghc/utils/hp2ps/AreaBelow.h
+++ b/utils/hp2ps/AreaBelow.h
diff --git a/ghc/utils/hp2ps/AuxFile.c b/utils/hp2ps/AuxFile.c
index 9998d3fc13..9998d3fc13 100644
--- a/ghc/utils/hp2ps/AuxFile.c
+++ b/utils/hp2ps/AuxFile.c
diff --git a/ghc/utils/hp2ps/AuxFile.h b/utils/hp2ps/AuxFile.h
index 6e962c492e..6e962c492e 100644
--- a/ghc/utils/hp2ps/AuxFile.h
+++ b/utils/hp2ps/AuxFile.h
diff --git a/ghc/utils/hp2ps/Axes.c b/utils/hp2ps/Axes.c
index a2641cd676..a2641cd676 100644
--- a/ghc/utils/hp2ps/Axes.c
+++ b/utils/hp2ps/Axes.c
diff --git a/ghc/utils/hp2ps/Axes.h b/utils/hp2ps/Axes.h
index e4be505dfb..e4be505dfb 100644
--- a/ghc/utils/hp2ps/Axes.h
+++ b/utils/hp2ps/Axes.h
diff --git a/ghc/utils/hp2ps/CHANGES b/utils/hp2ps/CHANGES
index db3b52e6d6..db3b52e6d6 100644
--- a/ghc/utils/hp2ps/CHANGES
+++ b/utils/hp2ps/CHANGES
diff --git a/ghc/utils/hp2ps/Curves.c b/utils/hp2ps/Curves.c
index ec05c98336..ec05c98336 100644
--- a/ghc/utils/hp2ps/Curves.c
+++ b/utils/hp2ps/Curves.c
diff --git a/ghc/utils/hp2ps/Curves.h b/utils/hp2ps/Curves.h
index 0aa397f42c..0aa397f42c 100644
--- a/ghc/utils/hp2ps/Curves.h
+++ b/utils/hp2ps/Curves.h
diff --git a/ghc/utils/hp2ps/Defines.h b/utils/hp2ps/Defines.h
index 8d38546fec..8d38546fec 100644
--- a/ghc/utils/hp2ps/Defines.h
+++ b/utils/hp2ps/Defines.h
diff --git a/ghc/utils/hp2ps/Deviation.c b/utils/hp2ps/Deviation.c
index ecf7faba16..ecf7faba16 100644
--- a/ghc/utils/hp2ps/Deviation.c
+++ b/utils/hp2ps/Deviation.c
diff --git a/ghc/utils/hp2ps/Deviation.h b/utils/hp2ps/Deviation.h
index 14e4df1ad0..14e4df1ad0 100644
--- a/ghc/utils/hp2ps/Deviation.h
+++ b/utils/hp2ps/Deviation.h
diff --git a/ghc/utils/hp2ps/Dimensions.c b/utils/hp2ps/Dimensions.c
index e732402dac..e732402dac 100644
--- a/ghc/utils/hp2ps/Dimensions.c
+++ b/utils/hp2ps/Dimensions.c
diff --git a/ghc/utils/hp2ps/Dimensions.h b/utils/hp2ps/Dimensions.h
index 7bcc05beee..7bcc05beee 100644
--- a/ghc/utils/hp2ps/Dimensions.h
+++ b/utils/hp2ps/Dimensions.h
diff --git a/ghc/utils/hp2ps/Error.c b/utils/hp2ps/Error.c
index 809c24ea44..809c24ea44 100644
--- a/ghc/utils/hp2ps/Error.c
+++ b/utils/hp2ps/Error.c
diff --git a/ghc/utils/hp2ps/Error.h b/utils/hp2ps/Error.h
index c1cdede415..c1cdede415 100644
--- a/ghc/utils/hp2ps/Error.h
+++ b/utils/hp2ps/Error.h
diff --git a/ghc/utils/hp2ps/HpFile.c b/utils/hp2ps/HpFile.c
index 9db94977df..9db94977df 100644
--- a/ghc/utils/hp2ps/HpFile.c
+++ b/utils/hp2ps/HpFile.c
diff --git a/ghc/utils/hp2ps/HpFile.h b/utils/hp2ps/HpFile.h
index 1c43f73d6d..1c43f73d6d 100644
--- a/ghc/utils/hp2ps/HpFile.h
+++ b/utils/hp2ps/HpFile.h
diff --git a/ghc/utils/hp2ps/Key.c b/utils/hp2ps/Key.c
index 8c63721c74..8c63721c74 100644
--- a/ghc/utils/hp2ps/Key.c
+++ b/utils/hp2ps/Key.c
diff --git a/ghc/utils/hp2ps/Key.h b/utils/hp2ps/Key.h
index d2a7b8eae3..d2a7b8eae3 100644
--- a/ghc/utils/hp2ps/Key.h
+++ b/utils/hp2ps/Key.h
diff --git a/ghc/utils/hp2ps/Main.c b/utils/hp2ps/Main.c
index 3b5efed51b..3b5efed51b 100644
--- a/ghc/utils/hp2ps/Main.c
+++ b/utils/hp2ps/Main.c
diff --git a/ghc/utils/hp2ps/Main.h b/utils/hp2ps/Main.h
index 30e7a7e9be..30e7a7e9be 100644
--- a/ghc/utils/hp2ps/Main.h
+++ b/utils/hp2ps/Main.h
diff --git a/ghc/utils/hp2ps/Makefile b/utils/hp2ps/Makefile
index 18cb05b1bd..18cb05b1bd 100644
--- a/ghc/utils/hp2ps/Makefile
+++ b/utils/hp2ps/Makefile
diff --git a/ghc/utils/hp2ps/Marks.c b/utils/hp2ps/Marks.c
index 8d6f924e17..8d6f924e17 100644
--- a/ghc/utils/hp2ps/Marks.c
+++ b/utils/hp2ps/Marks.c
diff --git a/ghc/utils/hp2ps/Marks.h b/utils/hp2ps/Marks.h
index 41956f6e83..41956f6e83 100644
--- a/ghc/utils/hp2ps/Marks.h
+++ b/utils/hp2ps/Marks.h
diff --git a/ghc/utils/hp2ps/PsFile.c b/utils/hp2ps/PsFile.c
index 357f826259..357f826259 100644
--- a/ghc/utils/hp2ps/PsFile.c
+++ b/utils/hp2ps/PsFile.c
diff --git a/ghc/utils/hp2ps/PsFile.h b/utils/hp2ps/PsFile.h
index acec0703bc..acec0703bc 100644
--- a/ghc/utils/hp2ps/PsFile.h
+++ b/utils/hp2ps/PsFile.h
diff --git a/ghc/utils/hp2ps/README.GHC b/utils/hp2ps/README.GHC
index a3fb21e922..a3fb21e922 100644
--- a/ghc/utils/hp2ps/README.GHC
+++ b/utils/hp2ps/README.GHC
diff --git a/ghc/utils/hp2ps/Reorder.c b/utils/hp2ps/Reorder.c
index afeed52d85..afeed52d85 100644
--- a/ghc/utils/hp2ps/Reorder.c
+++ b/utils/hp2ps/Reorder.c
diff --git a/ghc/utils/hp2ps/Reorder.h b/utils/hp2ps/Reorder.h
index 089ef75cfc..089ef75cfc 100644
--- a/ghc/utils/hp2ps/Reorder.h
+++ b/utils/hp2ps/Reorder.h
diff --git a/ghc/utils/hp2ps/Scale.c b/utils/hp2ps/Scale.c
index 32120407b3..32120407b3 100644
--- a/ghc/utils/hp2ps/Scale.c
+++ b/utils/hp2ps/Scale.c
diff --git a/ghc/utils/hp2ps/Scale.h b/utils/hp2ps/Scale.h
index 0c19d6c3c0..0c19d6c3c0 100644
--- a/ghc/utils/hp2ps/Scale.h
+++ b/utils/hp2ps/Scale.h
diff --git a/ghc/utils/hp2ps/Shade.c b/utils/hp2ps/Shade.c
index 9e3274bf69..9e3274bf69 100644
--- a/ghc/utils/hp2ps/Shade.c
+++ b/utils/hp2ps/Shade.c
diff --git a/ghc/utils/hp2ps/Shade.h b/utils/hp2ps/Shade.h
index 0e49c90d04..0e49c90d04 100644
--- a/ghc/utils/hp2ps/Shade.h
+++ b/utils/hp2ps/Shade.h
diff --git a/ghc/utils/hp2ps/TopTwenty.c b/utils/hp2ps/TopTwenty.c
index bbb6be4390..bbb6be4390 100644
--- a/ghc/utils/hp2ps/TopTwenty.c
+++ b/utils/hp2ps/TopTwenty.c
diff --git a/ghc/utils/hp2ps/TopTwenty.h b/utils/hp2ps/TopTwenty.h
index 53a7aed509..53a7aed509 100644
--- a/ghc/utils/hp2ps/TopTwenty.h
+++ b/utils/hp2ps/TopTwenty.h
diff --git a/ghc/utils/hp2ps/TraceElement.c b/utils/hp2ps/TraceElement.c
index c14062dced..c14062dced 100644
--- a/ghc/utils/hp2ps/TraceElement.c
+++ b/utils/hp2ps/TraceElement.c
diff --git a/ghc/utils/hp2ps/TraceElement.h b/utils/hp2ps/TraceElement.h
index d843392a23..d843392a23 100644
--- a/ghc/utils/hp2ps/TraceElement.h
+++ b/utils/hp2ps/TraceElement.h
diff --git a/ghc/utils/hp2ps/Utilities.c b/utils/hp2ps/Utilities.c
index c9fb612f0e..c9fb612f0e 100644
--- a/ghc/utils/hp2ps/Utilities.c
+++ b/utils/hp2ps/Utilities.c
diff --git a/ghc/utils/hp2ps/Utilities.h b/utils/hp2ps/Utilities.h
index 10776d9613..10776d9613 100644
--- a/ghc/utils/hp2ps/Utilities.h
+++ b/utils/hp2ps/Utilities.h
diff --git a/ghc/utils/hp2ps/hp2ps.1 b/utils/hp2ps/hp2ps.1
index fd0bca0234..fd0bca0234 100644
--- a/ghc/utils/hp2ps/hp2ps.1
+++ b/utils/hp2ps/hp2ps.1
diff --git a/ghc/utils/hp2ps/makefile.original b/utils/hp2ps/makefile.original
index a625149552..a625149552 100644
--- a/ghc/utils/hp2ps/makefile.original
+++ b/utils/hp2ps/makefile.original
diff --git a/ghc/utils/hsc2hs/Main.hs b/utils/hsc2hs/Main.hs
index 4b39e4a7bb..4b39e4a7bb 100644
--- a/ghc/utils/hsc2hs/Main.hs
+++ b/utils/hsc2hs/Main.hs
diff --git a/ghc/utils/hsc2hs/Makefile b/utils/hsc2hs/Makefile
index ccaf68eec8..0216983e08 100644
--- a/ghc/utils/hsc2hs/Makefile
+++ b/utils/hsc2hs/Makefile
@@ -5,13 +5,10 @@
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
 
-CURRENT_DIR=ghc/utils/hsc2hs
-INCLUDE_DIR=ghc/includes
-
 INSTALLING=1
 
 # This causes libghccompat.a to be used:
-include $(GHC_LIB_COMPAT_DIR)/compat.mk
+include $(GHC_COMPAT_DIR)/compat.mk
 
 # This is required because libghccompat.a must be built with
 # $(GhcHcOpts) because it is linked to the compiler, and hence
@@ -59,14 +56,14 @@ HSC2HS_DIR=$(libdir)
 HSC2HS_EXTRA=--cc=$(bindir)/ghc-$(ProjectVersion)
 endif # BIN_DIST
 else
-HSC2HS_BINDIR=$(FPTOOLS_TOP_ABS)/$(CURRENT_DIR)
-HSC2HS_DIR=$(FPTOOLS_TOP_ABS_PLATFORM)/$(CURRENT_DIR)
+HSC2HS_BINDIR=$(FPTOOLS_TOP_ABS)/$(GHC_HSC2HS_DIR_REL)
+HSC2HS_DIR=$(FPTOOLS_TOP_ABS_PLATFORM)/$(GHC_HSC2HS_DIR_REL)
 
 ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 extra_flags=$(addprefix --cflag=,$(filter-out -O,$(SRC_CC_OPTS)))
 endif
 
-HSC2HS_EXTRA="--cc=$(CC) --ld=$(CC) $(extra_flags) --cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(FPTOOLS_TOP_ABS_PLATFORM)/$(INCLUDE_DIR)"
+HSC2HS_EXTRA="--cc=$(CC) --ld=$(CC) $(extra_flags) --cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(FPTOOLS_TOP_ABS_PLATFORM)/$(GHC_INCLUDE_DIR_REL)"
 endif
 
 $(SCRIPT_PROG) : Makefile
diff --git a/ghc/utils/hsc2hs/Makefile.inc b/utils/hsc2hs/Makefile.inc
index 91ac818437..91ac818437 100644
--- a/ghc/utils/hsc2hs/Makefile.inc
+++ b/utils/hsc2hs/Makefile.inc
diff --git a/ghc/utils/hsc2hs/Makefile.nhc98 b/utils/hsc2hs/Makefile.nhc98
index a35a0dc9e7..a35a0dc9e7 100644
--- a/ghc/utils/hsc2hs/Makefile.nhc98
+++ b/utils/hsc2hs/Makefile.nhc98
diff --git a/ghc/utils/hsc2hs/hsc2hs.sh b/utils/hsc2hs/hsc2hs.sh
index fe00d45036..fe00d45036 100644
--- a/ghc/utils/hsc2hs/hsc2hs.sh
+++ b/utils/hsc2hs/hsc2hs.sh
diff --git a/ghc/utils/hsc2hs/template-hsc.h b/utils/hsc2hs/template-hsc.h
index bdc34eda78..bdc34eda78 100644
--- a/ghc/utils/hsc2hs/template-hsc.h
+++ b/utils/hsc2hs/template-hsc.h
diff --git a/ghc/utils/hstags/Makefile b/utils/hstags/Makefile
index 981bafd897..981bafd897 100644
--- a/ghc/utils/hstags/Makefile
+++ b/utils/hstags/Makefile
diff --git a/ghc/utils/hstags/README b/utils/hstags/README
index b457ef125a..b457ef125a 100644
--- a/ghc/utils/hstags/README
+++ b/utils/hstags/README
diff --git a/ghc/utils/hstags/hstags-help.c b/utils/hstags/hstags-help.c
index 92604876ff..92604876ff 100644
--- a/ghc/utils/hstags/hstags-help.c
+++ b/utils/hstags/hstags-help.c
diff --git a/ghc/utils/hstags/hstags.prl b/utils/hstags/hstags.prl
index 16e770bd8a..16e770bd8a 100644
--- a/ghc/utils/hstags/hstags.prl
+++ b/utils/hstags/hstags.prl
diff --git a/ghc/utils/hstags/prefix.txt b/utils/hstags/prefix.txt
index b67c009c49..b67c009c49 100644
--- a/ghc/utils/hstags/prefix.txt
+++ b/utils/hstags/prefix.txt
diff --git a/glafp-utils/lndir/Makefile b/utils/lndir/Makefile
index d85f92cf7e..c8223df094 100644
--- a/glafp-utils/lndir/Makefile
+++ b/utils/lndir/Makefile
@@ -1,4 +1,4 @@
-TOP=..
+TOP=../..
 include $(TOP)/mk/boilerplate.mk
 
 C_SRCS=lndir.c
diff --git a/glafp-utils/lndir/lndir-Xos.h b/utils/lndir/lndir-Xos.h
index e91e959c73..e91e959c73 100644
--- a/glafp-utils/lndir/lndir-Xos.h
+++ b/utils/lndir/lndir-Xos.h
diff --git a/glafp-utils/lndir/lndir-Xosdefs.h b/utils/lndir/lndir-Xosdefs.h
index e21db4b24e..e21db4b24e 100644
--- a/glafp-utils/lndir/lndir-Xosdefs.h
+++ b/utils/lndir/lndir-Xosdefs.h
diff --git a/glafp-utils/lndir/lndir.c b/utils/lndir/lndir.c
index c65715e379..c65715e379 100644
--- a/glafp-utils/lndir/lndir.c
+++ b/utils/lndir/lndir.c
diff --git a/glafp-utils/ltx/Makefile b/utils/ltx/Makefile
index 6271c07b42..480fa0d812 100644
--- a/glafp-utils/ltx/Makefile
+++ b/utils/ltx/Makefile
@@ -1,4 +1,4 @@
-TOP=..
+TOP=../..
 include $(TOP)/mk/boilerplate.mk
 
 SCRIPT_PROG=ltx
diff --git a/glafp-utils/ltx/ltx.prl b/utils/ltx/ltx.prl
index 96dbc71026..96dbc71026 100644
--- a/glafp-utils/ltx/ltx.prl
+++ b/utils/ltx/ltx.prl
diff --git a/glafp-utils/mkdependC/Makefile b/utils/mkdependC/Makefile
index 9a96fdf276..9b07685bb3 100644
--- a/glafp-utils/mkdependC/Makefile
+++ b/utils/mkdependC/Makefile
@@ -2,7 +2,7 @@
 # Boilerplate Makefile for building perl script that
 # needs some configured constants prepended to it.
 #
-TOP=..
+TOP=../..
 include $(TOP)/mk/boilerplate.mk
 
 boot :: all
diff --git a/glafp-utils/mkdependC/mkdependC.prl b/utils/mkdependC/mkdependC.prl
index f7af53ac3c..f7af53ac3c 100644
--- a/glafp-utils/mkdependC/mkdependC.prl
+++ b/utils/mkdependC/mkdependC.prl
diff --git a/glafp-utils/mkdirhier/Makefile b/utils/mkdirhier/Makefile
index 8ae4c4a50f..f698112dbb 100644
--- a/glafp-utils/mkdirhier/Makefile
+++ b/utils/mkdirhier/Makefile
@@ -1,9 +1,8 @@
-#
-#
-
-TOP=..
+TOP=../..
 include $(TOP)/mk/boilerplate.mk
 
+boot :: all
+
 SCRIPT_PROG=mkdirhier
 SCRIPT_OBJS=mkdirhier.sh
 INTERP=$(SHELL)
diff --git a/glafp-utils/mkdirhier/mkdirhier.sh b/utils/mkdirhier/mkdirhier.sh
index 3ae24b3c6e..3ae24b3c6e 100644
--- a/glafp-utils/mkdirhier/mkdirhier.sh
+++ b/utils/mkdirhier/mkdirhier.sh
diff --git a/glafp-utils/nofib-analyse/CmdLine.hs b/utils/nofib-analyse/CmdLine.hs
index 6e920f8c60..6e920f8c60 100644
--- a/glafp-utils/nofib-analyse/CmdLine.hs
+++ b/utils/nofib-analyse/CmdLine.hs
diff --git a/glafp-utils/nofib-analyse/GenUtils.lhs b/utils/nofib-analyse/GenUtils.lhs
index 540199f972..540199f972 100644
--- a/glafp-utils/nofib-analyse/GenUtils.lhs
+++ b/utils/nofib-analyse/GenUtils.lhs
diff --git a/glafp-utils/nofib-analyse/Main.hs b/utils/nofib-analyse/Main.hs
index c2b0d42ad0..c2b0d42ad0 100644
--- a/glafp-utils/nofib-analyse/Main.hs
+++ b/utils/nofib-analyse/Main.hs
diff --git a/glafp-utils/nofib-analyse/Makefile b/utils/nofib-analyse/Makefile
index 01323bf0b1..155b8df978 100644
--- a/glafp-utils/nofib-analyse/Makefile
+++ b/utils/nofib-analyse/Makefile
@@ -1,8 +1,4 @@
-# -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.6 2005/06/07 10:58:31 simonmar Exp $
-# (c) Simon Marlow 1999-2000
-
-TOP=..
+TOP=../..
 include $(TOP)/mk/boilerplate.mk
 
 SRC_HC_OPTS    += -fglasgow-exts -package util -package data -package text -cpp -package lang
diff --git a/glafp-utils/nofib-analyse/Printf.lhs b/utils/nofib-analyse/Printf.lhs
index 33b5290e07..33b5290e07 100644
--- a/glafp-utils/nofib-analyse/Printf.lhs
+++ b/utils/nofib-analyse/Printf.lhs
diff --git a/glafp-utils/nofib-analyse/Slurp.hs b/utils/nofib-analyse/Slurp.hs
index f775baee4f..f775baee4f 100644
--- a/glafp-utils/nofib-analyse/Slurp.hs
+++ b/utils/nofib-analyse/Slurp.hs
diff --git a/ghc/utils/parallel/AVG.pl b/utils/parallel/AVG.pl
index 9ec42aee2f..9ec42aee2f 100644
--- a/ghc/utils/parallel/AVG.pl
+++ b/utils/parallel/AVG.pl
diff --git a/ghc/utils/parallel/GrAnSim.el b/utils/parallel/GrAnSim.el
index 49330a9749..49330a9749 100644
--- a/ghc/utils/parallel/GrAnSim.el
+++ b/utils/parallel/GrAnSim.el
diff --git a/ghc/utils/parallel/Makefile b/utils/parallel/Makefile
index 094c5cbba1..094c5cbba1 100644
--- a/ghc/utils/parallel/Makefile
+++ b/utils/parallel/Makefile
diff --git a/ghc/utils/parallel/RTS2gran.pl b/utils/parallel/RTS2gran.pl
index 32012afac8..32012afac8 100644
--- a/ghc/utils/parallel/RTS2gran.pl
+++ b/utils/parallel/RTS2gran.pl
diff --git a/ghc/utils/parallel/SN.pl b/utils/parallel/SN.pl
index bc33e2a60c..bc33e2a60c 100644
--- a/ghc/utils/parallel/SN.pl
+++ b/utils/parallel/SN.pl
diff --git a/ghc/utils/parallel/SPLIT.pl b/utils/parallel/SPLIT.pl
index b4fe46f5b0..b4fe46f5b0 100644
--- a/ghc/utils/parallel/SPLIT.pl
+++ b/utils/parallel/SPLIT.pl
diff --git a/ghc/utils/parallel/avg-RTS.pl b/utils/parallel/avg-RTS.pl
index 4f25d55f80..4f25d55f80 100644
--- a/ghc/utils/parallel/avg-RTS.pl
+++ b/utils/parallel/avg-RTS.pl
diff --git a/ghc/utils/parallel/get_SN.pl b/utils/parallel/get_SN.pl
index e9426855bf..e9426855bf 100644
--- a/ghc/utils/parallel/get_SN.pl
+++ b/utils/parallel/get_SN.pl
diff --git a/ghc/utils/parallel/ghc-fool-sort.pl b/utils/parallel/ghc-fool-sort.pl
index dfa65a1875..dfa65a1875 100644
--- a/ghc/utils/parallel/ghc-fool-sort.pl
+++ b/utils/parallel/ghc-fool-sort.pl
diff --git a/ghc/utils/parallel/ghc-unfool-sort.pl b/utils/parallel/ghc-unfool-sort.pl
index 90da222a5a..90da222a5a 100644
--- a/ghc/utils/parallel/ghc-unfool-sort.pl
+++ b/utils/parallel/ghc-unfool-sort.pl
diff --git a/ghc/utils/parallel/gp-ext-imp.pl b/utils/parallel/gp-ext-imp.pl
index fa7c4e06d8..fa7c4e06d8 100644
--- a/ghc/utils/parallel/gp-ext-imp.pl
+++ b/utils/parallel/gp-ext-imp.pl
diff --git a/ghc/utils/parallel/gr2RTS.pl b/utils/parallel/gr2RTS.pl
index c609334c28..c609334c28 100644
--- a/ghc/utils/parallel/gr2RTS.pl
+++ b/utils/parallel/gr2RTS.pl
diff --git a/ghc/utils/parallel/gr2ap.bash b/utils/parallel/gr2ap.bash
index 7818fe112b..7818fe112b 100644
--- a/ghc/utils/parallel/gr2ap.bash
+++ b/utils/parallel/gr2ap.bash
diff --git a/ghc/utils/parallel/gr2gran.bash b/utils/parallel/gr2gran.bash
index d281d2c5bc..d281d2c5bc 100644
--- a/ghc/utils/parallel/gr2gran.bash
+++ b/utils/parallel/gr2gran.bash
diff --git a/ghc/utils/parallel/gr2java.pl b/utils/parallel/gr2java.pl
index acd0b5e631..acd0b5e631 100644
--- a/ghc/utils/parallel/gr2java.pl
+++ b/utils/parallel/gr2java.pl
diff --git a/ghc/utils/parallel/gr2jv.bash b/utils/parallel/gr2jv.bash
index 7eeacfe556..7eeacfe556 100644
--- a/ghc/utils/parallel/gr2jv.bash
+++ b/utils/parallel/gr2jv.bash
diff --git a/ghc/utils/parallel/gr2pe.pl b/utils/parallel/gr2pe.pl
index 6026300758..6026300758 100644
--- a/ghc/utils/parallel/gr2pe.pl
+++ b/utils/parallel/gr2pe.pl
diff --git a/ghc/utils/parallel/gr2ps.bash b/utils/parallel/gr2ps.bash
index 4d4d3da3e6..4d4d3da3e6 100644
--- a/ghc/utils/parallel/gr2ps.bash
+++ b/utils/parallel/gr2ps.bash
diff --git a/ghc/utils/parallel/gr2qp.pl b/utils/parallel/gr2qp.pl
index e87f21b1e4..e87f21b1e4 100644
--- a/ghc/utils/parallel/gr2qp.pl
+++ b/utils/parallel/gr2qp.pl
diff --git a/ghc/utils/parallel/gran-extr.pl b/utils/parallel/gran-extr.pl
index 509da499d6..509da499d6 100644
--- a/ghc/utils/parallel/gran-extr.pl
+++ b/utils/parallel/gran-extr.pl
diff --git a/ghc/utils/parallel/grs2gr.pl b/utils/parallel/grs2gr.pl
index ab398a53d9..ab398a53d9 100644
--- a/ghc/utils/parallel/grs2gr.pl
+++ b/utils/parallel/grs2gr.pl
diff --git a/ghc/utils/parallel/par-aux.pl b/utils/parallel/par-aux.pl
index 8484057aab..8484057aab 100644
--- a/ghc/utils/parallel/par-aux.pl
+++ b/utils/parallel/par-aux.pl
diff --git a/ghc/utils/parallel/ps-scale-y.pl b/utils/parallel/ps-scale-y.pl
index 0e1242081c..0e1242081c 100644
--- a/ghc/utils/parallel/ps-scale-y.pl
+++ b/utils/parallel/ps-scale-y.pl
diff --git a/ghc/utils/parallel/qp2ap.pl b/utils/parallel/qp2ap.pl
index b3c3bcf122..b3c3bcf122 100644
--- a/ghc/utils/parallel/qp2ap.pl
+++ b/utils/parallel/qp2ap.pl
diff --git a/ghc/utils/parallel/qp2ps.pl b/utils/parallel/qp2ps.pl
index 2fb090346a..2fb090346a 100644
--- a/ghc/utils/parallel/qp2ps.pl
+++ b/utils/parallel/qp2ps.pl
diff --git a/ghc/utils/parallel/sn_filter.pl b/utils/parallel/sn_filter.pl
index 4bfc2d1721..4bfc2d1721 100644
--- a/ghc/utils/parallel/sn_filter.pl
+++ b/utils/parallel/sn_filter.pl
diff --git a/ghc/utils/parallel/stats.pl b/utils/parallel/stats.pl
index 6cf826b5cd..6cf826b5cd 100644
--- a/ghc/utils/parallel/stats.pl
+++ b/utils/parallel/stats.pl
diff --git a/ghc/utils/parallel/template.pl b/utils/parallel/template.pl
index 7fbe4cf797..7fbe4cf797 100644
--- a/ghc/utils/parallel/template.pl
+++ b/utils/parallel/template.pl
diff --git a/ghc/utils/parallel/tf.pl b/utils/parallel/tf.pl
index 40cff09f2c..40cff09f2c 100644
--- a/ghc/utils/parallel/tf.pl
+++ b/utils/parallel/tf.pl
diff --git a/ghc/utils/prof/Makefile b/utils/prof/Makefile
index 7887be7f1d..994d8c83f5 100644
--- a/ghc/utils/prof/Makefile
+++ b/utils/prof/Makefile
@@ -1,9 +1,3 @@
-#-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.5 2000/09/05 10:16:41 simonmar Exp $
-#
-# (c) The GHC Team, 2000
-#
-
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
 
diff --git a/utils/prof/cgprof/Makefile b/utils/prof/cgprof/Makefile
new file mode 100644
index 0000000000..17c567537a
--- /dev/null
+++ b/utils/prof/cgprof/Makefile
@@ -0,0 +1,9 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+
+C_PROG = cgprof
+INSTALL_LIBEXECS=$(C_PROG)
+
+SRC_CC_OPTS += -Wall -I$(GHC_INCLUDE_DIR)
+
+include $(TOP)/mk/target.mk
diff --git a/ghc/utils/prof/cgprof/README b/utils/prof/cgprof/README
index 2c4ca16bc9..2c4ca16bc9 100644
--- a/ghc/utils/prof/cgprof/README
+++ b/utils/prof/cgprof/README
diff --git a/ghc/utils/prof/cgprof/cgprof.c b/utils/prof/cgprof/cgprof.c
index 8ee66e1f52..8ee66e1f52 100644
--- a/ghc/utils/prof/cgprof/cgprof.c
+++ b/utils/prof/cgprof/cgprof.c
diff --git a/ghc/utils/prof/cgprof/cgprof.h b/utils/prof/cgprof/cgprof.h
index e93f02b53e..e93f02b53e 100644
--- a/ghc/utils/prof/cgprof/cgprof.h
+++ b/utils/prof/cgprof/cgprof.h
diff --git a/ghc/utils/prof/cgprof/daVinci.c b/utils/prof/cgprof/daVinci.c
index 0a59d1c89e..0a59d1c89e 100644
--- a/ghc/utils/prof/cgprof/daVinci.c
+++ b/utils/prof/cgprof/daVinci.c
diff --git a/ghc/utils/prof/cgprof/daVinci.h b/utils/prof/cgprof/daVinci.h
index 3f6106983d..3f6106983d 100644
--- a/ghc/utils/prof/cgprof/daVinci.h
+++ b/utils/prof/cgprof/daVinci.h
diff --git a/ghc/utils/prof/cgprof/main.c b/utils/prof/cgprof/main.c
index afa8fbee19..afa8fbee19 100644
--- a/ghc/utils/prof/cgprof/main.c
+++ b/utils/prof/cgprof/main.c
diff --git a/ghc/utils/prof/cgprof/matrix.c b/utils/prof/cgprof/matrix.c
index b4ca43f96b..b4ca43f96b 100644
--- a/ghc/utils/prof/cgprof/matrix.c
+++ b/utils/prof/cgprof/matrix.c
diff --git a/ghc/utils/prof/cgprof/matrix.h b/utils/prof/cgprof/matrix.h
index bf70cf7c90..bf70cf7c90 100644
--- a/ghc/utils/prof/cgprof/matrix.h
+++ b/utils/prof/cgprof/matrix.h
diff --git a/ghc/utils/prof/cgprof/symbol.c b/utils/prof/cgprof/symbol.c
index 133f59b2db..133f59b2db 100644
--- a/ghc/utils/prof/cgprof/symbol.c
+++ b/utils/prof/cgprof/symbol.c
diff --git a/ghc/utils/prof/cgprof/symbol.h b/utils/prof/cgprof/symbol.h
index 697973150c..697973150c 100644
--- a/ghc/utils/prof/cgprof/symbol.h
+++ b/utils/prof/cgprof/symbol.h
diff --git a/ghc/utils/prof/ghcprof.prl b/utils/prof/ghcprof.prl
index bc3b344228..bc3b344228 100644
--- a/ghc/utils/prof/ghcprof.prl
+++ b/utils/prof/ghcprof.prl
diff --git a/utils/prof/icons/Makefile b/utils/prof/icons/Makefile
new file mode 100644
index 0000000000..fde1b16d3a
--- /dev/null
+++ b/utils/prof/icons/Makefile
@@ -0,0 +1,7 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+
+override datadir=$(libdir)/icons
+INSTALL_DATAS=$(wildcard *.xbm)
+
+include $(TOP)/mk/target.mk
diff --git a/ghc/utils/prof/icons/absdelta.xbm b/utils/prof/icons/absdelta.xbm
index e70e372dd0..e70e372dd0 100644
--- a/ghc/utils/prof/icons/absdelta.xbm
+++ b/utils/prof/icons/absdelta.xbm
diff --git a/ghc/utils/prof/icons/absolute.xbm b/utils/prof/icons/absolute.xbm
index 045e1601f3..045e1601f3 100644
--- a/ghc/utils/prof/icons/absolute.xbm
+++ b/utils/prof/icons/absolute.xbm
diff --git a/ghc/utils/prof/icons/comm.xbm b/utils/prof/icons/comm.xbm
index 3f1fe9412b..3f1fe9412b 100644
--- a/ghc/utils/prof/icons/comm.xbm
+++ b/utils/prof/icons/comm.xbm
diff --git a/ghc/utils/prof/icons/commslack.xbm b/utils/prof/icons/commslack.xbm
index f53e40fa8f..f53e40fa8f 100644
--- a/ghc/utils/prof/icons/commslack.xbm
+++ b/utils/prof/icons/commslack.xbm
diff --git a/ghc/utils/prof/icons/comp.xbm b/utils/prof/icons/comp.xbm
index 923ef2f3de..923ef2f3de 100644
--- a/ghc/utils/prof/icons/comp.xbm
+++ b/utils/prof/icons/comp.xbm
diff --git a/ghc/utils/prof/icons/compress.xbm b/utils/prof/icons/compress.xbm
index 39ff2f828e..39ff2f828e 100644
--- a/ghc/utils/prof/icons/compress.xbm
+++ b/utils/prof/icons/compress.xbm
diff --git a/ghc/utils/prof/icons/compslack.xbm b/utils/prof/icons/compslack.xbm
index 4592554582..4592554582 100644
--- a/ghc/utils/prof/icons/compslack.xbm
+++ b/utils/prof/icons/compslack.xbm
diff --git a/ghc/utils/prof/icons/delete.xbm b/utils/prof/icons/delete.xbm
index 166d605a5a..166d605a5a 100644
--- a/ghc/utils/prof/icons/delete.xbm
+++ b/utils/prof/icons/delete.xbm
diff --git a/ghc/utils/prof/icons/help.xbm b/utils/prof/icons/help.xbm
index 688e7dbd28..688e7dbd28 100644
--- a/ghc/utils/prof/icons/help.xbm
+++ b/utils/prof/icons/help.xbm
diff --git a/ghc/utils/prof/icons/hrel.xbm b/utils/prof/icons/hrel.xbm
index 36e58a9baf..36e58a9baf 100644
--- a/ghc/utils/prof/icons/hrel.xbm
+++ b/utils/prof/icons/hrel.xbm
diff --git a/ghc/utils/prof/icons/hrelslack.xbm b/utils/prof/icons/hrelslack.xbm
index 8de8f0d36a..8de8f0d36a 100644
--- a/ghc/utils/prof/icons/hrelslack.xbm
+++ b/utils/prof/icons/hrelslack.xbm
diff --git a/ghc/utils/prof/icons/jump.xbm b/utils/prof/icons/jump.xbm
index 0e0327d45f..0e0327d45f 100644
--- a/ghc/utils/prof/icons/jump.xbm
+++ b/utils/prof/icons/jump.xbm
diff --git a/ghc/utils/prof/icons/mycomm.xbm b/utils/prof/icons/mycomm.xbm
index 8a3adcdb25..8a3adcdb25 100644
--- a/ghc/utils/prof/icons/mycomm.xbm
+++ b/utils/prof/icons/mycomm.xbm
diff --git a/ghc/utils/prof/icons/oxpara.xbm b/utils/prof/icons/oxpara.xbm
index 323270f9dd..323270f9dd 100644
--- a/ghc/utils/prof/icons/oxpara.xbm
+++ b/utils/prof/icons/oxpara.xbm
diff --git a/ghc/utils/prof/icons/percent.xbm b/utils/prof/icons/percent.xbm
index 1dd05821c6..1dd05821c6 100644
--- a/ghc/utils/prof/icons/percent.xbm
+++ b/utils/prof/icons/percent.xbm
diff --git a/ghc/utils/prof/icons/reldelta.xbm b/utils/prof/icons/reldelta.xbm
index 4e79b68ba8..4e79b68ba8 100644
--- a/ghc/utils/prof/icons/reldelta.xbm
+++ b/utils/prof/icons/reldelta.xbm
diff --git a/ghc/utils/prof/icons/sync.xbm b/utils/prof/icons/sync.xbm
index 55f3e55ff4..55f3e55ff4 100644
--- a/ghc/utils/prof/icons/sync.xbm
+++ b/utils/prof/icons/sync.xbm
diff --git a/ghc/utils/prof/icons/time.xbm b/utils/prof/icons/time.xbm
index e8a79375b3..e8a79375b3 100644
--- a/ghc/utils/prof/icons/time.xbm
+++ b/utils/prof/icons/time.xbm
diff --git a/ghc/utils/prof/icons/time1.xbm b/utils/prof/icons/time1.xbm
index 0d2d4d7268..0d2d4d7268 100644
--- a/ghc/utils/prof/icons/time1.xbm
+++ b/utils/prof/icons/time1.xbm
diff --git a/ghc/utils/prof/icons/uncompress.xbm b/utils/prof/icons/uncompress.xbm
index 56f1293316..56f1293316 100644
--- a/ghc/utils/prof/icons/uncompress.xbm
+++ b/utils/prof/icons/uncompress.xbm
diff --git a/ghc/utils/prof/icons/undo.xbm b/utils/prof/icons/undo.xbm
index 0658dc1e8e..0658dc1e8e 100644
--- a/ghc/utils/prof/icons/undo.xbm
+++ b/utils/prof/icons/undo.xbm
diff --git a/ghc/utils/prof/icons/wait.xbm b/utils/prof/icons/wait.xbm
index b0c16fc014..b0c16fc014 100644
--- a/ghc/utils/prof/icons/wait.xbm
+++ b/utils/prof/icons/wait.xbm
diff --git a/ghc/utils/prof/icons/weightdelta.xbm b/utils/prof/icons/weightdelta.xbm
index 9ffa012260..9ffa012260 100644
--- a/ghc/utils/prof/icons/weightdelta.xbm
+++ b/utils/prof/icons/weightdelta.xbm
diff --git a/ghc/utils/pvm/README b/utils/pvm/README
index 5ab58ddec8..5ab58ddec8 100644
--- a/ghc/utils/pvm/README
+++ b/utils/pvm/README
diff --git a/ghc/utils/pvm/debugger.emacs b/utils/pvm/debugger.emacs
index ee053ca7b4..ee053ca7b4 100644
--- a/ghc/utils/pvm/debugger.emacs
+++ b/utils/pvm/debugger.emacs
diff --git a/ghc/utils/pvm/debugger2 b/utils/pvm/debugger2
index 7cdf8b9a1a..7cdf8b9a1a 100644
--- a/ghc/utils/pvm/debugger2
+++ b/utils/pvm/debugger2
diff --git a/ghc/utils/runghc/Makefile b/utils/runghc/Makefile
index fd18313305..90e4949530 100644
--- a/ghc/utils/runghc/Makefile
+++ b/utils/runghc/Makefile
@@ -8,7 +8,7 @@ UseGhcForCc = YES
 SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR)
 
 # This causes libghccompat.a to be used:
-include $(GHC_LIB_COMPAT_DIR)/compat.mk
+include $(GHC_COMPAT_DIR)/compat.mk
 
 # This is required because libghccompat.a must be built with
 # $(GhcHcOpts) because it is linked to the compiler, and hence
diff --git a/ghc/utils/runghc/runghc.hs b/utils/runghc/runghc.hs
index f8330b5721..f8330b5721 100644
--- a/ghc/utils/runghc/runghc.hs
+++ b/utils/runghc/runghc.hs
diff --git a/glafp-utils/runstdtest/Makefile b/utils/runstdtest/Makefile
index ec2f66abc7..0bd2babfc2 100644
--- a/glafp-utils/runstdtest/Makefile
+++ b/utils/runstdtest/Makefile
@@ -1,7 +1,4 @@
-# $Id: Makefile,v 1.5 2000/09/05 10:16:41 simonmar Exp $
-#
-
-TOP=..
+TOP=../..
 include $(TOP)/mk/boilerplate.mk
 
 SCRIPT_PROG=runstdtest
diff --git a/glafp-utils/runstdtest/runstdtest.prl b/utils/runstdtest/runstdtest.prl
index 1b1af9fb4d..1b1af9fb4d 100644
--- a/glafp-utils/runstdtest/runstdtest.prl
+++ b/utils/runstdtest/runstdtest.prl
diff --git a/ghc/utils/stat2resid/Makefile b/utils/stat2resid/Makefile
index 42c0c4107f..f474f5229d 100644
--- a/ghc/utils/stat2resid/Makefile
+++ b/utils/stat2resid/Makefile
@@ -1,6 +1,3 @@
-#-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.11 2000/09/05 10:16:41 simonmar Exp $
-
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
 
diff --git a/ghc/utils/stat2resid/parse-gcstats.prl b/utils/stat2resid/parse-gcstats.prl
index d882ee6348..d882ee6348 100644
--- a/ghc/utils/stat2resid/parse-gcstats.prl
+++ b/utils/stat2resid/parse-gcstats.prl
diff --git a/ghc/utils/stat2resid/prefix.txt b/utils/stat2resid/prefix.txt
index 0de9d61f25..0de9d61f25 100644
--- a/ghc/utils/stat2resid/prefix.txt
+++ b/utils/stat2resid/prefix.txt
diff --git a/ghc/utils/stat2resid/process-gcstats.prl b/utils/stat2resid/process-gcstats.prl
index ff41cf6af9..ff41cf6af9 100644
--- a/ghc/utils/stat2resid/process-gcstats.prl
+++ b/utils/stat2resid/process-gcstats.prl
diff --git a/ghc/utils/stat2resid/stat2resid.prl b/utils/stat2resid/stat2resid.prl
index bf0a262428..bf0a262428 100644
--- a/ghc/utils/stat2resid/stat2resid.prl
+++ b/utils/stat2resid/stat2resid.prl
diff --git a/ghc/utils/touchy/Makefile b/utils/touchy/Makefile
index d2430df162..d2430df162 100644
--- a/ghc/utils/touchy/Makefile
+++ b/utils/touchy/Makefile
diff --git a/ghc/utils/touchy/touchy.c b/utils/touchy/touchy.c
index 90fb31e93e..90fb31e93e 100644
--- a/ghc/utils/touchy/touchy.c
+++ b/utils/touchy/touchy.c
diff --git a/ghc/utils/unlit/Makefile b/utils/unlit/Makefile
index 15e7fc4252..15e7fc4252 100644
--- a/ghc/utils/unlit/Makefile
+++ b/utils/unlit/Makefile
diff --git a/ghc/utils/unlit/README b/utils/unlit/README
index 4dd2ef5132..4dd2ef5132 100644
--- a/ghc/utils/unlit/README
+++ b/utils/unlit/README
diff --git a/ghc/utils/unlit/unlit.c b/utils/unlit/unlit.c
index 366302156a..366302156a 100644
--- a/ghc/utils/unlit/unlit.c
+++ b/utils/unlit/unlit.c
diff --git a/glafp-utils/verbatim/Makefile b/utils/verbatim/Makefile
index eb40f0d1a3..4a4301dfe0 100644
--- a/glafp-utils/verbatim/Makefile
+++ b/utils/verbatim/Makefile
@@ -1,4 +1,4 @@
-TOP=..
+TOP=../..
 include $(TOP)/mk/boilerplate.mk
 
 C_SRCS = verbatim.c
diff --git a/glafp-utils/verbatim/verbatim.lex b/utils/verbatim/verbatim.lex
index bac87cc45f..bac87cc45f 100644
--- a/glafp-utils/verbatim/verbatim.lex
+++ b/utils/verbatim/verbatim.lex