X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FMakefile;h=3e140873134e591f1896066b24afa70402227c7a;hp=5e5504bd4124529e839f4ab37a877fc9a02ba058;hb=7fc749a43b4b6b85d234fa95d4928648259584f4;hpb=ce5c7f0db0d0b2bf0be171eb8d5fbebe7df97fcb diff --git a/compiler/Makefile b/compiler/Makefile index 5e5504b..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,9 +219,10 @@ 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) @@ -216,7 +231,11 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile @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) @@ -248,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) @@ -262,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__" >$@ @@ -308,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__" >$@ @@ -367,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... @@ -410,11 +430,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 +447,15 @@ 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 +ifeq "$(GhcDebugged)" "YES" +SRC_LD_OPTS += -debug endif ALL_DIRS += ghci @@ -702,24 +733,25 @@ 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_PROG = $(odir)/ghc-inplace$(exeext) -EXCLUDED_SRCS += $(INPLACE_HS) +EXCLUDED_C_SRCS += ghc-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 = do args <- getArgs; rawSystem \"$(TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)\" (\"-B$(TOP_ABS)\":args) >>= exitWith" >> $@ +GHC_PATH=$(TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)$(exeext) -$(INPLACE_PROG): $(INPLACE_HS) - $(HC) --make $< -o $@ +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_HS) $(INPLACE_PROG) +CLEAN_FILES += $(INPLACE_PROG) ifeq "$(stage)" "1" ghc-inplace : $(INPLACE_PROG) @@ -786,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 #----------------------------------------------------------------------------- @@ -797,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) @@ -805,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. @@ -835,8 +873,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,7 +929,13 @@ TAGS_HS_SRCS = parser/Parser.y.pp $(filter-out $(DERIVED_SRCS) main/Config.hs pa include $(TOP)/mk/target.mk -$(odir)/main/Config.$(way_)o: SRC_HC_OPTS+=-DSTAGE='"$(stage)"' +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 @@ -983,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)