X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FMakefile;h=e85706baf1204b02142f7147fa13eff241154180;hp=c832f43776836c5e8d4e5536f0126eb561844757;hb=db7a768882134defdd282bd626b29bead6e62b00;hpb=a171dac28baada2036577e7b0b4d7cc1c6836952 diff --git a/compiler/Makefile b/compiler/Makefile index c832f43..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 @@ -367,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... @@ -410,11 +409,16 @@ endif # 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 -package hpc -PKG_DEPENDS += template-haskell hpc +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? @@ -422,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 @@ -702,24 +709,22 @@ SRC_LD_OPTS += -no-link-chk # See comments in $(FPTOOLS_TOP)/utils/ghc-pkg/Makefile for why we use # a real binary here rather than a shell script. -INPLACE_HS = $(odir)/ghc-inplace.hs +INPLACE_C = ghc-inplace.c INPLACE_PROG = $(odir)/ghc-inplace$(exeext) -EXCLUDED_SRCS += $(INPLACE_HS) +EXCLUDED_SRCS += $(INPLACE_C) # 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)) -$(INPLACE_HS): Makefile $(FPTOOLS_TOP)/mk/config.mk - echo "import System.Cmd; import System.Environment; import System.Exit" > $@ - echo "main = getArgs >>= \args -> rawSystem \"$(TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)\" (\"-B$(TOP_ABS)\":args) >>= exitWith" >> $@ +GHC_PATH=$(TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG) -$(INPLACE_PROG): $(INPLACE_HS) - $(GHC) --make $< -o $@ +$(INPLACE_PROG): $(INPLACE_C) + $(HC) -cpp -optc-DGHC_PATH=\"$(GHC_PATH)\" -optc-DTOP_ABS=\"$(TOP_ABS)\" $< -o $@ all :: $(INPLACE_PROG) -CLEAN_FILES += $(INPLACE_HS) $(INPLACE_PROG) +CLEAN_FILES += $(INPLACE_PROG) ifeq "$(stage)" "1" ghc-inplace : $(INPLACE_PROG) @@ -797,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) @@ -805,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. @@ -835,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 @@ -893,6 +902,12 @@ 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)"' #----------------------------------------------------------------------------- @@ -983,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