X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FMakefile;h=e85706baf1204b02142f7147fa13eff241154180;hp=6c53f492dbda618e2face0ddb4a9bc0f420dafca;hb=db7a768882134defdd282bd626b29bead6e62b00;hpb=094f9feafaf83190891736ddd8d1d7213f4293c4 diff --git a/compiler/Makefile b/compiler/Makefile index 6c53f49..e85706b 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -23,6 +23,10 @@ UseGhcForCc = YES include $(TOP)/mk/boilerplate.mk +ifeq "$(GhcThreaded)$(GhcProfiled)" "YESYES" +$(error Cannot make GHC both threaded and profiled) +endif + #----------------------------------------------------------------------------- # Counting source code lines @@ -30,11 +34,6 @@ USER_SRCS = $(filter-out $(DERIVED_SRCS),$(SRCS)) count : ./count_lines $(USER_SRCS) -#----------------------------------------------------------------------------- -# Building ghc different ways (default is just `normal' sequential) - -WAYS=$(GhcCompilerWays) - # ----------------------------------------------------------------------------- # Bootstrapping @@ -214,6 +213,7 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile @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) @@ -366,7 +366,7 @@ SRC_HC_OPTS += -Istage$(stage) 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... @@ -405,10 +405,15 @@ 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 "$(bootstrapped)" "YES" +SRC_HC_OPTS += -package hpc -package bytestring +PKG_DEPENDS += hpc bytestring +endif + ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES" # Yes, include the interepreter, readline, and Template Haskell extensions @@ -421,9 +426,12 @@ ifeq "$(GhcEnableTablesNextToCode) $(GhcUnregisterised)" "YES NO" SRC_HC_OPTS += -DGHCI_TABLES_NEXT_TO_CODE endif -ifneq "$(GhcNotThreaded)" "YES" +ifeq "$(GhcThreaded)" "YES" # Use threaded RTS with GHCi, so threads don't get blocked at the prompt. -SRC_HC_OPTS += -threaded +SRC_LD_OPTS += -threaded +endif +ifeq "$(GhcProfiled)" "YES" +SRC_LD_OPTS += -prof endif ALL_DIRS += ghci @@ -698,79 +706,35 @@ SRC_LD_OPTS += -no-link-chk # ----------------------------------------------------------------------------- # 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 - -# MSys notes -# Note 1 -# I'm exec'ing $(SCRIPT_SHELL), rather than the usual #!/bin/sh, to make -# sure that the right shell is invoked. If we use /bin/sh, then -# when ghc-inplace is invoked from a Cygwin Python (which is the only Python -# that seems to run the test-suite correctly), we get the Cygwin shell, -# and it in turn interprets the path-names in the second (exec) line -# differently to the MSys shell. That's bad, because ghc-inplace must -# also work when invoked from MSys shells -# -# To figure out what the MSys shell is, we cd to '/bin' and do 'pwd -W' -# On MSys, the -W flag prints out the directory in c:/msys/bin format -# (On other system, -W isn't a pwd flag at all.) +INPLACE_C = ghc-inplace.c +INPLACE_PROG = $(odir)/ghc-inplace$(exeext) +EXCLUDED_SRCS += $(INPLACE_C) -ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" -all :: $(odir)/ghc-inplace.bat ghc-inplace.bat -CLEAN_FILES += $(odir)/ghc-inplace.bat ghc-inplace.bat -endif +# 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)) -ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" -# MSys (...and cygwin with a mingw toolchain) -SCRIPT_SHELL = $(shell cd /bin; pwd -W 2>/dev/null || echo "/bin")/sh -else -# Cygwin and Unix -SCRIPT_SHELL = /bin/sh -endif +GHC_PATH=$(TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG) -# MSys Note 2 -# On MSys, we must use the following script for ghc-inplace: -# exec /c/darcs/fc-branch-2/compiler/stage1/ghc -Bc:/darcs/fc-branch-2 "$@" -# That is, -# (a) You *must* use the /c/ form for the first arg to exec. Using the -# c:/ form makes exec complain that it can't find $pwd/c:/darcs/.../ghc -# The /c/ form is $(FPTOOLS_TOP_ABS) -# (b) You *must* use the c:/ form for the -B argument, else the testsuite -# doesn't work. I think that's something to do with ghc-inplace being -# invoked by Python -# The c:/ form is $(FPTOOLS_TOP_ABS_PLATFORM) - -$(odir)/ghc-inplace : $(GHC_PROG) - @$(RM) $@ - echo '#!$(SCRIPT_SHELL)' >>$@ -# Re SCRIPT_SHELL, see note 1 above - echo exec $(GHC_COMPILER_DIR_ABS)/$(GHC_PROG) \ - '-B$(subst \,\\,$(FPTOOLS_TOP_ABS_PLATFORM))' '"$$@"' >>$@ -# Re exec, see note 2 above - chmod 755 $@ - -# MSys Note 3 -# When we generate a .bat file, we must also use the form -# @call c:\darcs\fc-branch-2\compiler\stage1\ghc-inplace -# else the cmd shell gets confused; indeed it seems to simply hang -# Hence the use of $(FPTOOLS_TOP_ABS_PLATFORM) here, just like MSys Note 2 +$(INPLACE_PROG): $(INPLACE_C) + $(HC) -cpp -optc-DGHC_PATH=\"$(GHC_PATH)\" -optc-DTOP_ABS=\"$(TOP_ABS)\" $< -o $@ -ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" -ghc-inplace.bat $(odir)/ghc-inplace.bat: $(GHC_PROG) - @$(RM) $@ - echo '@call $(subst /,\,$(FPTOOLS_TOP_ABS_PLATFORM)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)) -B$(FPTOOLS_TOP_ABS_PLATFORM) %*' >> $@ - chmod 755 $@ -endif +all :: $(INPLACE_PROG) -ghc-inplace : stage1/ghc-inplace - $(RM) -f $@ && $(LN_S) $< $@ +CLEAN_FILES += $(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 @@ -838,6 +802,10 @@ coreSyn/CorePrep_HC_OPTS += -auto-all # 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) @@ -846,7 +814,9 @@ 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)) +LIBOBJS = $(filter-out $(odir)/main/Main.o $(odir)/parser/hschooks.o \ + $(odir)/main/Main.p_o $(odir)/parser/hschooks.p_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. @@ -864,7 +834,7 @@ GhcLibHcOpts = 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 @@ -876,8 +846,6 @@ NO_SET_HC = YES # -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 @@ -907,32 +875,6 @@ docs runtests $(BOOT_TARGET) TAGS clean distclean mostlyclean maintainer-clean $ $(MAKE) -f Makefile.ghcbin $(MFLAGS) $@ endif -include $(TOP)/mk/package.mk - -#----------------------------------------------------------------------------- -# binary-dist - -# $(error Q$(INSTALL_PROGS)W) -foo: - echo Q$(INSTALL_PROGS)W$(GHC_PROG)E - echo Q$(INSTALL_LIBEXECS)W$(GHC_PROG)E - -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/ -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 - #----------------------------------------------------------------------------- # clean @@ -960,6 +902,41 @@ TAGS_HS_SRCS = parser/Parser.y.pp $(filter-out $(DERIVED_SRCS) main/Config.hs pa include $(TOP)/mk/target.mk +ifeq "$(BUILD_GHC_PACKAGE)" "YES" +ifeq "$(way)" "" +all :: $(GHC_PROG) +endif +endif + +$(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 @@ -1021,7 +998,7 @@ 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; s@^.*/compat.*$$@@g;' <.depend-BASE >.depend-$(stage) + $(PERL) -pe 'binmode(stdin); binmode(stdout); s@(\S*[._]o)@stage$(stage)/$$1@g; s@(\S*[._]hi)@stage$(stage)/$$1@g; s@^.*/compat.*$$@@g;' <.depend-BASE >.depend-$(stage) # The binmode stuff tells perl not to add stupid ^M's to the output # # The /lib/compat replacement is to workaround a bug in the