done
else
for i in */*hi-boot*; do \
- $(LN_S) -f ../../$$i stage$(stage)/$$i || true ; \
+ ($(RM) -f stage$(stage)/$$i \
+ && $(LN_S) ../../$$i stage$(stage)/$$i) || true ; \
done
endif
endif
#
ifneq "$(way)" "dll"
ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-HS_PROG=$(odir)/ghc$(_way)-$(ProjectVersion)
+GHC_PROG=$(odir)/ghc$(_way)-$(ProjectVersion)
else
-HS_PROG=$(odir)/ghc$(_way)
+GHC_PROG=$(odir)/ghc$(_way)
endif
else
-HS_PROG=$(odir)/ghc-$(ProjectVersion)
+GHC_PROG=$(odir)/ghc-$(ProjectVersion)
+endif
+
+ifeq "$(stage)" "1"
+HS_PROG = $(GHC_PROG)
endif
# -----------------------------------------------------------------------------
@echo "cProjectVersionInt = \"$(ProjectVersionInt)\"" >> $(CONFIG_HS)
@echo "cProjectPatchLevel = \"$(ProjectPatchLevel)\"" >> $(CONFIG_HS)
@echo "cBooterVersion = \"$(GhcVersion)\"" >> $(CONFIG_HS)
+ @echo "cStage = STAGE" >> $(CONFIG_HS)
@echo "cHscIfaceFileVersion = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS)
@echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $(CONFIG_HS)
@echo "cGhcUnregisterised = \"$(GhcUnregisterised)\"" >> $(CONFIG_HS)
+ @echo "cGhcEnableTablesNextToCode = \"$(GhcEnableTablesNextToCode)\"" >> $(CONFIG_HS)
@echo "cLeadingUnderscore = \"$(LeadingUnderscore)\"" >> $(CONFIG_HS)
@echo "cRAWCPP_FLAGS = \"$(RAWCPP_FLAGS)\"" >> $(CONFIG_HS)
@echo "cGCC = \"$(WhatGccIsCalled)\"" >> $(CONFIG_HS)
ALL_DIRS = \
utils basicTypes types hsSyn prelude rename typecheck deSugar coreSyn \
- specialise simplCore stranal stgSyn simplStg codeGen main \
+ vectorise specialise simplCore stranal stgSyn simplStg codeGen main \
profiling parser cprAnalysis ndpFlatten iface cmm
# Make sure we include Config.hs even if it doesn't exist yet...
ifneq "$(findstring $(stage), 2 3)" ""
bootstrapped = YES
else
-bootstrapped = $(shell if (test $(GhcCanonVersion) -eq $(ProjectVersionInt) -a $(GhcPatchLevel) -eq $(ProjectPatchLevel)); then echo YES; else echo NO; fi)
+bootstrapped = NO
endif
endif
# -----------------------------------------------------------------------------
# Building a compiler with interpreter support
#
-# The interpreter, GHCi interface, and Template Haskell are only
+# 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 "$(GhcWithInterpreter) $(bootstrapped)" "YES YES"
# Yes, include the interepreter, readline, and Template Haskell extensions
-SRC_HC_OPTS += -DGHCI -DBREAKPOINT -package template-haskell
-PKG_DEPENDS += template-haskell
+SRC_HC_OPTS += -DGHCI -package template-haskell -package hpc
+PKG_DEPENDS += template-haskell hpc
+# 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
+
+ifneq "$(GhcNotThreaded)" "YES"
# Use threaded RTS with GHCi, so threads don't get blocked at the prompt.
SRC_HC_OPTS += -threaded
+endif
ALL_DIRS += ghci
SRC_HC_OPTS += \
-cpp -fglasgow-exts -fno-generics -Rghc-timing \
- -I. -IcodeGen -InativeGen -Iparser
+ -I. -Iparser
# Omitted: -I$(GHC_INCLUDE_DIR)
# We should have -I$(GHC_INCLUDE_DIR) in SRC_HC_OPTS,
basicTypes/SrcLoc_HC_OPTS = -funbox-strict-fields
-ifeq "$(bootstrapped)" "YES"
-utils/Binary_HC_OPTS = -funbox-strict-fields
-endif
-
# We always optimise some low-level modules, otherwise performance of
# a non-optimised compiler is severely affected.
main/BinIface_HC_OPTS += -O
-utils/Binary_HC_OPTS += -O
+utils/Binary_HC_OPTS += -O -funbox-strict-fields
utils/FastMutInt_HC_OPTS += -O
utils/Encoding_HC_OPTS += -O
-utils/StringBuffer_HC_OPTS += -O
-utils/FastString_HC_OPTS += -O
+utils/StringBuffer_HC_OPTS += -O -funbox-strict-fields
+utils/FastString_HC_OPTS += -O -funbox-strict-fields
# ---- Profiling ----
#simplCore/Simplify_HC_OPTS = -auto-all
# ghc_strlen percolates through so many modules that it is easier to get its
# prototype via a global option instead of a myriad of per-file OPTIONS
-SRC_HC_OPTS += '-\#include "hschooks.h"'
+SRC_HC_OPTS += '-\#include "cutils.h"'
# ----------------------------------------------------------------------------
# Generate supporting stuff for prelude/PrimOp.lhs
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
+
primop-data-decl.hs-incl: prelude/primops.txt
$(GENPRIMOP) --data-decl < $< > $@
primop-tag.hs-incl: prelude/primops.txt
# -----------------------------------------------------------------------------
# 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.
-all :: $(odir)/ghc-inplace ghc-inplace
+INPLACE_HS = $(odir)/ghc-inplace.hs
+INPLACE_PROG = $(odir)/ghc-inplace$(exeext)
+EXCLUDED_SRCS += $(INPLACE_HS)
-$(odir)/ghc-inplace : $(HS_PROG)
- @$(RM) $@
- echo '#!/bin/sh' >>$@
- echo exec $(GHC_COMPILER_DIR_ABS)/$(HS_PROG) '-B$(subst \,\\,$(FPTOOLS_TOP_ABS_PLATFORM))' '"$$@"' >>$@
- chmod 755 $@
+# FPTOOLS_TOP_ABS platform uses backslashes, at least on Cygwin, but that
+# will go wrong when we use it in a Haskell string below.
+TOP_ABS=$(subst \\,/,$(FPTOOLS_TOP_ABS_PLATFORM))
-ghc-inplace : stage1/ghc-inplace
- $(LN_S) -f $< $@
+ifeq "$(stage)" "1"
+EnvImport = System.Environment
+GetArgs = getArgs
+else
+EnvImport = GHC.Environment
+GetArgs = getFullArgs
+endif
+
+$(INPLACE_HS): Makefile $(FPTOOLS_TOP)/mk/config.mk
+ echo "import System.Cmd; import $(EnvImport); import System.Exit" > $@
+ echo "main = do args <- $(GetArgs); rawSystem \"$(TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)\" (\"-B$(TOP_ABS)\":args) >>= exitWith" >> $@
+
+$(INPLACE_PROG): $(INPLACE_HS)
+ $(HC) --make $< -o $@
+
+all :: $(INPLACE_PROG)
+
+CLEAN_FILES += $(INPLACE_HS) $(INPLACE_PROG)
ifeq "$(stage)" "1"
+ghc-inplace : $(INPLACE_PROG)
+ $(RM) -f $@ && $(LN_S) $< $@
+
+all :: ghc-inplace
+
CLEAN_FILES += ghc-inplace
endif
-CLEAN_FILES += $(odir)/ghc-inplace
-
#-----------------------------------------------------------------------------
# install
DESTDIR = $(INSTALL_LIBRARY_DIR_GHC)
ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
-INSTALL_LIBEXECS += $(HS_PROG)
+INSTALL_LIBEXECS += $(GHC_PROG)
else
-INSTALL_PROGS += $(HS_PROG)
+INSTALL_PROGS += $(GHC_PROG)
endif
# ----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Building the GHC package
-# The GHC package is made from the stage 2 build. Fortunately the
-# package build system framework more or less does the right thing for
-# us here.
+# 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.
-ifeq "$(stage)" "2"
+ifneq "$(findstring $(stage), 2 3)" ""
PACKAGE = ghc
HIERARCHICAL_LIB = NO
VERSION = $(ProjectVersion)
PKG_DEPENDS += base haskell98
PACKAGE_CPP_OPTS += -DPKG_DEPENDS='$(PKG_DEPENDS)'
+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.o $(odir)/parser/hschooks.o, $(OBJS))
HS_IFACES = $(addsuffix .$(way_)hi,$(basename $(HS_OBJS)))
# Haddock can't handle recursive modules currently, so we disable it for now.
-NO_HADDOCK_DOCS = YES
+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
+
+all :: $(GHC_PROG)
+
+# 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)
+
+ifeq "$(GhcBuildDylibs)" "YES"
+ifeq "$(darwin_TARGET_OS)" "1"
+GhcLibraryName=libHS$(PACKAGE)$(_way)_dyn.dylib
+else
+GhcLibraryName=libHS$(PACKAGE)$(_way)_dyn.so
+endif
+else
+GhcLibraryName=libHS$(PACKAGE)$(_way).a
+endif
+
+ifneq "$(DOING_BIN_DIST)" "YES"
+$(GHC_PROG) : $(GhcLibraryName) main/Main.hs
+ $(RM) package.conf.inplace
+ $(RM) $(STAMP_PKG_CONF)
+ $(MAKE) $(STAMP_PKG_CONF)
+ $(MAKE) -f Makefile.ghcbin $(MFLAGS) HS_PROG=$(GHC_PROG) $@
+endif
+
+# 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
#-----------------------------------------------------------------------------
TAGS_HS_SRCS = parser/Parser.y.pp $(filter-out $(DERIVED_SRCS) main/Config.hs parser/Parser.y, $(sort $(SRCS)))
-
include $(TOP)/mk/target.mk
+$(odir)/main/Config.$(way_)o: SRC_HC_OPTS+=-DSTAGE='"$(stage)"'
+
+#-----------------------------------------------------------------------------
+# binary-dist
+
+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)
+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 -no-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
projects / ghc-hetmet.git / blobdiff