X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=0095419c4bcb44c59fad19ca2e5431a04b49a89d;hb=bcbdcc2b6cdb98312593d938aeb667e9a161e98a;hp=4797814b5e00df3c49845c99d1b80df45a1929e5;hpb=9c5a3913f8dec019875b03ce6dce370b7e9920de;p=ghc-hetmet.git diff --git a/compiler/Makefile b/compiler/Makefile index 4797814..0095419 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -95,16 +95,6 @@ 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) @@ -112,7 +102,7 @@ stage_dirs : $(MKDIRHIER) stage$(stage)/$$i; \ done -ifeq "$(stage) $(ghc_ge_603)" "1 YES" +ifeq "$(stage)" "1" UsingHsBoot = YES else ifneq "$(findstring $(stage), 2 3)" "" @@ -173,7 +163,7 @@ SRC_HC_OPTS += $(patsubst %, -i$(odir)/%, $(ALL_DIRS)) SRC_HC_OPTS += -Wall -fno-warn-name-shadowing # Turn off orphan warnings, but only if the flag exists (i.e. not if we # are building stage 1 and using GHC < 6.3). -ifneq "$(stage) $(ghc_ge_603)" "1 NO" +ifneq "$(stage)" "1 NO" SRC_HC_OPTS += -fno-warn-orphans endif @@ -226,52 +216,103 @@ boot :: $(CONFIG_HS) $(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 :: String" >> $(CONFIG_HS) @echo "cProjectName = \"$(ProjectName)\"" >> $(CONFIG_HS) + @echo "cProjectVersion :: String" >> $(CONFIG_HS) @echo "cProjectVersion = \"$(ProjectVersion)\"" >> $(CONFIG_HS) + @echo "cProjectVersionInt :: String" >> $(CONFIG_HS) @echo "cProjectVersionInt = \"$(ProjectVersionInt)\"" >> $(CONFIG_HS) + @echo "cProjectPatchLevel :: String" >> $(CONFIG_HS) @echo "cProjectPatchLevel = \"$(ProjectPatchLevel)\"" >> $(CONFIG_HS) + @echo "cBooterVersion :: String" >> $(CONFIG_HS) @echo "cBooterVersion = \"$(GhcVersion)\"" >> $(CONFIG_HS) + @echo "cStage :: String" >> $(CONFIG_HS) @echo "cStage = STAGE" >> $(CONFIG_HS) + @echo "cHscIfaceFileVersion :: String" >> $(CONFIG_HS) @echo "cHscIfaceFileVersion = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS) + @echo "cSplitObjs :: String" >> $(CONFIG_HS) @echo "cSplitObjs = \"$(SplitObjs)\"" >> $(CONFIG_HS) + @echo "cGhcWithInterpreter :: String" >> $(CONFIG_HS) @echo "cGhcWithInterpreter = \"$(GhcWithInterpreter)\"" >> $(CONFIG_HS) + @echo "cGhcWithNativeCodeGen :: String" >> $(CONFIG_HS) @echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $(CONFIG_HS) + @echo "cGhcWithSMP :: String" >> $(CONFIG_HS) @echo "cGhcWithSMP = \"$(GhcWithSMP)\"" >> $(CONFIG_HS) + @echo "cGhcRTSWays :: String" >> $(CONFIG_HS) @echo "cGhcRTSWays = \"$(GhcRTSWays)\"" >> $(CONFIG_HS) + @echo "cGhcUnregisterised :: String" >> $(CONFIG_HS) @echo "cGhcUnregisterised = \"$(GhcUnregisterised)\"" >> $(CONFIG_HS) + @echo "cGhcEnableTablesNextToCode :: String" >> $(CONFIG_HS) @echo "cGhcEnableTablesNextToCode = \"$(GhcEnableTablesNextToCode)\"" >> $(CONFIG_HS) + @echo "cLeadingUnderscore :: String" >> $(CONFIG_HS) @echo "cLeadingUnderscore = \"$(LeadingUnderscore)\"" >> $(CONFIG_HS) + @echo "cRAWCPP_FLAGS :: String" >> $(CONFIG_HS) @echo "cRAWCPP_FLAGS = \"$(RAWCPP_FLAGS)\"" >> $(CONFIG_HS) + @echo "cGCC :: String" >> $(CONFIG_HS) @echo "cGCC = \"$(WhatGccIsCalled)\"" >> $(CONFIG_HS) + @echo "cMKDLL :: String" >> $(CONFIG_HS) @echo "cMKDLL = \"$(BLD_DLL)\"" >> $(CONFIG_HS) + @echo "cLdIsGNULd :: String" >> $(CONFIG_HS) @echo "cLdIsGNULd = \"$(LdIsGNULd)\"" >> $(CONFIG_HS) + @echo "cLD_X :: String" >> $(CONFIG_HS) @echo "cLD_X = \"$(LD_X)\"" >> $(CONFIG_HS) + @echo "cPROJECT_DIR :: String" >> $(CONFIG_HS) @echo "cPROJECT_DIR = \"$(PROJECT_DIR)\"" >> $(CONFIG_HS) + @echo "cGHC_DRIVER_DIR_REL :: String" >> $(CONFIG_HS) @echo "cGHC_DRIVER_DIR_REL = \"$(GHC_DRIVER_DIR_REL)\"" >> $(CONFIG_HS) + @echo "cGHC_TOUCHY_PGM :: String" >> $(CONFIG_HS) @echo "cGHC_TOUCHY_PGM = \"$(GHC_TOUCHY_PGM)\"" >> $(CONFIG_HS) + @echo "cGHC_TOUCHY_DIR_REL :: String" >> $(CONFIG_HS) @echo "cGHC_TOUCHY_DIR_REL = \"$(GHC_TOUCHY_DIR_REL)\"" >> $(CONFIG_HS) + @echo "cGHC_UNLIT_PGM :: String" >> $(CONFIG_HS) @echo "cGHC_UNLIT_PGM = \"$(GHC_UNLIT_PGM)\"" >> $(CONFIG_HS) + @echo "cGHC_UNLIT_DIR_REL :: String" >> $(CONFIG_HS) @echo "cGHC_UNLIT_DIR_REL = \"$(GHC_UNLIT_DIR_REL)\"" >> $(CONFIG_HS) + @echo "cGHC_MANGLER_PGM :: String" >> $(CONFIG_HS) @echo "cGHC_MANGLER_PGM = \"$(GHC_MANGLER_PGM)\"" >> $(CONFIG_HS) + @echo "cGHC_MANGLER_DIR_REL :: String" >> $(CONFIG_HS) @echo "cGHC_MANGLER_DIR_REL = \"$(GHC_MANGLER_DIR_REL)\"" >> $(CONFIG_HS) + @echo "cGHC_SPLIT_PGM :: String" >> $(CONFIG_HS) @echo "cGHC_SPLIT_PGM = \"$(GHC_SPLIT_PGM)\"" >> $(CONFIG_HS) + @echo "cGHC_SPLIT_DIR_REL :: String" >> $(CONFIG_HS) @echo "cGHC_SPLIT_DIR_REL = \"$(GHC_SPLIT_DIR_REL)\"" >> $(CONFIG_HS) + @echo "cGHC_SYSMAN_PGM :: String" >> $(CONFIG_HS) @echo "cGHC_SYSMAN_PGM = \"$(GHC_SYSMAN)\"" >> $(CONFIG_HS) + @echo "cGHC_SYSMAN_DIR_REL :: String" >> $(CONFIG_HS) @echo "cGHC_SYSMAN_DIR_REL = \"$(GHC_SYSMAN_DIR)\"" >> $(CONFIG_HS) + @echo "cGHC_CP :: String" >> $(CONFIG_HS) @echo "cGHC_CP = \"$(GHC_CP)\"" >> $(CONFIG_HS) + @echo "cGHC_PERL :: String" >> $(CONFIG_HS) @echo "cGHC_PERL = \"$(GHC_PERL)\"" >> $(CONFIG_HS) ifeq ($(GhcWithIlx),YES) + @echo "cILX2IL :: String" >> $(CONFIG_HS) @echo "cILX2IL = \"$(ILX2IL)\"" >> $(CONFIG_HS) + @echo "cILASM :: String" >> $(CONFIG_HS) @echo "cILASM = \"$(ILASM)\"" >> $(CONFIG_HS) endif + @echo "cEnableWin32DLLs :: String" >> $(CONFIG_HS) @echo "cEnableWin32DLLs = \"$(EnableWin32DLLs)\"" >> $(CONFIG_HS) + @echo "cCONTEXT_DIFF :: String" >> $(CONFIG_HS) @echo "cCONTEXT_DIFF = \"$(CONTEXT_DIFF)\"" >> $(CONFIG_HS) + @echo "cUSER_WAY_NAMES :: String" >> $(CONFIG_HS) @echo "cUSER_WAY_NAMES = \"$(USER_WAY_NAMES)\"" >> $(CONFIG_HS) + @echo "cUSER_WAY_OPTS :: String" >> $(CONFIG_HS) @echo "cUSER_WAY_OPTS = \"$(USER_WAY_OPTS)\"" >> $(CONFIG_HS) + @echo "cDEFAULT_TMPDIR :: String" >> $(CONFIG_HS) @echo "cDEFAULT_TMPDIR = \"$(DEFAULT_TMPDIR)\"" >> $(CONFIG_HS) - @echo "cDocDir = \"$(docdir)\"" >> $(CONFIG_HS) + @echo "cRelocatableBuild :: Bool" >> $(CONFIG_HS) +ifeq "$(RelocatableBuild)" "YES" + @echo "cRelocatableBuild = True" >> $(CONFIG_HS) +else + @echo "cRelocatableBuild = False" >> $(CONFIG_HS) +endif + @echo "cLibFFI :: Bool" >> $(CONFIG_HS) +ifeq "$(UseLibFFI)" "YES" + @echo "cLibFFI = True" >> $(CONFIG_HS) +else + @echo "cLibFFI = False" >> $(CONFIG_HS) +endif @echo done. CLEAN_FILES += $(CONFIG_HS) @@ -416,6 +457,11 @@ ALL_DIRS += javaGen SRC_HC_OPTS += -DJAVA endif +ifeq ($(UseLibFFI),YES) +SRC_HC_OPTS += -DUSE_LIBFFI +SRC_HSC2HS_OPTS += -DUSE_LIBFFI +endif + ifeq "$(BootingFromHc)" "YES" # HC files are always from a self-booted compiler bootstrapped = YES @@ -441,7 +487,7 @@ endif ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES" -# Yes, include the interepreter, readline, and Template Haskell extensions +# Yes, include the interepreter and Template Haskell extensions SRC_HC_OPTS += -DGHCI -package template-haskell PKG_DEPENDS += template-haskell @@ -488,10 +534,7 @@ SRC_HC_OPTS += -package readline -DUSE_READLINE PKG_DEPENDS += readline endif else --include $(FPTOOLS_TOP)/libraries/readline/config.mk -# readline's config.mk sets PACKAGE, which we don't want here -PACKAGE= -ifeq "$(READLINE_BUILD_PACKAGE)" "yes" +ifeq "$(wildcard $(FPTOOLS_TOP_ABS)/libraries/readline/unbuildable)" "" SRC_HC_OPTS += -package readline -DUSE_READLINE PKG_DEPENDS += readline endif @@ -561,12 +604,10 @@ SRC_HC_OPTS += -package Cabal PKG_DEPENDS += Cabal 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 # GHC installation (eg. wxHaskell did this around 6.4). SRC_HC_OPTS += -ignore-package lang -endif SRC_CC_OPTS += -Iparser -I. -O SRC_HC_OPTS += -recomp $(GhcHcOpts) $(GhcStage$(stage)HcOpts) @@ -588,17 +629,6 @@ prelude/PrimOp_HC_OPTS = -H80m main/ParsePkgConf_HC_OPTS += -fno-warn-incomplete-patterns parser/Parser_HC_OPTS += -fno-warn-incomplete-patterns -ifeq "$(ghc_ge_603)" "NO" -# Use -fvia-C since the NCG can't handle the narrow16Int# (and intToInt16#?) -# primops on all platforms. -parser/Parser_HC_OPTS += -fvia-C -# because the NCG can't handle the 64-bit math in here -prelude/PrelRules_HC_OPTS += -fvia-C -# ByteCodeItbls uses primops that the NCG doesn't support. -ghci/ByteCodeItbls_HC_OPTS += -fvia-C -ghci/ByteCodeLink_HC_OPTS += -fvia-C -monly-3-regs -endif - # Careful optimisation of the parser: we don't want to throw everything # at it, because that takes too long and doesn't buy much, but we do want # to inline certain key external functions, so we instruct GHC not to @@ -611,7 +641,7 @@ endif utils/Digraph_HC_OPTS = -fglasgow-exts -basicTypes/SrcLoc_HC_OPTS = -funbox-strict-fields +# basicTypes/SrcLoc_HC_OPTS = -funbox-strict-fields # We always optimise some low-level modules, otherwise performance of # a non-optimised compiler is severely affected. @@ -739,19 +769,16 @@ SRC_LD_OPTS += -no-link-chk INPLACE_SRC = $(odir)/ghc-inplace.c INPLACE_PROG = $(odir)/ghc-inplace$(_way)$(exeext) +INPLACE_EXTRA_FLAGS = -I$(TOP)/includes EXCLUDED_C_SRCS += ghc-inplace.c -GHC_PATH=$(FPTOOLS_TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)$(exeext) - -ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" -INPLACE_EXTRA_FLAGS = -optc-DWINDOWS -endif +CLEAN_FILES += $(INPLACE_SRC) -$(INPLACE_SRC): ghc-inplace.c - $(SED) -e "s@GHC_PATH@$(GHC_PATH)@g" -e "s@TOP_ABS@$(FPTOOLS_TOP_ABS)@g" < $< > $@ +GHC_PATH=$(FPTOOLS_TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)$(exeext) -$(INPLACE_PROG): $(INPLACE_SRC) - $(HC) -cpp $(INPLACE_EXTRA_FLAGS) $< -o $@ +$(INPLACE_PROG): ghc-inplace.c + $(SED) -e "s@GHC_PATH@$(GHC_PATH)@g" -e "s@TOP_ABS@$(FPTOOLS_TOP_ABS)@g" < $< > $(INPLACE_SRC) + $(HC) -cpp $(INPLACE_EXTRA_FLAGS) $(INPLACE_SRC) -o $@ all :: $(INPLACE_PROG) @@ -841,7 +868,10 @@ PACKAGE = ghc HIERARCHICAL_LIB = NO VERSION = $(ProjectVersion) PKG_DEPENDS += base haskell98 -PACKAGE_CPP_OPTS += -DPKG_DEPENDS='$(PKG_DEPENDS)' +LIB_LD_OPTS += $(foreach pkg,$(PKG_DEPENDS),-package $(pkg)) +# We have to expand each package dependency with its version, which we +# can do by calling "ghc-pkg list $pkg --simple-output". +PACKAGE_CPP_OPTS += -DPKG_DEPENDS='$(foreach pkg,$(PKG_DEPENDS),$(shell $(GHC_PKG_INPLACE) latest --global $(pkg)))' PACKAGE_CPP_OPTS += -DSTAGE='"$(stage)"' # Omit Main from the library, the client will want to plug their own Main in @@ -859,8 +889,14 @@ GhcLibWays = $(GhcCompilerWays) # override $(GhcLibHcOpts): we want GhcStage2HcOpts to take precedence GhcLibHcOpts = +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) +else # override default definition of HS_IFACES so we can add $(odir) HS_IFACES = $(addsuffix .$(way_)hi,$(basename $(HS_OBJS))) +endif # Haddock can't handle recursive modules currently, so we disable it for now. override HADDOCK_DOCS = NO @@ -911,13 +947,42 @@ EXTRA_SRCS += parser/Parser.y TAGS_HS_SRCS = parser/Parser.y.pp $(filter-out $(DERIVED_SRCS) main/Config.hs parser/Parser.y, $(sort $(SRCS))) +WRONG_GHCTAGS_HS_SRCS = $(filter-out $(DERIVED_SRCS) main/Config.hs parser/Parser.y, $(sort $(SRCS))) +# above is wrong because of the following problem: +# module `main:DataCon' is defined in multiple files: basicTypes/DataCon.lhs +# basicTypes/DataCon.lhs-boot + +GHCTAGS_HS_SRCS = $(HS_SRCS) +GHCTAGS_HC_OPTS = $(patsubst -i$(odir)/%, -i%, $(HC_OPTS)) +GHCTAGS_HC_OPTS += -DSTAGE='"$(stage)"' + +#------------------------------------------------------------ +# Tags + +.PHONY: ghctags + +ghctags :: $(GHCTAGS_HS_SRCS) $(TAGS_C_SRCS) + @if [ "$(stage)" != 2 ]; then echo "Must use 'make stage=2 ghctags'"; exit 1; fi + @$(RM) TAGS + @touch TAGS + @echo SOURCES ARE "$(GHCTAGS_HS_SRCS)" + : ifneq "$(GHCTAGS_HS_SRCS)" "" + @echo TIME TO ROCK AND ROLL + # $(GHCTAGS_INPLACE) -- $(MKDEPENDHS_OPTS) $(filter-out -split-objs, $(MKDEPENDHS_HC_OPTS)) -- $(GHCTAGS_HS_SRCS) + $(GHCTAGS_INPLACE) -- $(GHCTAGS_HC_OPTS) -- $(GHCTAGS_HS_SRCS) + : endif +ifneq "$(TAGS_C_SRCS)" "" + etags -a $(TAGS_C_SRCS) +endif + @( DEREFFED=`ls -l Makefile | sed -e 's/.*-> \(.*\)/\1/g'` && $(RM) `dirname $$DEREFFED`/TAGS && $(CP) TAGS `dirname $$DEREFFED` ) 2>/dev/null || echo TAGS file generated, perhaps copy over to source tree? + include $(TOP)/mk/target.mk ifeq "$(BUILD_GHC_PACKAGE)" "YES" all :: $(GHC_PROG) endif -$(odir)/main/Config.$(way_)o: SRC_HC_OPTS+=-DSTAGE=$(DQ)$(stage)$(DQ) +$(odir)/main/Config.$(way_)o: SRC_HC_OPTS+=-DSTAGE='"$(stage)"' ifneq "$(findstring $(stage), 2 3)" "" $(warning LIBRARY is $(LIBRARY)) @@ -935,12 +1000,6 @@ endif #----------------------------------------------------------------------------- # 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)