X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FMakefile;h=3e140873134e591f1896066b24afa70402227c7a;hp=6c83f9cd8c3a5652881c465efda5dda15cf0e107;hb=7fc749a43b4b6b85d234fa95d4928648259584f4;hpb=27218ba74f28c527e0b3e88195169b6949d98899 diff --git a/compiler/Makefile b/compiler/Makefile index 6c83f9c..3e14087 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -23,6 +23,11 @@ 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 +35,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 @@ -90,6 +90,16 @@ ifeq "$(stage)" "" stage=1 endif +ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" +ifeq "$(stage)" "1" +DQ = \" +else +DQ = \\\" +endif +else +DQ = \" +endif + .DUMMY: stage_dir stage_dirs : $(MKDIRHIER) stage$(stage) @@ -155,6 +165,10 @@ odir=stage$(stage) SRC_HC_OPTS += $(patsubst %, -i$(odir)/%, $(ALL_DIRS)) +ifneq "$(stage)" "1" +SRC_HC_OPTS += -Wall -fno-warn-name-shadowing +endif + HS_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(HS_SRCS)))) C_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(C_SRCS)))) @@ -205,17 +219,23 @@ endif CONFIG_HS = main/Config.hs boot :: $(CONFIG_HS) -$(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile +$(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk @$(RM) -f $(CONFIG_HS) @echo "Creating $(CONFIG_HS) ... " + @echo "{-# OPTIONS -w #-}" >>$(CONFIG_HS) @echo "module Config where" >>$(CONFIG_HS) @echo "cProjectName = \"$(ProjectName)\"" >> $(CONFIG_HS) @echo "cProjectVersion = \"$(ProjectVersion)\"" >> $(CONFIG_HS) @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 "cSplitObjs = \"$(SplitObjs)\"" >> $(CONFIG_HS) + @echo "cGhcWithInterpreter = \"$(GhcWithInterpreter)\"" >> $(CONFIG_HS) @echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $(CONFIG_HS) + @echo "cGhcWithSMP = \"$(GhcWithSMP)\"" >> $(CONFIG_HS) + @echo "cGhcRTSWays = \"$(GhcRTSWays)\"" >> $(CONFIG_HS) @echo "cGhcUnregisterised = \"$(GhcUnregisterised)\"" >> $(CONFIG_HS) @echo "cGhcEnableTablesNextToCode = \"$(GhcEnableTablesNextToCode)\"" >> $(CONFIG_HS) @echo "cLeadingUnderscore = \"$(LeadingUnderscore)\"" >> $(CONFIG_HS) @@ -247,6 +267,7 @@ endif @echo "cUSER_WAY_NAMES = \"$(USER_WAY_NAMES)\"" >> $(CONFIG_HS) @echo "cUSER_WAY_OPTS = \"$(USER_WAY_OPTS)\"" >> $(CONFIG_HS) @echo "cDEFAULT_TMPDIR = \"$(DEFAULT_TMPDIR)\"" >> $(CONFIG_HS) + @echo "cDocDir = \"$(docdir)\"" >> $(CONFIG_HS) @echo done. CLEAN_FILES += $(CONFIG_HS) @@ -261,7 +282,7 @@ CLEAN_FILES += $(CONFIG_HS) PLATFORM_H = ghc_boot_platform.h -stage1/$(PLATFORM_H) : stage_dirs $(FPTOOLS_TOP)/mk/config.mk Makefile +stage1/$(PLATFORM_H) : stage_dirs $(FPTOOLS_TOP)/mk/config.mk @echo "Creating $@..." @$(RM) $@ @echo "#ifndef __PLATFORM_H__" >$@ @@ -307,7 +328,7 @@ endif # For stage2 and above, the BUILD platform is the HOST of stage1, and # the HOST platform is the TARGET of stage1. The TARGET remains the same # (stage1 is the cross-compiler, not stage2). -stage2/$(PLATFORM_H) : stage_dirs $(FPTOOLS_TOP)/mk/config.mk Makefile +stage2/$(PLATFORM_H) : stage_dirs $(FPTOOLS_TOP)/mk/config.mk @echo "Creating $@..." @$(RM) $@ @echo "#ifndef __PLATFORM_H__" >$@ @@ -366,7 +387,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,16 +426,19 @@ 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 SRC_HC_OPTS += -DGHCI -package template-haskell -# -DBREAKPOINT causes a loop in stage2 -# SRC_HC_OPTS += -DGHCI -DBREAKPOINT -package template-haskell PKG_DEPENDS += template-haskell # Should GHCI be building info tables in the TABLES_NEXT_TO_CODE style @@ -423,8 +447,16 @@ 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_HC_OPTS += -threaded +SRC_LD_OPTS += -threaded +endif +ifeq "$(GhcProfiled)" "YES" +SRC_LD_OPTS += -prof +endif +ifeq "$(GhcDebugged)" "YES" +SRC_LD_OPTS += -debug +endif ALL_DIRS += ghci @@ -525,16 +557,6 @@ SRC_HC_OPTS += -package Cabal PKG_DEPENDS += Cabal endif -# We use Text.Regex which is in regex-compat with GHC 6.6+ -ifeq "$(bootstrapped)" "YES" -SRC_HC_OPTS += -package regex-compat -PKG_DEPENDS += regex-compat -else -ifeq "$(ghc_ge_605)" "YES" -SRC_HC_OPTS += -package regex-compat -endif -endif - ifeq "$(ghc_ge_603)" "YES" # Ignore lang, to avoid potential clash with the Generics module if # lang happens to be a dependency of some exposed package in the local @@ -708,61 +730,38 @@ 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_PROG = $(odir)/ghc-inplace$(exeext) +EXCLUDED_C_SRCS += ghc-inplace.c -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 - -# 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 $@ - -ghc-inplace : stage1/ghc-inplace - $(RM) -f $@ && $(LN_S) $< $@ +# 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_PATH=$(TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)$(exeext) + +ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" +INPLACE_EXTRA_FLAGS = -optc-DWINDOWS +endif + +$(INPLACE_PROG): ghc-inplace.c + $(HC) -cpp -optc-DGHC_PATH=$(DQ)$(GHC_PATH)$(DQ) -optc-DTOP_ABS=$(DQ)$(TOP_ABS)$(DQ) $(INPLACE_EXTRA_FLAGS) $< -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 -CLEAN_FILES += $(odir)/ghc-inplace - #----------------------------------------------------------------------------- # install @@ -819,7 +818,7 @@ endif # typecheck/TcType_HC_OPTS += -auto-all # typecheck/TcUnify_HC_OPTS += -auto-all -coreSyn/CorePrep_HC_OPTS += -auto-all +# coreSyn/CorePrep_HC_OPTS += -auto-all # parser/Parser_HC_OPTS += -fasm #----------------------------------------------------------------------------- @@ -830,6 +829,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) @@ -838,7 +841,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. @@ -856,7 +861,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 @@ -868,19 +873,29 @@ 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 # configuration. Yeuch... maybe one day this will all be done more cleanly. STAMP_PKG_CONF = $(GHC_DRIVER_DIR)/stamp-pkg-conf-$(PACKAGE) -$(GHC_PROG) : libHS$(PACKAGE)$(_way).a main/Main.hs +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:: @@ -912,9 +927,43 @@ EXTRA_SRCS += parser/Parser.y TAGS_HS_SRCS = parser/Parser.y.pp $(filter-out $(DERIVED_SRCS) main/Config.hs parser/Parser.y, $(sort $(SRCS))) - 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=$(DQ)$(stage)$(DQ) + +#----------------------------------------------------------------------------- +# 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 @@ -976,11 +1025,17 @@ 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 # -optdep--exclude-module flag in GHC 6.4. It is not required for any # other version of GHC, but doesn't do any harm. +ifeq "$(MakefileDeps)" "YES" +$(CONFIG_HS) : Makefile +stage1/$(PLATFORM_H) : Makefile +stage2/$(PLATFORM_H) : Makefile +endif + -include .depend-$(stage)