summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile7
-rw-r--r--compiler/Makefile855
-rw-r--r--compiler/Makefile.ghcbin61
-rw-r--r--compiler/Makefile.local75
-rw-r--r--compiler/count_lines63
-rw-r--r--compiler/ghc-inplace.c29
-rw-r--r--compiler/ghc.cabal437
-rw-r--r--compiler/main/SysTools.lhs11
-rw-r--r--compiler/utils/FastString.lhs4
-rw-r--r--compiler/utils/Pretty.lhs4
-rw-r--r--compiler/utils/Util.lhs11
-rw-r--r--ghc/Main.hs (renamed from compiler/main/Main.hs)0
-rw-r--r--ghc/Makefile106
-rw-r--r--ghc/ghc-bin.cabal40
-rw-r--r--ghc/ghc.wrapper2
-rw-r--r--libraries/Makefile13
-rw-r--r--libraries/Makefile.local3
-rw-r--r--mk/cabal-flags.mk9
-rw-r--r--mk/config.mk.in21
19 files changed, 863 insertions, 888 deletions
diff --git a/Makefile b/Makefile
index 9b670fdac5..f5b170661a 100644
--- a/Makefile
+++ b/Makefile
@@ -67,12 +67,12 @@ include $(TOP)/mk/boilerplate.mk
# We can't 'make boot' in libraries until stage1 is built
ifeq "$(BootingFromHc)" "YES"
-SUBDIRS_BUILD = includes rts compiler docs utils driver
+SUBDIRS_BUILD = includes rts compiler ghc docs utils driver
else
-SUBDIRS_BUILD = includes utils driver docs compiler rts libraries/Cabal/doc
+SUBDIRS_BUILD = includes utils driver docs compiler ghc rts libraries/Cabal/doc
endif
-SUBDIRS = gmp libffi includes utils driver docs rts libraries compiler libraries/Cabal/doc
+SUBDIRS = gmp libffi includes utils driver docs rts compiler ghc libraries libraries/Cabal/doc
check-all: check-tools check-packages
@@ -142,6 +142,7 @@ stage1 : $(GCC_LIB_DEP) check-all
stage2 : check-all
$(MAKE) -C compiler boot stage=2
$(MAKE) -C compiler stage=2
+ $(MAKE) -C ghc stage=2
stage3 : check-all
diff --git a/compiler/Makefile b/compiler/Makefile
index 536f246787..dbc472596b 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -17,163 +17,169 @@
TOP = ..
-# Use GHC for compiling C bits (NB. must be before boilerplate include)
-#
-UseGhcForCc = YES
-
-# We don't want to compile stage1 in multiple ways
-ifeq "$(findstring $(stage), 2 3)" ""
-WAYS=
+ifeq "$(stage)" ""
+stage=1
endif
include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/cabal-flags.mk
-ifeq "$(GhcThreaded)$(GhcProfiled)" "YESYES"
+ifeq "$(GhcThreaded) $(GhcProfiled)" "YES YES"
$(error Cannot make GHC both threaded and profiled)
endif
+CONFIG_HS = main/Config.hs
+PRIMOP_BITS = primop-data-decl.hs-incl \
+ primop-tag.hs-incl \
+ primop-list.hs-incl \
+ primop-has-side-effects.hs-incl \
+ primop-out-of-line.hs-incl \
+ primop-commutable.hs-incl \
+ primop-needs-wrapper.hs-incl \
+ primop-can-fail.hs-incl \
+ primop-strictness.hs-incl \
+ primop-primop-info.hs-incl
+
+all:: build.stage$(stage)
-#-----------------------------------------------------------------------------
-# Counting source code lines
+stage1 ::
+ $(MAKE) stage=1
-USER_SRCS = $(filter-out $(DERIVED_SRCS),$(SRCS))
-count :
- ./count_lines $(USER_SRCS)
+stage2 ::
+ $(MAKE) stage=2
-# -----------------------------------------------------------------------------
-# Bootstrapping
+stage3 ::
+ $(MAKE) stage=3
-# The stage1/stage2/stage3 business is quite delicate. Here's how it works:
-#
-# - the variable $(stage) holds the current stage number. To build a
-# particular stage, you say 'make stage=N' where N is 1, 2, or 3.
-# N defaults to 1.
-#
-# - for stage N, object files and .hi files are placed inside
-# the directory stageN, in subdirectories as per the sources.
-#
-# - we use explicit -o and -ohi options to direct the output from C &
-# Haskell compilations.
-#
-# - we generate a different .depend file for each build. They need to be
-# different, because each stage might include different files: stage1
-# might not include GHCi, for example. For each stage, a normal .depend
-# file is generated, and then post-processed to add the correct stageN/
-# prefix to each object and .hi filename. The resulting .depend file
-# is named .depend-$(stage). See the end of this Makefile for details.
-#
-# - normal implicit rules don't work any more, because they're of the form
-#
-# %.o : %.hs
-#
-# whereas we really need
-#
-# stageN/%.o : %.hs
-#
-# so suffix.mk now defines the appropriate suffix rules when
-# $(odir) is set to a non-empty value. Here we set $(odir) to
-# stage1, stage2, or stage3.
-#
-# There are other plausible designs that might work, but each has different
-# problems:
-#
-# - using -odir and -hidir:
-# -odir puts all the objects in one directory (strips off the
-# subdirectory part), which eventually forces us to use VPATH to find
-# the sources. I have a really bad feeling about VPATH.
-#
-# - invoke make in the stageN subdirectory. This probably requires VPATH
-# too.
-#
-# - create a link tree. The problem with requiring link trees is that
-# Windows doesn't support symbolic links.
+clean distclean::
+ -$(CABAL) clean --distpref dist-stage1
+ -$(CABAL) clean --distpref dist-stage2
+ $(RM) -f Makefile-stage1
+ $(RM) -f Makefile-stage2
+ $(RM) -f prelude/primops.txt
+ $(RM) -f $(PRIMOP_BITS)
+ $(RM) -f $(CONFIG_HS)
-ifeq "$(stage)" ""
-stage=1
+ifeq "$(GhcWithInterpreter)" "YES"
+CONFIGURE_FLAGS_STAGE2 += --flags=ghci
+
+# If we are going to use dynamic libraries instead of .o files for ghci,
+# we will need to always retain CAFs in the compiler.
+# ghci/keepCAFsForGHCi contains a GNU C __attribute__((constructor))
+# function which sets the keepCAFs flag for the RTS before any Haskell
+# code is run.
+ifeq "$(GhcBuildDylibs)" "YES"
+CONFIGURE_FLAGS_STAGE2 += --flags=dynlibs
+else
+CONFIGURE_FLAGS_STAGE2 += --flags=-dynlibs
endif
-.DUMMY: stage_dir
-stage_dirs :
- $(MKDIRHIER) stage$(stage)
- for i in $(ALL_DIRS); do \
- $(MKDIRHIER) stage$(stage)/$$i; \
- done
+ifeq "$(GhcEnableTablesNextToCode) $(GhcUnregisterised)" "YES NO"
+# Should GHCI be building info tables in the TABLES_NEXT_TO_CODE style
+# or not?
+# XXX This should logically be a CPP option, but there doesn't seem to
+# be a flag for that
+CONFIGURE_FLAGS_STAGE2 += --ghc-option=-DGHCI_TABLES_NEXT_TO_CODE
+endif
+
+# Should the debugger commands be enabled?
+ifeq "$(GhciWithDebugger)" "YES"
+CONFIGURE_FLAGS_STAGE2 += --ghc-option=-DDEBUGGER
+endif
-ifeq "$(stage)" "1"
-UsingHsBoot = YES
+# Enable editline if either:
+# - we're building stage 1 and $(GhcHasEditline)="YES"
+# - we're building stage 2/3, and we have built the editline package
+#
+# But we don't enable editline on Windows, as Windows terminals have
+# editline-like support builtin.
+#
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+CONFIGURE_FLAGS_STAGE1 += --flags=-editline
+CONFIGURE_FLAGS_STAGE2 += --flags=-editline
else
-ifneq "$(findstring $(stage), 2 3)" ""
-UsingHsBoot = YES
+ifeq "$(GhcHasEditline)" "YES"
+CONFIGURE_FLAGS_STAGE1 += --flags=editline
else
-UsingHsBoot = NO
+CONFIGURE_FLAGS_STAGE1 += --flags=-editline
endif
+ifeq "$(wildcard $(FPTOOLS_TOP_ABS)/libraries/editline/unbuildable)" ""
+CONFIGURE_FLAGS_STAGE2 += --flags=editline
+else
+CONFIGURE_FLAGS_STAGE2 += --flags=-editline
endif
-
-boot :: stage_dirs
-
-ifeq "$(stage)" "1"
-HC=$(GHC)
endif
-ifeq "$(stage)" "2"
-HC=$(GHC_STAGE1)
+else
+CONFIGURE_FLAGS_STAGE2 += --flags=-ghci
endif
-ifeq "$(stage)" "3"
-HC=$(GHC_STAGE2)
+ifeq "$(GhcWithNativeCodeGen)" "NO"
+# XXX This should logically be a CPP option, but there doesn't seem to
+# be a flag for that
+CONFIGURE_FLAGS_STAGE1 += --ghc-option=-DOMIT_NATIVE_CODEGEN
+CONFIGURE_FLAGS_STAGE2 += --ghc-option=-DOMIT_NATIVE_CODEGEN
endif
-stage1 ::
- $(MAKE) stage=1
-
-stage2 ::
- $(MAKE) stage=2
-
-stage3 ::
- $(MAKE) stage=3
-
-odir=stage$(stage)
-
-SRC_HC_OPTS += $(patsubst %, -i$(odir)/%, $(ALL_DIRS))
-
-SRC_HC_OPTS += -Wall -fno-warn-name-shadowing -fno-warn-orphans
-
-HS_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(HS_SRCS))))
-C_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(C_SRCS))))
-
-# Our standard cleaning rules don't know that we're doing our output
-# into $(odir), so we have to augment CLEAN_FILES appropriateliy.
-
-CLEAN_FILES += $(odir)/*/*.$(way_)hi $(odir)/*/*.$(way_)hi-boot $(odir)/*/*.$(way_)o-boot
+ifeq "$(TargetOS_CPP)" "openbsd"
+CONFIGURE_FLAGS_STAGE1 += --ld-options="-Xlinker -E"
+CONFIGURE_FLAGS_STAGE2 += --ld-options="-Xlinker -E"
+endif
-ifeq "$(UsingHsBoot)" "YES"
-CLEAN_FILES += $(odir)/*/*.hi-boot $(odir)/*/*.o-boot
+ifeq "$(GhcUnregisterised)" "NO"
+ifeq "$(HOSTPLATFORM)" "ia64-unknown-linux"
+# needed for generating proper relocation in large binaries: trac #856
+CONFIGURE_FLAGS_STAGE1 += --ld-option=-Wl,--relax
+CONFIGURE_FLAGS_STAGE2 += --ld-option=-Wl,--relax
+endif
endif
-ifeq "$(stage)" "1"
-mostlyclean clean distclean maintainer-clean ::
- $(MAKE) $@ stage=2
- $(MAKE) $@ stage=3
+ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+# The #include is vital for the via-C route with older compilers, else the C
+# compiler doesn't realise that the stcall foreign imports are indeed
+# stdcall, and doesn't generate the Foo@8 name for them
+# As it's only important for older compilers we don't need to do anything
+# for stage2+.
+CONFIGURE_FLAGS_STAGE1 += --ghc-options='-\#include <windows.h> -\#include <process.h>'
endif
-# -----------------------------------------------------------------------------
-# Set HS_PROG
+# ghc_strlen percolates through so many modules that it is easier to get its
+# prototype via a global option instead of a myriad of per-file OPTIONS.
+# Again, this is only important for older compilers, so we don't do it in
+# stage 2+.
+CONFIGURE_FLAGS_STAGE1 += --ghc-options='-\#include "cutils.h"'
+
+build.stage1: $(PRIMOP_BITS)
+ $(CABAL) configure --distpref dist-stage1 \
+ $(CONFIGURE_FLAGS_STAGE1) \
+ $(INSTALL_DIRS_CONFIGURE_FLAGS) \
+ $(USE_BOOT_CONFIGURE_FLAGS) \
+ $(COMMON_CONFIGURE_FLAGS) \
+ --flags=-ghci \
+ --flags=stage1 \
+ --ghc-option=-DSTAGE=1
+ $(RM) -f Makefile-stage1
+ $(CABAL) makefile --distpref dist-stage1 -f Makefile-stage1
+ $(MAKE) -f Makefile-stage1 stage=1
+ $(CABAL) register --distpref dist-stage1 --inplace
+
+build.stage2: $(PRIMOP_BITS)
+ $(CABAL) configure --distpref dist-stage2 \
+ $(CONFIGURE_FLAGS_STAGE2) \
+ $(INSTALL_DIRS_CONFIGURE_FLAGS) \
+ $(USE_STAGE1_CONFIGURE_FLAGS) \
+ $(COMMON_CONFIGURE_FLAGS) \
+ --flags=-stage1 \
+ --ghc-option=-DSTAGE=2
+ $(RM) -f Makefile-stage2
+ $(CABAL) makefile --distpref dist-stage2 -f Makefile-stage2
+ $(MAKE) -f Makefile-stage2 stage=2
+ $(CABAL) register --distpref dist-stage2 --inplace
-# Note: there have been reports of people running up against the ARG_MAX limit
-# when linking ghc with all its constituent object files. The likely source of
-# the problem is that the environment is a bit too big, so a workaround could
-# be to do `env PATH=$(PATH) make ghc' to minimise the environment. (or the
-# equivalent of `env' if it doesn't exist locally).
-#
-ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-GHC_PROG=$(odir)/ghc$(_way)-$(ProjectVersion)
-else
-GHC_PROG=$(odir)/ghc$(_way)
-endif
+stage_dirs :
+ $(MKDIRHIER) stage$(stage)
-ifeq "$(stage)" "1"
-HS_PROG = $(GHC_PROG)
-endif
+boot :: stage_dirs
# -----------------------------------------------------------------------------
# Create compiler configuration
@@ -181,7 +187,6 @@ endif
# The 'echo' commands simply spit the values of various make variables
# into Config.hs, whence they can be compiled and used by GHC itself
-CONFIG_HS = main/Config.hs
boot :: $(CONFIG_HS)
$(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk
@@ -199,7 +204,7 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk
@echo "cBooterVersion :: String" >> $(CONFIG_HS)
@echo "cBooterVersion = \"$(GhcVersion)\"" >> $(CONFIG_HS)
@echo "cStage :: String" >> $(CONFIG_HS)
- @echo "cStage = STAGE" >> $(CONFIG_HS)
+ @echo "cStage = show (STAGE :: Int)" >> $(CONFIG_HS)
@echo "cHscIfaceFileVersion :: String" >> $(CONFIG_HS)
@echo "cHscIfaceFileVersion = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS)
@echo "cSplitObjs :: String" >> $(CONFIG_HS)
@@ -278,8 +283,6 @@ else
endif
@echo done.
-CLEAN_FILES += $(CONFIG_HS)
-
# -----------------------------------------------------------------------------
# Create platform includes
@@ -379,254 +382,19 @@ endif
@echo "#endif /* __PLATFORM_H__ */" >> $@
@echo "Done."
-stage3/$(PLATFORM_H) : stage_dirs stage2/$(PLATFORM_H)
- $(CP) stage2/$(PLATFORM_H) stage3/$(PLATFORM_H)
-
STAGE_PLATFORM_H = stage$(stage)/$(PLATFORM_H)
boot :: $(STAGE_PLATFORM_H)
-SRC_HC_OPTS += -Istage$(stage)
-
-# -----------------------------------------------------------------------------
-# Set SRCS etc.
-#
-# First figure out ALL_DIRS, the source sub-directories
-
-ALL_DIRS = \
- utils basicTypes types hsSyn prelude rename typecheck deSugar coreSyn \
- vectorise specialise simplCore stranal stgSyn simplStg codeGen main \
- profiling parser cprAnalysis iface cmm
-
-# Make sure we include Config.hs even if it doesn't exist yet...
-ALL_SRCS += $(CONFIG_HS)
-
-# HsGeneric.hs is not used just now
-EXCLUDED_SRCS += hsSyn/HsGeneric.hs
-
-ifeq ($(GhcWithNativeCodeGen),YES)
-ALL_DIRS += nativeGen
-else
-SRC_HC_OPTS += -DOMIT_NATIVE_CODEGEN
-endif
-
-ifeq "$(BootingFromHc)" "YES"
-# HC files are always from a self-booted compiler
-bootstrapped = YES
-else
-ifneq "$(findstring $(stage), 2 3)" ""
-bootstrapped = YES
-else
-bootstrapped = NO
-endif
-endif
-
-# Beyond stage 1, honour any Mac OS X depolyment target options. If we use
-# these options in stage 1 we get a linker error if the bootstrap compiler is
-# for a more recent OS version
-ifneq "$(findstring $(stage), 2 3)" ""
-SRC_CC_OPTS += $(MACOSX_DEPLOYMENT_CC_OPTS)
-SRC_HC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS))
-SRC_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))
-endif
-
-# -----------------------------------------------------------------------------
-# Building a compiler with interpreter support
-#
-# The interpreter, GHCi interface, Template Haskell and Hpc are only
-# enabled when we are bootstrapping with the same version of GHC, and
-# the interpreter is supported on this platform.
-
-ifeq "$(bootstrapped)" "YES"
-SRC_HC_OPTS += -package bytestring
-PKG_DEPENDS += bytestring
-endif
-
-SRC_HC_OPTS += -package hpc
-PKG_DEPENDS += hpc
-
-ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES"
-
-# Yes, include the interepreter and Template Haskell extensions
-SRC_HC_OPTS += -DGHCI -package template-haskell
-PKG_DEPENDS += template-haskell
-
-# Should GHCI be building info tables in the TABLES_NEXT_TO_CODE style
-# or not?
-ifeq "$(GhcEnableTablesNextToCode) $(GhcUnregisterised)" "YES NO"
-SRC_HC_OPTS += -DGHCI_TABLES_NEXT_TO_CODE
-endif
-
-ifeq "$(GhcThreaded)" "YES"
-# Use threaded RTS with GHCi, so threads don't get blocked at the prompt.
-SRC_LD_OPTS += -threaded
-endif
-ifeq "$(GhcProfiled)" "YES"
-SRC_LD_OPTS += -prof
-endif
-ifeq "$(GhcDebugged)" "YES"
-SRC_LD_OPTS += -debug
-endif
-
-SRC_HC_OPTS += -I$(FPTOOLS_TOP)/libffi/build/include
-SRC_HSC2HS_OPTS += -I$(FPTOOLS_TOP)/libffi/build/include
-
-ALL_DIRS += ghci
-
-# If we are going to use dynamic libraries instead of .o files for ghci,
-# we will need to always retain CAFs in the compiler.
-# ghci/keepCAFsForGHCi contains a GNU C __attribute__((constructor))
-# function which sets the keepCAFs flag for the RTS before any Haskell
-# code is run.
-ifeq "$(GhcBuildDylibs)" "YES"
-else
-EXCLUDED_SRCS += ghci/keepCAFsForGHCi.c
-endif
-
-# Enable editline if either:
-# - we're building stage 1 and $(GhcHasEditline)="YES"
-# - we're building stage 2/3, and we have built the editline package
-#
-# But we don't enable editline on Windows, as Windows terminals have
-# editline-like support builtin.
-#
-ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-ifeq "$(stage)" "1"
-ifeq "$(GhcHasEditline)" "YES"
-SRC_HC_OPTS += -package editline -DUSE_EDITLINE
-PKG_DEPENDS += editline
-endif
-else
-ifeq "$(wildcard $(FPTOOLS_TOP_ABS)/libraries/editline/unbuildable)" ""
-SRC_HC_OPTS += -package editline -DUSE_EDITLINE
-PKG_DEPENDS += editline
-endif
-endif # stage=1
-endif # not windows
-
-else
-
-# No interpreter, so exclude Template Haskell modules
-EXCLUDED_SRCS += deSugar/DsMeta.hs typecheck/TcSplice.lhs hsSyn/Convert.lhs
-
-endif # bootstrapped with interpreter
-
-# -----------------------------------------------
-# mkdependC stuff
-#
-# Big Fudge to get around inherent problem that Makefile setup
-# has got with 'mkdependC'.
-#
-SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt)
-
-# XXX not really correct, hschooks.c actually gets include files like
-# RtsFlags.c from the installed GHC, but we can't tell mkdependC about that.
-SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR)
-
-# -----------------------------------------------------------------------------
-# Haskell compilations
-
-SRC_HC_OPTS += -cpp -fglasgow-exts -Rghc-timing -I. -Iparser -Iutil
-
-ifeq "$(ghc_ge_609)" "NO"
-SRC_HC_OPTS += -fno-generics
-else
-SRC_HC_OPTS += -XNoGenerics
-endif
-
-# Omitted: -I$(GHC_INCLUDE_DIR)
-# We should have -I$(GHC_INCLUDE_DIR) in SRC_HC_OPTS,
-# to avoid the use of an explicit path in GHC source files
-# (include "../includes/config.h"
-# But alas GHC 4.08 (and others for all I know) uses this very
-# same include path when compiling the .hc files it generates.
-# Disaster! Then the hc file sees the GHC 5.02 (or whatever)
-# include files. For the moment we've reverted to using
-# an explicit path in the .hs sources
-
-# We need System.Posix (or Posix when ghc < 6.2)
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-ifeq "$(bootstrapped)" "YES"
-SRC_HC_OPTS += -package Win32
-PKG_DEPENDS += Win32
-endif
-else
-SRC_HC_OPTS += -package unix
-PKG_DEPENDS += unix
-endif
-
-SRC_HC_OPTS += -package Cabal
-PKG_DEPENDS += Cabal
-
-# Ignore lang, to avoid potential clash with the Generics module if
-# lang happens to be a dependency of some exposed package in the local
-# GHC installation (eg. wxHaskell did this around 6.4).
-SRC_HC_OPTS += -ignore-package lang
-
-SRC_CC_OPTS += -Iparser -I. -O
-SRC_HC_OPTS += $(GhcHcOpts) $(GhcStage$(stage)HcOpts)
-SRC_HC_OPTS += -H16M
-
-ifeq "$(BootingFromHc)" "YES"
-SRC_CC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt)
-endif
-
-# ---- Profiling ----
-#simplCore/Simplify_HC_OPTS = -auto-all
-#simplCore/SimplEnv_HC_OPTS = -auto-all
-#simplCore/SimplUtils_HC_OPTS = -auto-all
-
-# The #include is vital for the via-C route, else the C
-# compiler doesn't realise that the stcall foreign imports are indeed
-# stdcall, and doesn't generate the Foo@8 name for them
-ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
-main/SysTools_HC_OPTS += '-\#include <windows.h>' '-\#include <process.h>'
-endif
-
-# ghc_strlen percolates through so many modules that it is easier to get its
-# prototype via a global option instead of a myriad of per-file OPTIONS
-SRC_HC_OPTS += '-\#include "cutils.h"'
-
# ----------------------------------------------------------------------------
# Generate supporting stuff for prelude/PrimOp.lhs
# from prelude/primops.txt
-PRIMOP_BITS=primop-data-decl.hs-incl \
- primop-tag.hs-incl \
- primop-list.hs-incl \
- primop-has-side-effects.hs-incl \
- primop-out-of-line.hs-incl \
- primop-commutable.hs-incl \
- primop-needs-wrapper.hs-incl \
- primop-can-fail.hs-incl \
- primop-strictness.hs-incl \
- primop-primop-info.hs-incl
-
-CLEAN_FILES += prelude/primops.txt
-CLEAN_FILES += $(PRIMOP_BITS)
-
SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR)
SRC_CPP_OPTS += ${GhcCppOpts}
-ifneq "$(BootingFromHc)" "YES"
-prelude/PrimOp.lhs $(odir)/prelude/PrimOp.o: $(PRIMOP_BITS)
-endif
-
-ifneq "$(BootingFromHc)" "YES"
-depend :: $(PRIMOP_BITS)
-endif
-
-# This is an ugly hack: we need stage1/$(PLATFORM_H) built before we
-# preprocess primops.txt.pp, but we don't want to just add that
-# dependency because we don't want $(PLATFORM_H) built during normal
-# operations, because we don't have have dependencies from the .hs
-# sources on it, and we don't want those dependencies because that
-# would cause everything to be rebuilt every time the Makefile
-# changed. So here we add the required dependency only when making
-# boot or depend:
-ifneq "$(findstring boot, $(MAKECMDGOALS))$(findstring depend, $(MAKECMDGOALS))" ""
-prelude/primops.txt.pp : stage1/$(PLATFORM_H)
-endif
+prelude/primops.txt parser/Parser.y: %: %.pp stage1/$(PLATFORM_H)
+ $(CPP) $(RAWCPP_FLAGS) -P $(CPP_OPTS) -x c $< | grep -v '^#pragma GCC' > $@
primop-data-decl.hs-incl: prelude/primops.txt
$(GENPRIMOP) --data-decl < $< > $@
@@ -654,342 +422,25 @@ primop-primop-info.hs-incl: prelude/primops.txt
primop-usage.hs-incl: prelude/primops.txt
$(GENPRIMOP) --usage < $< > $@
-
-#-----------------------------------------------------------------------------
-# Linking
-
-ifeq "$(GhcUnregisterised)" "NO"
-ifeq "$(HOSTPLATFORM)" "ia64-unknown-linux"
-# needed for generating proper relocation in large binaries: trac #856
-SRC_LD_OPTS += -optl-Wl,--relax
-endif
-endif
-
-# -----------------------------------------------------------------------------
-# create ghc-inplace, a convenient way to run ghc from the build tree...
-# See comments in $(FPTOOLS_TOP)/utils/ghc-pkg/Makefile for why we use
-# a real binary here rather than a shell script.
-
-INPLACE_SRC = $(odir)/ghc-inplace.c
-INPLACE_PROG = $(odir)/ghc-inplace$(_way)$(exeext)
-INPLACE_EXTRA_FLAGS = -I$(TOP)/includes
-EXCLUDED_C_SRCS += ghc-inplace.c
-
-CLEAN_FILES += $(INPLACE_SRC)
-
-GHC_PATH=$(FPTOOLS_TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)$(exeext)
-
-$(INPLACE_PROG): ghc-inplace.c
- $(SED) -e "s@GHC_PATH@$(GHC_PATH)@g" -e "s@TOP_ABS@$(FPTOOLS_TOP_ABS)@g" < $< > $(INPLACE_SRC)
- $(HC) -cpp $(INPLACE_EXTRA_FLAGS) $(INPLACE_SRC) -o $@
-
-all :: $(INPLACE_PROG)
-
-CLEAN_FILES += $(INPLACE_PROG)
-
-ifeq "$(stage)" "1"
-ghc-inplace : $(INPLACE_PROG)
- $(RM) -f $@ && $(LN_S) $< $@
-
-all :: ghc-inplace
-
-CLEAN_FILES += ghc-inplace
-endif
-
-#-----------------------------------------------------------------------------
-# install
-
-# We don't want ghc treated as an ordinary executable,
-# but put it together with the libraries.
-# Also don't want any interface files installed
-
-DESTDIR = $(INSTALL_LIBRARY_DIR_GHC)
-
-ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
-INSTALL_LIBEXECS += $(GHC_PROG)
-else
-INSTALL_PROGS += $(GHC_PROG)
-endif
-
-# ----------------------------------------------------------------------------
-# profiling.
-
-# rename/RnBinds_HC_OPTS += -auto-all
-# rename/RnEnv_HC_OPTS += -auto-all
-# rename/RnExpr_HC_OPTS += -auto-all
-# rename/RnHiFiles_HC_OPTS += -auto-all
-# rename/RnHsSyn_HC_OPTS += -auto-all
-# rename/Rename_HC_OPTS += -auto-all
-# rename/RnIfaces_HC_OPTS += -auto-all
-# rename/RnNames_HC_OPTS += -auto-all
-# rename/RnSource_HC_OPTS += -auto-all
-# rename/RnTypes_HC_OPTS += -auto-all
-#
-# typecheck/Inst_HC_OPTS += -auto-all
-# typecheck/TcBinds_HC_OPTS += -auto-all
-# typecheck/TcClassDcl_HC_OPTS += -auto-all
-# typecheck/TcDefaults_HC_OPTS += -auto-all
-# typecheck/TcDeriv_HC_OPTS += -auto-all
-# typecheck/TcEnv_HC_OPTS += -auto-all
-# typecheck/TcExpr_HC_OPTS += -auto-all
-# typecheck/TcForeign_HC_OPTS += -auto-all
-# typecheck/TcGenDeriv_HC_OPTS += -auto-all
-# typecheck/TcHsSyn_HC_OPTS += -auto-all
-# typecheck/TcIfaceSig_HC_OPTS += -auto-all
-# typecheck/TcInstDcls_HC_OPTS += -auto-all
-# typecheck/TcMatches_HC_OPTS += -auto-all
-# typecheck/TcMonoType_HC_OPTS += -auto-all
-# typecheck/TcMType_HC_OPTS += -auto-all
-# typecheck/TcPat_HC_OPTS += -auto-all
-# typecheck/TcRnDriver_HC_OPTS += -auto-all
-# #typecheck/TcRnMonad_HC_OPTS += -auto-all
-# #typecheck/TcRnTypes_HC_OPTS += -auto-all
-# typecheck/TcRules_HC_OPTS += -auto-all
-# typecheck/TcSimplify_HC_OPTS += -auto-all
-# typecheck/TcSplice_HC_OPTS += -auto-all
-# typecheck/TcTyClsDecls_HC_OPTS += -auto-all
-# typecheck/TcTyDecls_HC_OPTS += -auto-all
-# typecheck/TcType_HC_OPTS += -auto-all
-# typecheck/TcUnify_HC_OPTS += -auto-all
-
-# coreSyn/CorePrep_HC_OPTS += -auto-all
-
-#-----------------------------------------------------------------------------
-# Building the GHC package
-
-# The GHC package is made from the stage 2 build and later.
-# Fortunately the package build system framework more or less does the
-# right thing for us here.
-
-ifneq "$(findstring $(stage), 2 3)" ""
-BUILD_GHC_PACKAGE=YES
-endif
-
-ifeq "$(BUILD_GHC_PACKAGE)" "YES"
-PACKAGE = ghc
-HIERARCHICAL_LIB = NO
-VERSION = $(ProjectVersion)
-PKG_DEPENDS += base haskell98
-LIB_LD_OPTS += $(foreach pkg,$(PKG_DEPENDS),-package $(pkg))
-# We have to expand each package dependency with its version, which we
-# can do by calling "ghc-pkg list $pkg --simple-output".
-PACKAGE_CPP_OPTS += -DPKG_DEPENDS='$(foreach pkg,$(PKG_DEPENDS),$(shell $(GHC_PKG_INPLACE) latest --global $(pkg)))'
-# We want to define STAGE to be like "2" in the Haskell code, so we need
-# to quote the "s so that they don't get interpreted by the shell.
-PACKAGE_CPP_OPTS += -DSTAGE='"$(stage)"'
-
-# Omit Main from the library, the client will want to plug their own Main in
-LIBOBJS = $(filter-out $(odir)/main/Main.$(way_)o $(odir)/parser/hschooks.$(way_)o, $(OBJS))
-
-# disable splitting: it won't really help with GHC, and the specialised
-# 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
-# really want to build the whole of GHC multiple ways... if you do,
-# set GhcCompilerWays instead.
-GhcLibWays = $(GhcCompilerWays)
-
-# override $(GhcLibHcOpts): we want GhcStage2HcOpts to take precedence
-GhcLibHcOpts =
-
-ifeq "$(DOING_BIN_DIST)" "YES"
-# This is derived from the sources when we are in a source tree, but we
-# don't have any sources in a bindist, so we have to shortcut it
-HS_IFACES := $(wildcard stage$(stage)/*/*.hi)
-else
-# override default definition of HS_IFACES so we can add $(odir)
-HS_IFACES = $(addsuffix .$(way_)hi,$(basename $(HS_OBJS)))
-endif
-
-# Haddock can't handle recursive modules currently, so we disable it for now.
-override HADDOCK_DOCS = NO
-
-# Tell package.mk not to set $(HC)
-NO_SET_HC = YES
-
-# The stage 2 GHC binary itself is built by compiling main/Main.hs
-# (the same as used in stage 1) against the GHC package.
-#
-# This is done by compiling Main.hs separately and linking it with
-# -package ghc. This is done using a separate Makefile, Makefile.ghcbin
-# Why? See comments in Makefile.ghcbin
-
-# The stage 2 and stage 3 package.conf.in files are different, because they
-# point to either the stage2/ or stage3/ dirs in import-dirs. Hence before
-# linking the ghc binary we must install the correct version of the package
-# configuration. Yeuch... maybe one day this will all be done more cleanly.
-STAMP_PKG_CONF = $(GHC_DRIVER_DIR)/stamp-pkg-conf-$(PACKAGE)
-
-# Propagate standard targets to Makefile.ghcbin
-docs runtests $(BOOT_TARGET) TAGS clean distclean mostlyclean maintainer-clean $(INSTALL_TARGET) $(INSTALL_DOCS_TARGET) html chm HxS ps dvi txt::
- $(MAKE) -f Makefile.ghcbin $(MFLAGS) $@
-endif
-
-#-----------------------------------------------------------------------------
-# clean
-
-MAINTAINER_CLEAN_FILES += parser/Parser.info main/ParsePkgConf.info
-
-#-----------------------------------------------------------------------------
-# Include target-rule boilerplate
-
-# Don't use the default MKDEPENDHS stuff... we'll do our own, below
-MKDEPENDHS_SRCS =
-MKDEPENDC_SRCS =
-
-# Make doesn't work this out for itself, it seems
-parser/Parser.y : parser/Parser.y.pp
-EXTRA_SRCS += parser/Parser.y
-
-
-#-----------------------------------------------------------------------------
-# Source files for tags file generation
-#
-# We want to excluded derived sources, because they won't be in the source
-# tree, which is where we are going to move the TAGS file to.a
-
-TAGS_HS_SRCS = parser/Parser.y.pp $(filter-out $(DERIVED_SRCS) main/Config.hs parser/Parser.y, $(sort $(SRCS)))
-
-WRONG_GHCTAGS_HS_SRCS = $(filter-out $(DERIVED_SRCS) main/Config.hs parser/Parser.y, $(sort $(SRCS)))
-# above is wrong because of the following problem:
-# module `main:DataCon' is defined in multiple files: basicTypes/DataCon.lhs
-# basicTypes/DataCon.lhs-boot
-
-GHCTAGS_HS_SRCS = $(HS_SRCS)
-GHCTAGS_HC_OPTS = $(patsubst -i$(odir)/%, -i%, $(HC_OPTS))
-GHCTAGS_HC_OPTS += -DSTAGE='"$(stage)"'
-
-#------------------------------------------------------------
-# Tags
-
-.PHONY: ghctags
-
-ghctags :: $(GHCTAGS_HS_SRCS) $(TAGS_C_SRCS)
- @if [ "$(stage)" != 2 ]; then echo "Must use 'make stage=2 ghctags'"; exit 1; fi
- @$(RM) TAGS
- @touch TAGS
- @echo SOURCES ARE "$(GHCTAGS_HS_SRCS)"
- : ifneq "$(GHCTAGS_HS_SRCS)" ""
- @echo TIME TO ROCK AND ROLL
- # $(GHCTAGS_INPLACE) -- $(MKDEPENDHS_OPTS) $(filter-out -split-objs, $(MKDEPENDHS_HC_OPTS)) -- $(GHCTAGS_HS_SRCS)
- $(GHCTAGS_INPLACE) -- $(GHCTAGS_HC_OPTS) -- $(GHCTAGS_HS_SRCS)
- : endif
-ifneq "$(TAGS_C_SRCS)" ""
- etags -a $(TAGS_C_SRCS)
-endif
- @( DEREFFED=`ls -l Makefile | sed -e 's/.*-> \(.*\)/\1/g'` && $(RM) `dirname $$DEREFFED`/TAGS && $(CP) TAGS `dirname $$DEREFFED` ) 2>/dev/null || echo TAGS file generated, perhaps copy over to source tree?
-
-include $(TOP)/mk/target.mk
-
-ifeq "$(BUILD_GHC_PACKAGE)" "YES"
-all :: $(GHC_PROG)
-endif
-
-$(odir)/main/Config.$(way_)o: SRC_HC_OPTS+=-DSTAGE='"$(stage)"'
-
-ifneq "$(findstring $(stage), 2 3)" ""
-$(warning LIBRARY is $(LIBRARY))
-
-ifneq "$(DOING_BIN_DIST)" "YES"
-$(GHC_PROG) : $(LIBRARY) main/Main.hs
- $(RM) package.conf.inplace
- $(RM) $(STAMP_PKG_CONF)
- $(MAKE) way="" $(STAMP_PKG_CONF)
- $(MAKE) -f Makefile.ghcbin $(MFLAGS) HS_PROG=$(GHC_PROG) $@
-endif
-endif
-
-
+# XXX:
#-----------------------------------------------------------------------------
# binary-dist
+#
+#binary-dist:
+# $(INSTALL_DIR) $(BIN_DIST_DIR)/compiler
+# $(INSTALL_DIR) $(BIN_DIST_DIR)/compiler/stage$(stage)
+# echo "stage=$(stage)" > $(BIN_DIST_DIR)/compiler/Makefile
+# cat Makefile >> $(BIN_DIST_DIR)/compiler/Makefile
+# $(INSTALL_DATA) package.conf.in $(BIN_DIST_DIR)/compiler/
+# set -e; for d in stage$(stage)/*/; do $(INSTALL_DIR) $(BIN_DIST_DIR)/compiler/$$d; done
+# set -e; for f in $(HS_IFACES); do $(INSTALL_DATA) $$f $(BIN_DIST_DIR)/compiler/$$f; done
+#ifneq "$(INSTALL_LIBS)" ""
+# set -e; for f in $(INSTALL_LIBS); do $(INSTALL_DATA) $$f $(BIN_DIST_DIR)/compiler/$$f; done
+#endif
+#ifneq "$(INSTALL_PROGS)" ""
+# set -e; for f in $(INSTALL_PROGS); do $(INSTALL_PROGRAM) $$f $(BIN_DIST_DIR)/compiler/$$f; done
+#endif
+#ifneq "$(INSTALL_LIBEXECS)" ""
+# set -e; for f in $(INSTALL_LIBEXECS); do $(INSTALL_PROGRAM) $$f $(BIN_DIST_DIR)/compiler/$$f; done
+#endif
-binary-dist:
- $(INSTALL_DIR) $(BIN_DIST_DIR)/compiler
- $(INSTALL_DIR) $(BIN_DIST_DIR)/compiler/stage$(stage)
- echo "stage=$(stage)" > $(BIN_DIST_DIR)/compiler/Makefile
- cat Makefile >> $(BIN_DIST_DIR)/compiler/Makefile
- $(INSTALL_DATA) package.conf.in $(BIN_DIST_DIR)/compiler/
- set -e; for d in stage$(stage)/*/; do $(INSTALL_DIR) $(BIN_DIST_DIR)/compiler/$$d; done
- set -e; for f in $(HS_IFACES); do $(INSTALL_DATA) $$f $(BIN_DIST_DIR)/compiler/$$f; done
-ifneq "$(INSTALL_LIBS)" ""
- set -e; for f in $(INSTALL_LIBS); do $(INSTALL_DATA) $$f $(BIN_DIST_DIR)/compiler/$$f; done
-endif
-ifneq "$(INSTALL_PROGS)" ""
- set -e; for f in $(INSTALL_PROGS); do $(INSTALL_PROGRAM) $$f $(BIN_DIST_DIR)/compiler/$$f; done
-endif
-ifneq "$(INSTALL_LIBEXECS)" ""
- set -e; for f in $(INSTALL_LIBEXECS); do $(INSTALL_PROGRAM) $$f $(BIN_DIST_DIR)/compiler/$$f; done
-endif
-
-# -----------------------------------------------------------------------------
-# Explicit dependencies
-
-# Some .hs files #include other source files, but since ghc -M doesn't spit out
-# these dependencies we have to include them manually.
-
-# We don't add dependencies on HsVersions.h, ghcautoconf.h, or ghc_boot_platform.h,
-# because then modifying one of these files would force recompilation of everything,
-# which is probably not what you want. However, it does mean you have to be
-# careful to recompile stuff you need if you reconfigure or change HsVersions.h.
-
-# Aargh, these don't work properly anyway, because GHC's recompilation checker
-# just reports "compilation NOT required". Do we have to add -fforce-recomp for each
-# of these .hs files? I haven't done anything about this yet.
-
-$(odir)/codeGen/Bitmap.$(way_)o : ../includes/MachDeps.h
-$(odir)/codeGen/CgCallConv.$(way_)o : ../includes/StgFun.h
-$(odir)/codeGen/CgProf.$(way_)o : ../includes/MachDeps.h
-$(odir)/codeGen/CgProf.$(way_)o : ../includes/Constants.h
-$(odir)/codeGen/CgProf.$(way_)o : ../includes/DerivedConstants.h
-$(odir)/codeGen/CgTicky.$(way_)o : ../includes/DerivedConstants.h
-$(odir)/codeGen/ClosureInfo.$(way_)o : ../includes/MachDeps.h
-$(odir)/codeGen/SMRep.$(way_)o : ../includes/MachDeps.h
-$(odir)/codeGen/SMRep.$(way_)o : ../includes/ClosureTypes.h
-$(odir)/ghci/ByteCodeAsm.$(way_)o : ../includes/Bytecodes.h
-$(odir)/ghci/ByteCodeFFI.$(way_)o : nativeGen/NCG.h
-$(odir)/ghci/ByteCodeInstr.$(way_)o : ../includes/MachDeps.h
-$(odir)/ghci/ByteCodeItbls.$(way_)o : ../includes/ClosureTypes.h
-$(odir)/ghci/ByteCodeItbls.$(way_)o : nativeGen/NCG.h
-$(odir)/main/Constants.$(way_)o : ../includes/MachRegs.h
-$(odir)/main/Constants.$(way_)o : ../includes/Constants.h
-$(odir)/main/Constants.$(way_)o : ../includes/MachDeps.h
-$(odir)/main/Constants.$(way_)o : ../includes/DerivedConstants.h
-$(odir)/main/Constants.$(way_)o : ../includes/GHCConstants.h
-$(odir)/nativeGen/AsmCodeGen.$(way_)o : nativeGen/NCG.h
-$(odir)/nativeGen/MachCodeGen.$(way_)o : nativeGen/NCG.h
-$(odir)/nativeGen/MachCodeGen.$(way_)o : ../includes/MachDeps.h
-$(odir)/nativeGen/MachInstrs.$(way_)o : nativeGen/NCG.h
-$(odir)/nativeGen/MachRegs.$(way_)o : nativeGen/NCG.h
-$(odir)/nativeGen/MachRegs.$(way_)o : ../includes/MachRegs.h
-$(odir)/nativeGen/PositionIndependentCode.$(way_)o : nativeGen/NCG.h
-$(odir)/nativeGen/PprMach.$(way_)o : nativeGen/NCG.h
-$(odir)/nativeGen/RegAllocInfo.$(way_)o : nativeGen/NCG.h
-$(odir)/typecheck/TcForeign.$(way_)o : nativeGen/NCG.h
-$(odir)/utils/Binary.$(way_)o : ../includes/MachDeps.h
-$(odir)/utils/FastMutInt.$(way_)o : ../includes/MachDeps.h
-
-# -----------------------------------------------------------------------------
-# Dependencies
-
-MKDEPENDHS_HC_OPTS = $(patsubst -i$(odir)/%, -i%, $(HC_OPTS))
-
-MKDEPENDHS=$(HC)
-
-# Must do this *after* including target.mk, because $(HS_SRCS) isn't set yet.
-depend :: $(STAGE_PLATFORM_H) $(HS_SRCS) $(C_SRCS)
- touch .depend-BASE
-ifneq "$(BootingFromHc)" "YES"
- $(MKDEPENDHS) -M -optdep-f -optdep.depend-BASE $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-osuf $(obj)) $(MKDEPENDHS_OPTS) $(filter-out -split-objs, $(MKDEPENDHS_HC_OPTS)) $(HS_SRCS)
-endif
- $(MKDEPENDC) -f .depend-BASE $(MKDEPENDC_OPTS) $(foreach way,$(WAYS),-s $(way)) -- $(CC_OPTS) -- $(C_SRCS)
- $(PERL) -pe 'binmode(stdin); binmode(stdout); s@(\S*[._]o)@stage$(stage)/$$1@g; s@(\S*[._]hi)@stage$(stage)/$$1@g;' <.depend-BASE >.depend-$(stage)
-# The binmode stuff tells perl not to add stupid ^M's to the output
-
-ifeq "$(MakefileDeps)" "YES"
-$(CONFIG_HS) : Makefile
-stage1/$(PLATFORM_H) : Makefile
-stage2/$(PLATFORM_H) : Makefile
-endif
-
--include .depend-$(stage)
diff --git a/compiler/Makefile.ghcbin b/compiler/Makefile.ghcbin
deleted file mode 100644
index 379a725a28..0000000000
--- a/compiler/Makefile.ghcbin
+++ /dev/null
@@ -1,61 +0,0 @@
-# This Makefile builds the GHC binary for stage2. In stage2, the GHC binary
-# is built as a single Main module that links to the GHC package. It
-# is easier to do this with a separate Makefile, because we don't want most
-# of the options normally dumped into SRC_HC_OPTS by the main GHC Makefile.
-# In particular, we don't want the .hi files picked up along the home package
-# search path when compiling Main, we need the compiler to find them in
-# the GHC package.
-
-TOP = ..
-include $(TOP)/mk/boilerplate.mk
-
-ifeq "$(stage)" "2"
-HC=$(GHC_STAGE1)
-endif
-
-ifeq "$(stage)" "3"
-HC=$(GHC_STAGE2)
-endif
-
-EXCLUDED_C_SRCS += ghc-inplace.c
-
-SRC_HC_OPTS += -Wall
-SRC_HC_OPTS += -package ghc
-SRC_HC_OPTS += -Istage$(stage)
-SRC_HC_OPTS += \
- -cpp -fglasgow-exts -XNoGenerics -Rghc-timing \
- -I. -IcodeGen -InativeGen -Iparser
-SRC_HC_OPTS += $(GhcHcOpts) $(GhcStage$(stage)HcOpts)
-ifeq "$(TargetOS_CPP)" "openbsd"
-SRC_HC_OPTS += -optl-Xlinker -optl-E
-endif
-
-ifeq "$(GhcWithInterpreter)" "YES"
-SRC_HC_OPTS += -DGHCI
-
-# Should the debugger commands be enabled?
-ifeq "$(GhciWithDebugger)" "YES"
-SRC_HC_OPTS += -DDEBUGGER
-endif
-
-endif
-
-ifeq "$(GhcThreaded)" "YES"
-SRC_HC_OPTS += -threaded
-endif
-ifeq "$(GhcProfiled)" "YES"
-SRC_HC_OPTS += -prof
-endif
-ifeq "$(GhcDebugged)" "YES"
-SRC_LD_OPTS += -debug
-endif
-
-odir=stage$(stage)
-
-HS_SRCS = main/Main.hs
-HS_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(HS_SRCS))))
-$(odir)/main/Main.o : libHSghc$(_way).a
-
-WAYS=$(GhcCompilerWays)
-
-include $(TOP)/mk/target.mk
diff --git a/compiler/Makefile.local b/compiler/Makefile.local
new file mode 100644
index 0000000000..1d5345114b
--- /dev/null
+++ b/compiler/Makefile.local
@@ -0,0 +1,75 @@
+# Local GHC-build-tree customization for Cabal makefiles. We want to build
+# libraries using flags that the user has put in build.mk/validate.mk and
+# appropriate flags for Mac OS X deployment targets.
+
+# Careful here: including boilerplate.mk breaks things, because paths.mk and
+# opts.mk overrides some of the variable settings in the Cabal Makefile, so
+# we just include config.mk and custom-settings.mk.
+TOP=..
+SAVE_GHC := $(GHC)
+SAVE_AR := $(AR)
+SAVE_LD := $(LD)
+include $(TOP)/mk/config.mk
+include $(TOP)/mk/custom-settings.mk
+GHC := $(SAVE_GHC)
+AR := $(SAVE_AR)
+LD := $(SAVE_LD)
+
+# Now add flags from the GHC build system to the Cabal build:
+GHC_CC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS))
+GHC_OPTS += $(SRC_HC_OPTS)
+GHC_OPTS += $(GhcHcOpts)
+GHC_OPTS += $(GhcStage$(stage)HcOpts)
+GHC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS))
+LIB_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))
+
+# XXX These didn't work in the old build system, according to the
+# comment at least. We should actually handle them properly at some
+# point:
+
+# Some .hs files #include other source files, but since ghc -M doesn't spit out
+# these dependencies we have to include them manually.
+
+# We don't add dependencies on HsVersions.h, ghcautoconf.h, or ghc_boot_platform.h,
+# because then modifying one of these files would force recompilation of everything,
+# which is probably not what you want. However, it does mean you have to be
+# careful to recompile stuff you need if you reconfigure or change HsVersions.h.
+
+# Aargh, these don't work properly anyway, because GHC's recompilation checker
+# just reports "compilation NOT required". Do we have to add -fforce-recomp for each
+# of these .hs files? I haven't done anything about this yet.
+
+# $(odir)/codeGen/Bitmap.$(way_)o : ../includes/MachDeps.h
+# $(odir)/codeGen/CgCallConv.$(way_)o : ../includes/StgFun.h
+# $(odir)/codeGen/CgProf.$(way_)o : ../includes/MachDeps.h
+# $(odir)/codeGen/CgProf.$(way_)o : ../includes/Constants.h
+# $(odir)/codeGen/CgProf.$(way_)o : ../includes/DerivedConstants.h
+# $(odir)/codeGen/CgTicky.$(way_)o : ../includes/DerivedConstants.h
+# $(odir)/codeGen/ClosureInfo.$(way_)o : ../includes/MachDeps.h
+# $(odir)/codeGen/SMRep.$(way_)o : ../includes/MachDeps.h
+# $(odir)/codeGen/SMRep.$(way_)o : ../includes/ClosureTypes.h
+# $(odir)/ghci/ByteCodeAsm.$(way_)o : ../includes/Bytecodes.h
+# $(odir)/ghci/ByteCodeFFI.$(way_)o : nativeGen/NCG.h
+# $(odir)/ghci/ByteCodeInstr.$(way_)o : ../includes/MachDeps.h
+# $(odir)/ghci/ByteCodeItbls.$(way_)o : ../includes/ClosureTypes.h
+# $(odir)/ghci/ByteCodeItbls.$(way_)o : nativeGen/NCG.h
+# $(odir)/main/Constants.$(way_)o : ../includes/MachRegs.h
+# $(odir)/main/Constants.$(way_)o : ../includes/Constants.h
+# $(odir)/main/Constants.$(way_)o : ../includes/MachDeps.h
+# $(odir)/main/Constants.$(way_)o : ../includes/DerivedConstants.h
+# $(odir)/main/Constants.$(way_)o : ../includes/GHCConstants.h
+# $(odir)/nativeGen/AsmCodeGen.$(way_)o : nativeGen/NCG.h
+# $(odir)/nativeGen/MachCodeGen.$(way_)o : nativeGen/NCG.h
+# $(odir)/nativeGen/MachCodeGen.$(way_)o : ../includes/MachDeps.h
+# $(odir)/nativeGen/MachInstrs.$(way_)o : nativeGen/NCG.h
+# $(odir)/nativeGen/MachRegs.$(way_)o : nativeGen/NCG.h
+# $(odir)/nativeGen/MachRegs.$(way_)o : ../includes/MachRegs.h
+# $(odir)/nativeGen/PositionIndependentCode.$(way_)o : nativeGen/NCG.h
+# $(odir)/nativeGen/PprMach.$(way_)o : nativeGen/NCG.h
+# $(odir)/nativeGen/RegAllocInfo.$(way_)o : nativeGen/NCG.h
+# $(odir)/typecheck/TcForeign.$(way_)o : nativeGen/NCG.h
+# $(odir)/utils/Binary.$(way_)o : ../includes/MachDeps.h
+# $(odir)/utils/FastMutInt.$(way_)o : ../includes/MachDeps.h
+# $(PRIMOP_BITS) is defined in Makefile
+# $(odir)/prelude/PrimOp.o: $(PRIMOP_BITS)
+
diff --git a/compiler/count_lines b/compiler/count_lines
deleted file mode 100644
index 43ca79e68a..0000000000
--- a/compiler/count_lines
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /usr/bin/perl
-#
-%DirCount = ();
-%ModCount = ();
-%DirComments = ();
-%ModComments = ();
-
-foreach $f ( @ARGV ) {
-
- if ( $f =~ /\.lhs$/ ) {
- open(INF, "../utils/unlit/unlit $f - |") || die "Couldn't unlit $f!\n";
- } else {
- open(INF, "< $f") || die "Couldn't open $f!\n";
- }
- $cnt = 0;
- while (<INF>) {
- s/--.*//;
- s/{-.*-}//;
- next if /^\s*$/;
- $cnt++;
- }
- close(INF);
-
- $f_wc = `wc $f`; die "wc failed: $f\n" if $? != 0;
- if ( $f_wc =~ /\s*(\d+)\s*(\d+)\s*(\d+)/ ) {
- $comments = $1 - $cnt;
- } else {
- die "Can't grok wc format: $f_wc";
- }
-
- if ( $f =~ /(.*)\/(.*)/ ) {
- local($dir) = $1;
- local($mod) = $2;
- $DirCount{$dir} += $cnt;
- $ModCount{$mod} += $cnt;
- $DirComments{$dir} += $comments;
- $ModComments{$mod} += $comments;
- } else {
- print STDERR "not counted in a directory: $f\n";
- $ModCount{$f} += $cnt;
- $ModComments{$f} += $comments;
- }
-}
-
-# print the info
-$tot = 0;
-$totcmts = 0;
-foreach $d (sort (keys %DirCount)) {
- printf "%-20s %6d %6d\n", $d, $DirCount{$d}, $DirComments{$d};
- $tot += $DirCount{$d};
- $totcmts += $DirComments{$d};
-}
-printf "\n%-20s %6d %6d\n\n\n", 'TOTAL:', $tot, $totcmts;
-
-$tot = 0;
-$totcmts = 0;
-printf "\n Code Comments\n";
-foreach $m (sort (keys %ModCount)) {
- printf "%-20s %6d %6d\n", $m, $ModCount{$m}, $ModComments{$m};
- $tot += $ModCount{$m};
- $totcmts += $ModComments{$m};
-}
-printf "\n%-20s %6d %6d\n", 'TOTAL:', $tot, $totcmts;
diff --git a/compiler/ghc-inplace.c b/compiler/ghc-inplace.c
deleted file mode 100644
index 8cddc898a5..0000000000
--- a/compiler/ghc-inplace.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <shell-tools.c>
-
-int main(int argc, char **argv) {
- char **args;
- args = malloc(sizeof(char *) * (argc + 4));
- if (args == NULL) {
- fprintf(stderr, "Malloc failed\n");
- exit(1);
- }
- args[0] = "GHC_PATH"; /* Gets replaced by sed */
- args[1] = "-BTOP_ABS"; /* Gets replaced by sed */
- args[2] = "-dynload";
- args[3] = "wrapped";
- if ((argc >= 2) && (strcmp(argv[1], "-v") == 0)) {
- printf("Using %s %s %s %s\n", args[0], args[1], args[2], args[3]);
- fflush(stdout);
- }
- memcpy(args + 4, argv + 1, sizeof(char *) * (argc - 1));
- args[argc+3] = NULL;
- return run(argv[0],
- "GHC_PATH", /* Gets replaced by sed */
- argc + 3,
- args);
-}
diff --git a/compiler/ghc.cabal b/compiler/ghc.cabal
new file mode 100644
index 0000000000..1d3df5459d
--- /dev/null
+++ b/compiler/ghc.cabal
@@ -0,0 +1,437 @@
+Name: ghc
+-- XXX Version number!
+Version: 6.9
+Copyright: XXX
+-- License: XXX
+License-File: XXX
+Author: XXX
+Maintainer: glasgow-haskell-users@haskell.org
+Homepage: http://www.haskell.org/ghc/
+Synopsis: XXX
+Description:
+ XXX
+Category: XXX
+Build-Type: Simple
+Cabal-Version: >= 1.2
+
+Flag base3
+ Description: Choose the new smaller, split-up base package.
+
+Flag dynlibs
+ Description: Dynamic library support
+
+Flag editline
+ Description: Use editline
+
+Flag ghci
+ Description: Build GHCi support.
+
+Flag stage1
+ Description: Is this stage 1?
+
+Flag windows
+ Description: On a Windows machine
+
+Library
+ if flag(base3)
+ Build-Depends: base >= 3 && < 4,
+ directory >= 1 && < 1.1,
+ process >= 1 && < 1.1,
+ bytestring >= 0.9 && < 0.10,
+ old-time >= 1 && < 1.1,
+ containers >= 0.1 && < 0.2,
+ array >= 0.1 && < 0.2
+ else
+ Build-Depends: base < 3
+ Build-Depends: filepath >= 1 && < 1.2
+ Build-Depends: haskell98, Cabal, hpc
+ if flag(windows)
+ Build-Depends: Win32
+ else
+ Build-Depends: unix
+
+ if flag(editline)
+ Build-Depends: editline
+ CPP-Options: -DUSE_EDITLINE
+
+ GHC-Options: -Wall -fno-warn-name-shadowing -fno-warn-orphans
+
+ if flag(ghci)
+ Build-Depends: template-haskell
+ CPP-Options: -DGHCI
+ Include-Dirs: ../libffi/build/include
+
+ Extensions: CPP, MagicHash, UnboxedTuples, PatternGuards,
+ ForeignFunctionInterface, EmptyDataDecls,
+ TypeSynonymInstances, MultiParamTypeClasses,
+ FlexibleInstances, Rank2Types, PatternSignatures
+
+ Include-Dirs: . parser utils
+
+ -- XXX Change these directory names: The stage2 files are what
+ -- we want for all stages >= 1
+ if flag(stage1)
+ Include-Dirs: stage1
+ else
+ Include-Dirs: stage2
+ Install-Includes: HsVersions.h, ghc_boot_platform.h
+
+ c-sources:
+ parser/cutils.c
+ utils/md5.c
+ -- For GHC < 6.5:
+ cbits/unicode.c
+
+ if flag(dynlibs)
+ c-sources:
+ ghci/keepCAFsForGHCi.c
+
+ hs-source-dirs:
+ basicTypes
+ cmm
+ codeGen
+ coreSyn
+ cprAnalysis
+ deSugar
+ ghci
+ hsSyn
+ iface
+ main
+ nativeGen
+ parser
+ prelude
+ profiling
+ rename
+ simplCore
+ simplStg
+ specialise
+ stgSyn
+ stranal
+ typecheck
+ types
+ utils
+ vectorise
+
+ Exposed-Modules:
+ BasicTypes
+ DataCon
+ Demand
+ Id
+ IdInfo
+ Literal
+ MkId
+ Module
+ Name
+ NameEnv
+ NameSet
+ NewDemand
+ OccName
+ RdrName
+ SrcLoc
+ UniqSupply
+ Unique
+ Var
+ VarEnv
+ VarSet
+ BlockId
+ CLabel
+ Cmm
+ CmmBrokenBlock
+ CmmCPS
+ CmmCPSGen
+ CmmCPSZ
+ CmmCallConv
+ CmmCommonBlockElimZ
+ CmmContFlowOpt
+ CmmCvt
+ CmmExpr
+ CmmInfo
+ CmmLex
+ CmmLint
+ CmmLive
+ CmmLiveZ
+ CmmOpt
+ CmmParse
+ CmmProcPoint
+ CmmProcPointZ
+ CmmSpillReload
+ CmmTx
+ CmmUtils
+ CmmZipUtil
+ DFMonad
+ Dataflow
+ MachOp
+ MkZipCfg
+ MkZipCfgCmm
+ OptimizationFuel
+ PprC
+ PprCmm
+ PprCmmZ
+ StackColor
+ StackPlacements
+ ZipCfg
+ ZipCfgCmmRep
+ ZipCfgExtras
+ ZipDataflow
+ Bitmap
+ CgBindery
+ CgCallConv
+ CgCase
+ CgClosure
+ CgCon
+ CgExpr
+ CgForeignCall
+ CgHeapery
+ CgHpc
+ CgInfoTbls
+ CgLetNoEscape
+ CgMonad
+ CgParallel
+ CgPrimOp
+ CgProf
+ CgStackery
+ CgTailCall
+ CgTicky
+ CgUtils
+ ClosureInfo
+ CodeGen
+ SMRep
+ CoreFVs
+ CoreLint
+ CorePrep
+ CoreSubst
+ CoreSyn
+ CoreTidy
+ CoreUnfold
+ CoreUtils
+ ExternalCore
+ MkExternalCore
+ PprCore
+ PprExternalCore
+ CprAnalyse
+ Check
+ Coverage
+ Desugar
+ DsArrows
+ DsBinds
+ DsCCall
+ DsExpr
+ DsForeign
+ DsGRHSs
+ DsListComp
+ DsMonad
+ DsUtils
+ Match
+ MatchCon
+ MatchLit
+ HsBinds
+ HsDecls
+ HsDoc
+ HsExpr
+ HsImpExp
+ HsLit
+ HsPat
+ HsSyn
+ HsTypes
+ HsUtils
+ BinIface
+ BuildTyCl
+ IfaceEnv
+ IfaceSyn
+ IfaceType
+ LoadIface
+ MkIface
+ TcIface
+ BreakArray
+ CmdLineParser
+ CodeOutput
+ Config
+ Constants
+ DriverMkDepend
+ DriverPhases
+ DriverPipeline
+ DynFlags
+ ErrUtils
+ Finder
+ GHC
+ HeaderInfo
+ HscMain
+ HscStats
+ HscTypes
+ InteractiveEval
+ PackageConfig
+ Packages
+ ParsePkgConf
+ PprTyThing
+ StaticFlags
+ SysTools
+ TidyPgm
+ AsmCodeGen
+ MachCodeGen
+ MachInstrs
+ MachRegs
+ NCGMonad
+ PositionIndependentCode
+ PprMach
+ RegAllocColor
+ RegAllocInfo
+ RegAllocLinear
+ RegAllocStats
+ RegArchBase
+ RegArchX86
+ RegCoalesce
+ RegLiveness
+ RegSpill
+ RegSpillClean
+ RegSpillCost
+ Ctype
+ HaddockLex
+ HaddockParse
+ HaddockUtils
+ LexCore
+ Lexer
+ Parser
+ ParserCore
+ ParserCoreUtils
+ RdrHsSyn
+ ForeignCall
+ PrelInfo
+ PrelNames
+ PrelRules
+ PrimOp
+ TysPrim
+ TysWiredIn
+ CostCentre
+ SCCfinal
+ RnBinds
+ RnEnv
+ RnExpr
+ RnHsDoc
+ RnHsSyn
+ RnNames
+ RnPat
+ RnSource
+ RnTypes
+ CSE
+ FloatIn
+ FloatOut
+ LiberateCase
+ OccurAnal
+ SAT
+ SetLevels
+ SimplCore
+ SimplEnv
+ SimplMonad
+ SimplUtils
+ Simplify
+ SRT
+ SimplStg
+ StgStats
+ Rules
+ SpecConstr
+ Specialise
+ CoreToStg
+ StgLint
+ StgSyn
+ DmdAnal
+ SaAbsInt
+ SaLib
+ StrictAnal
+ WorkWrap
+ WwLib
+ FamInst
+ Inst
+ TcArrows
+ TcBinds
+ TcClassDcl
+ TcDefaults
+ TcDeriv
+ TcEnv
+ TcExpr
+ TcForeign
+ TcGenDeriv
+ TcHsSyn
+ TcHsType
+ TcInstDcls
+ TcMType
+ TcMatches
+ TcPat
+ TcRnDriver
+ TcRnMonad
+ TcRnTypes
+ TcRules
+ TcSimplify
+ TcTyClsDecls
+ TcTyDecls
+ TcTyFuns
+ TcType
+ TcUnify
+ Class
+ Coercion
+ FamInstEnv
+ FunDeps
+ Generics
+ InstEnv
+ TyCon
+ Type
+ TypeRep
+ Unify
+ Bag
+ Binary
+ BufWrite
+ Digraph
+ Encoding
+ FastBool
+ FastFunctions
+ FastMutInt
+ FastString
+ FastTypes
+ Fingerprint
+ FiniteMap
+ GraphBase
+ GraphColor
+ GraphOps
+ GraphPpr
+ IOEnv
+ Interval
+ LazyUniqFM
+ ListSetOps
+ Maybes
+ MonadUtils
+ OrdList
+ Outputable
+ Panic
+ Pretty
+ State
+ StringBuffer
+ Unicode
+ UniqFM
+ UniqSet
+ Util
+ VectBuiltIn
+ VectCore
+ VectMonad
+ VectType
+ VectUtils
+ Vectorise
+
+ if flag(ghci)
+ Exposed-Modules:
+ DsMeta
+ TcSplice
+ Convert
+ ByteCodeAsm
+ ByteCodeFFI
+ ByteCodeGen
+ ByteCodeInstr
+ ByteCodeItbls
+ ByteCodeLink
+ Debugger
+ GhciMonad
+ GhciTags
+ InteractiveUI
+ LibFFI
+ Linker
+ ObjLink
+ RtClosureInspect
+
diff --git a/compiler/main/SysTools.lhs b/compiler/main/SysTools.lhs
index 6dfcd4b59a..9d53b81852 100644
--- a/compiler/main/SysTools.lhs
+++ b/compiler/main/SysTools.lhs
@@ -161,9 +161,14 @@ initSysTools mbMinusB dflags0
-- format, '/' separated
; let installed, installed_bin :: FilePath -> FilePath
- installed_bin pgm = top_dir </> pgm
- installed file = top_dir </> file
- inplace dir pgm = top_dir </> dir </> pgm
+ installed_bin pgm = top_dir </> pgm
+ installed file = top_dir </> file
+ inplace dir pgm = let real_top_dir = foldr (</>) ""
+ $ reverse
+ $ drop 4
+ $ reverse
+ $ splitDirectories top_dir
+ in real_top_dir </> dir </> pgm
; let pkgconfig_path
| am_installed = installed "package.conf"
diff --git a/compiler/utils/FastString.lhs b/compiler/utils/FastString.lhs
index f338002709..7d43dc1283 100644
--- a/compiler/utils/FastString.lhs
+++ b/compiler/utils/FastString.lhs
@@ -2,6 +2,10 @@
% (c) The University of Glasgow, 1997-2006
%
\begin{code}
+{-# OPTIONS -fno-warn-unused-imports #-}
+-- XXX GHC 6.9 seems to be confused by unpackCString# being used only in
+-- a RULE
+
{-# OPTIONS_GHC -O -funbox-strict-fields #-}
-- We always optimise this, otherwise performance of a non-optimised
-- compiler is severely affected
diff --git a/compiler/utils/Pretty.lhs b/compiler/utils/Pretty.lhs
index 9041803729..7713d03cfc 100644
--- a/compiler/utils/Pretty.lhs
+++ b/compiler/utils/Pretty.lhs
@@ -152,6 +152,10 @@ Relative to John's original paper, there are the following new features:
\begin{code}
+{-# OPTIONS -fno-warn-unused-imports #-}
+-- XXX GHC 6.9 seems to be confused by unpackCString# being used only in
+-- a RULE
+
module Pretty (
Doc, -- Abstract
Mode(..), TextDetails(..),
diff --git a/compiler/utils/Util.lhs b/compiler/utils/Util.lhs
index 1b2a44dea1..7057d321a1 100644
--- a/compiler/utils/Util.lhs
+++ b/compiler/utils/Util.lhs
@@ -6,7 +6,7 @@
\begin{code}
module Util (
- debugIsOn, ghciTablesNextToCode, picIsOn,
+ ghciSupported, debugIsOn, ghciTablesNextToCode, picIsOn,
isWindowsHost, isWindowsTarget, isDarwinTarget,
-- general list processing
@@ -107,11 +107,18 @@ infixr 9 `thenCmp`
%************************************************************************
%* *
-\subsection{Is DEBUG on, are we on Windows?}
+\subsection{Is DEBUG on, are we on Windows, etc?}
%* *
%************************************************************************
\begin{code}
+ghciSupported :: Bool
+#ifdef GHCI
+ghciSupported = True
+#else
+ghciSupported = False
+#endif
+
debugIsOn :: Bool
#ifdef DEBUG
debugIsOn = True
diff --git a/compiler/main/Main.hs b/ghc/Main.hs
index a91df13575..a91df13575 100644
--- a/compiler/main/Main.hs
+++ b/ghc/Main.hs
diff --git a/ghc/Makefile b/ghc/Makefile
new file mode 100644
index 0000000000..210938acc0
--- /dev/null
+++ b/ghc/Makefile
@@ -0,0 +1,106 @@
+
+TOP=..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/cabal-flags.mk
+
+ifeq "$(stage)" ""
+stage=1
+endif
+
+ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+INSTALL_FLAGS =
+else
+INSTALL_FLAGS = --enable-shell-wrappers
+endif
+
+boot:
+ @:
+
+all:: build.stage$(stage)
+
+stage1 ::
+ $(MAKE) stage=1
+
+stage2 ::
+ $(MAKE) stage=2
+
+stage3 ::
+ $(MAKE) stage=3
+
+clean distclean::
+ -$(CABAL) clean --distpref dist-stage1
+ -$(CABAL) clean --distpref dist-stage2
+ $(RM) -rf stage1-inplace
+ $(RM) -rf stage2-inplace
+
+build.stage1:
+ $(CABAL) configure --distpref dist-stage1 \
+ --flags=-ghci \
+ $(INSTALL_DIRS_CONFIGURE_FLAGS) \
+ $(USE_BOOT_CONFIGURE_FLAGS) \
+ $(COMMON_CONFIGURE_FLAGS)
+ $(CABAL) build --distpref dist-stage1 $(BUILD_FLAGS)
+ $(INSTALL_PACKAGE) install '$(GHC_PKG_PROG)' 'XXX/package.conf' "" \
+ $(FPTOOLS_TOP_ABS)/ghc/stage1-inplace \
+ $(FPTOOLS_TOP_ABS)/ghc/stage1-inplace \
+ '$$prefix/bin' \
+ '$$prefix/lib' \
+ '$$prefix/libexec' \
+ '$$prefix/dynlib' \
+ '$$prefix/data' \
+ '$$prefix/doc' \
+ '$$prefix/html' \
+ '$$prefix/haddock' \
+ --distpref dist-stage1 \
+ $(INSTALL_FLAGS)
+
+ifeq "$(GhcWithInterpreter)" "YES"
+CONFIGURE_FLAGS_STAGE2 += --flags=ghci
+else
+CONFIGURE_FLAGS_STAGE2 += --flags=-ghci
+endif
+
+ifeq "$(GhcProfiled)" "YES"
+CONFIGURE_FLAGS_STAGE2 += --enable-executable-profiling
+endif
+ifeq "$(GhcDebugged)" "YES"
+CONFIGURE_FLAGS_STAGE2 += --ghc-option=-debug
+endif
+ifeq "$(GhcThreaded)" "YES"
+# Use threaded RTS with GHCi, so threads don't get blocked at the prompt.
+CONFIGURE_FLAGS_STAGE2 += --ghc-option=-threaded
+endif
+
+# XXX In stage2 we should really use the inplace ghc-pkg
+# It works because installPackage doesn't actually use ghc-pkg, as there's
+# no library to register
+
+build.stage2:
+ $(CABAL) configure --distpref dist-stage2 \
+ $(CONFIGURE_FLAGS_STAGE2) \
+ $(INSTALL_DIRS_CONFIGURE_FLAGS) \
+ $(USE_STAGE1_CONFIGURE_FLAGS) \
+ $(COMMON_CONFIGURE_FLAGS)
+ $(CABAL) build --distpref dist-stage2 $(BUILD_FLAGS)
+ $(INSTALL_PACKAGE) install '$(GHC_PKG_PROG)' 'XXX/package.conf' "" \
+ $(FPTOOLS_TOP_ABS)/ghc/stage2-inplace \
+ $(FPTOOLS_TOP_ABS)/ghc/stage2-inplace \
+ '$$prefix/bin' \
+ '$$prefix/lib' \
+ '$$prefix/libexec' \
+ '$$prefix/dynlib' \
+ '$$prefix/data' \
+ '$$prefix/doc' \
+ '$$prefix/html' \
+ '$$prefix/haddock' \
+ --distpref dist-stage2 \
+ $(INSTALL_FLAGS)
+
+# XXX fix:
+#binary-dist:
+# $(INSTALL_DIR) $(BIN_DIST_DIR)/utils/hsc2hs
+# $(INSTALL_DATA) Makefile $(BIN_DIST_DIR)/utils/hsc2hs/
+# $(INSTALL_DATA) hsc2hs.sh $(BIN_DIST_DIR)/utils/hsc2hs/
+# $(INSTALL_DATA) $(INSTALL_DATAS) $(BIN_DIST_DIR)/utils/hsc2hs/
+# $(INSTALL_PROGRAM) $(HS_PROG) $(BIN_DIST_DIR)/utils/hsc2hs/
+
diff --git a/ghc/ghc-bin.cabal b/ghc/ghc-bin.cabal
new file mode 100644
index 0000000000..95059c72d5
--- /dev/null
+++ b/ghc/ghc-bin.cabal
@@ -0,0 +1,40 @@
+Name: ghc-bin
+-- XXX Version number!
+Version: 6.9
+Copyright: XXX
+-- License: XXX
+-- License-File: XXX
+Author: XXX
+Maintainer: glasgow-haskell-users@haskell.org
+Homepage: http://www.haskell.org/ghc/
+Synopsis: XXX
+Description:
+ XXX
+Category: XXX
+Data-Dir: ..
+Data-Files: extra-gcc-opts
+Build-Type: Simple
+Cabal-Version: >= 1.2
+
+Flag base3
+ Description: Choose the new smaller, split-up base package.
+
+Flag ghci
+ Description: Build GHCi support.
+
+Executable ghc
+ Main-Is: Main.hs
+ if flag(base3)
+ Build-Depends: base >= 3 && < 4,
+ directory >= 1 && < 1.1
+ else
+ Build-Depends: base < 3
+ Build-Depends: base, ghc
+ Build-Depends: filepath >= 1 && < 1.2
+
+ GHC-Options: -Wall
+ if flag(ghci)
+ CPP-Options: -DGHCI
+
+ Extensions: CPP, PatternGuards
+
diff --git a/ghc/ghc.wrapper b/ghc/ghc.wrapper
new file mode 100644
index 0000000000..8e6adc548d
--- /dev/null
+++ b/ghc/ghc.wrapper
@@ -0,0 +1,2 @@
+
+$executablename -B$datadir -dynload wrapped ${1+"$@"}
diff --git a/libraries/Makefile b/libraries/Makefile
index 1fe8bc09a3..2216c968c5 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -143,9 +143,6 @@ CONFIGURE_OPTS += --enable-split-objs
CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting
endif
-DEPLOYMENT_OPTS = $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS)) \
- $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))
-
.PHONY: subdirs
subdirs:
@@ -160,7 +157,10 @@ ifeq "$(ghc_ge_605)" "NO"
CABAL_GHC_FLAGS += -cpp
endif
-BOOTSTRAPPING_FLAGS = $(CABAL_GHC_FLAGS) -DCABAL_VERSION=1,3 -odir $(HERE_ABS)/bootstrapping -hidir $(HERE_ABS)/bootstrapping -i$(HERE_ABS)/Cabal -i$(HERE_ABS)/filepath -i$(HERE_ABS)/hpc
+# Euch, hideous hack:
+CABAL_VERSION = $(shell grep "^Version:" Cabal/Cabal.cabal | sed -e "s/^Version: //" -e 's/\./,/g')
+
+BOOTSTRAPPING_FLAGS = $(CABAL_GHC_FLAGS) -DCABAL_VERSION=$(CABAL_VERSION) -odir $(HERE_ABS)/bootstrapping -hidir $(HERE_ABS)/bootstrapping -i$(HERE_ABS)/Cabal -i$(HERE_ABS)/filepath -i$(HERE_ABS)/hpc
.PHONY: boot
@@ -190,8 +190,7 @@ ifBuildable/ifBuildable: ifBuildable.hs
mkdir ifBuildable
$(CP) ifBuildable.hs ifBuildable/
ifeq "$(stage)" "2"
- cd ifBuildable && ../$(HC) -Wall --make ifBuildable -o ifBuildable \
- $(DEPLOYMENT_OPTS)
+ cd ifBuildable && ../$(HC) -Wall --make ifBuildable -o ifBuildable
else
cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable
endif
@@ -368,7 +367,7 @@ $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \
install.library.%: ifBuildable/ifBuildable
if $(IFBUILDABLE) $*; then \
cd $* && \
- $(FPTOOLS_TOP_ABS)/utils/installPackage/install-inplace/bin/installPackage install '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' ; \
+ $(INSTALL_PACKAGE) install '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' ; \
fi
.PHONY: binary-dist binary-dist.library.%
diff --git a/libraries/Makefile.local b/libraries/Makefile.local
index 0633ebae29..7ca6115db6 100644
--- a/libraries/Makefile.local
+++ b/libraries/Makefile.local
@@ -31,8 +31,5 @@ GhcLibHcOpts += -w
endif
# Now add flags from the GHC build system to the Cabal build:
-GHC_CC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS))
GHC_OPTS += $(SRC_HC_OPTS)
GHC_OPTS += $(GhcLibHcOpts)
-GHC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS))
-LIB_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))
diff --git a/mk/cabal-flags.mk b/mk/cabal-flags.mk
index 52624a291c..d736679de7 100644
--- a/mk/cabal-flags.mk
+++ b/mk/cabal-flags.mk
@@ -3,7 +3,10 @@ nothing=
space=$(nothing) $(nothing)
LIBRARIES_ABS = $(FPTOOLS_TOP_ABS)/libraries
+UTILS_ABS = $(FPTOOLS_TOP_ABS)/utils
CABAL = $(LIBRARIES_ABS)/cabal-bin $(GHC) $(LIBRARIES_ABS)/bootstrapping.conf
+INSTALL_PACKAGE = \
+ $(UTILS_ABS)/installPackage/install-inplace/bin/installPackage
# We rely on all the CONFIGURE_ARGS being quoted with '...', and there
# being no 's inside the values.
@@ -61,8 +64,10 @@ INPLACE_DIRS_CONFIGURE_FLAGS = \
--prefix=`$(TOP)/utils/pwd/pwd forwardslash`/install-inplace
USE_STAGE1_CONFIGURE_FLAGS = \
- --with-compiler=$(FPTOOLS_TOP_ABS)/compiler/stage1/ghc-inplace \
- --with-hc-pkg=$(FPTOOLS_TOP_ABS)/utils/ghc-pkg/ghc-pkg-inplace
+ --with-compiler=$(GHC_STAGE1) \
+ --with-hc-pkg=$(FPTOOLS_TOP_ABS)/utils/ghc-pkg/ghc-pkg-inplace \
+ $(addprefix --cc-option=,$(MACOSX_DEPLOYMENT_CC_OPTS)) \
+ $(addprefix --ld-option=,$(MACOSX_DEPLOYMENT_LD_OPTS))
USE_BOOT_CONFIGURE_FLAGS = \
--with-compiler=$(GHC) \
diff --git a/mk/config.mk.in b/mk/config.mk.in
index e1b2ef33e4..f3a23243ff 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -346,8 +346,6 @@ BuildingGranSim=$(subst mg,YES,$(filter mg,$(WAYS)))
HscIfaceFileVersion=6
-MakefileDeps=YES
-
#------------------------------------------------------------------------------
# Options for Libraries
@@ -713,7 +711,7 @@ GC_CPP_OPTS += -P -E -x c -traditional -D__GLASGOW_HASKELL__
GHC_UTILS_DIR_REL = utils
GHC_INCLUDE_DIR_REL = includes
-GHC_COMPILER_DIR_REL = compiler
+GHC_COMPILER_DIR_REL = ghc
GHC_RTS_DIR_REL = rts
GHC_UTILS_DIR_REL = utils
GHC_DRIVER_DIR_REL = driver
@@ -790,6 +788,7 @@ 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_COMPILER_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_COMPILER_DIR_REL)
GHC_MANGLER_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_MANGLER_DIR_REL)
GHC_SYSMAN_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_SYSMAN_DIR_REL)
@@ -872,10 +871,12 @@ NHC = @NHC@
# 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 = $(GHC_COMPILER_DIR)/ghc-inplace
-GHC_STAGE1 = $(GHC_COMPILER_DIR)/stage1/ghc-inplace -no-user-package-conf
-GHC_STAGE2 = $(GHC_COMPILER_DIR)/stage2/ghc-inplace -no-user-package-conf
-GHC_STAGE3 = $(GHC_COMPILER_DIR)/stage3/ghc-inplace -no-user-package-conf
+GHC_INPLACE = $(GHC_STAGE1)
+GHC_STAGE1 = $(GHC_COMPILER_DIR_ABS)/stage1-inplace/bin/ghc
+GHC_STAGE2 = $(GHC_COMPILER_DIR_ABS)/stage2-inplace/bin/ghc
+GHC_STAGE3 = $(GHC_COMPILER_DIR_ABS)/stage3-inplace/bin/ghc
+# XXX All those used to have -no-user-package-conf, but then we can't
+# pass them to Cabal
BOOTSTRAPPING_CONF = $(FPTOOLS_TOP_ABS)/libraries/bootstrapping.conf
@@ -957,12 +958,6 @@ SRC_CC_OPTS += -G0
endif
SRC_HSC2HS_OPTS += $(addprefix --cflag=,$(filter-out -O,$(SRC_CC_OPTS)))
-SRC_HSC2HS_OPTS += --cc=$(CC)
-SRC_HSC2HS_OPTS += --ld=$(CC)
-SRC_HSC2HS_OPTS += --cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt)
-SRC_HSC2HS_OPTS += --lflag=-no-auto-link-packages
-SRC_HSC2HS_OPTS += -I$(GHC_INCLUDE_DIR_ABS)
-SRC_HSC2HS_OPTS += -I$(FPTOOLS_TOP_ABS)/gmp/gmpbuild
# Given
# foo bar
View Lorry Controller Status