X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=a64cd12fe71912f1bf6aa44c458c0c69b0039058;hb=be745f257384dfedb81f154a961daaa709010ba1;hp=04c7778ba9e9dbeb097de2874fad52f96f1e0857;hpb=5123ae93cfc5cdfcecc84340a9517580ad900d64;p=ghc-hetmet.git diff --git a/compiler/Makefile b/compiler/Makefile index 04c7778..a64cd12 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,57 +216,97 @@ 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 = \"$(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 "cRelocatableBuild :: Bool" >> $(CONFIG_HS) ifeq "$(RelocatableBuild)" "YES" @echo "cRelocatableBuild = True" >> $(CONFIG_HS) else @echo "cRelocatableBuild = False" >> $(CONFIG_HS) endif -ifeq "$(UseLibFFI)" "YES" + @echo "cLibFFI :: Bool" >> $(CONFIG_HS) +ifeq "$(UseLibFFIForAdjustors)" "YES" @echo "cLibFFI = True" >> $(CONFIG_HS) else @echo "cLibFFI = False" >> $(CONFIG_HS) @@ -401,7 +431,7 @@ SRC_HC_OPTS += -Istage$(stage) ALL_DIRS = \ utils basicTypes types hsSyn prelude rename typecheck deSugar coreSyn \ vectorise specialise simplCore stranal stgSyn simplStg codeGen main \ - profiling parser cprAnalysis ndpFlatten iface cmm + profiling parser cprAnalysis iface cmm # Make sure we include Config.hs even if it doesn't exist yet... ALL_SRCS += $(CONFIG_HS) @@ -436,6 +466,15 @@ bootstrapped = NO endif endif +# Beyond stage 1, honour any Mac OS X depolyment target options. If we use +# these options in stage 1 we get a linker error if the bootstrap compiler is +# for a more recent OS version +ifneq "$(findstring $(stage), 2 3)" "" +SRC_CC_OPTS += $(MACOSX_DEPLOYMENT_CC_OPTS) +SRC_HC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS)) +SRC_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS)) +endif + # ----------------------------------------------------------------------------- # Building a compiler with interpreter support # @@ -444,10 +483,13 @@ endif # the interpreter is supported on this platform. ifeq "$(bootstrapped)" "YES" -SRC_HC_OPTS += -package hpc -package bytestring -PKG_DEPENDS += hpc bytestring +SRC_HC_OPTS += -package bytestring +PKG_DEPENDS += bytestring endif +SRC_HC_OPTS += -package hpc +PKG_DEPENDS += hpc + ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES" # Yes, include the interepreter and Template Haskell extensions @@ -471,6 +513,9 @@ ifeq "$(GhcDebugged)" "YES" SRC_LD_OPTS += -debug endif +SRC_HC_OPTS += -I$(FPTOOLS_TOP)/libffi/build/include +SRC_HSC2HS_OPTS += -I$(FPTOOLS_TOP)/libffi/build/include + ALL_DIRS += ghci # If we are going to use dynamic libraries instead of .o files for ghci, @@ -483,23 +528,23 @@ else EXCLUDED_SRCS += ghci/keepCAFsForGHCi.c endif -# Enable readline if either: -# - we're building stage 1 and $(GhcHasReadline)="YES" -# - we're building stage 2/3, and we have built the readline package +# Enable editline if either: +# - we're building stage 1 and $(GhcHasEditline)="YES" +# - we're building stage 2/3, and we have built the editline package # -# But we don't enable readline on Windows, because readline is fairly -# broken there. +# But we don't enable editline on Windows, as Windows terminals have +# editline-like support builtin. # ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32" ifeq "$(stage)" "1" -ifeq "$(GhcHasReadline)" "YES" -SRC_HC_OPTS += -package readline -DUSE_READLINE -PKG_DEPENDS += readline +ifeq "$(GhcHasEditline)" "YES" +SRC_HC_OPTS += -package editline -DUSE_EDITLINE +PKG_DEPENDS += editline endif else -ifeq "$(wildcard $(FPTOOLS_TOP_ABS)/libraries/readline/unbuildable)" "" -SRC_HC_OPTS += -package readline -DUSE_READLINE -PKG_DEPENDS += readline +ifeq "$(wildcard $(FPTOOLS_TOP_ABS)/libraries/editline/unbuildable)" "" +SRC_HC_OPTS += -package editline -DUSE_EDITLINE +PKG_DEPENDS += editline endif endif # stage=1 endif # not windows @@ -526,9 +571,13 @@ SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR) # ----------------------------------------------------------------------------- # Haskell compilations -SRC_HC_OPTS += \ - -cpp -fglasgow-exts -fno-generics -Rghc-timing \ - -I. -Iparser +SRC_HC_OPTS += -cpp -fglasgow-exts -Rghc-timing -I. -Iparser -Iutil + +ifeq "$(ghc_ge_609)" "NO" +SRC_HC_OPTS += -fno-generics +else +SRC_HC_OPTS += -XNoGenerics +endif # Omitted: -I$(GHC_INCLUDE_DIR) # We should have -I$(GHC_INCLUDE_DIR) in SRC_HC_OPTS, @@ -552,30 +601,20 @@ SRC_HC_OPTS += -package Win32 PKG_DEPENDS += Win32 endif else -ifeq "$(bootstrapped) $(ghc_ge_601)" "NO NO" -SRC_HC_OPTS += -package posix -else SRC_HC_OPTS += -package unix PKG_DEPENDS += unix endif -endif -# We use the Cabal package in stages 2/3 only; in stage 1 we're using -# the libcompat library which provides the Cabal modules. -ifneq "$(stage)" "1" 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) +SRC_HC_OPTS += $(GhcHcOpts) $(GhcStage$(stage)HcOpts) SRC_HC_OPTS += -H16M ifeq "$(BootingFromHc)" "YES" @@ -586,7 +625,7 @@ endif # The standard suffix rule for compiling a Haskell file # adds these flags to the command line -# There used to be a -no-recomp flag on PrimOp, but why? +# There used to be a -fforce-recomp flag on PrimOp, but why? # It's an expensive module to recompile! prelude/PrimOp_HC_OPTS = -H80m @@ -594,30 +633,17 @@ 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 -# throw away inlinings as it would normally do in -Onot mode: -parser/Parser_HC_OPTS += -Onot -fno-ignore-interface-pragmas +# throw away inlinings as it would normally do in -O0 mode: +parser/Parser_HC_OPTS += -O0 -fno-ignore-interface-pragmas ifeq "$(HOSTPLATFORM)" "hppa1.1-hp-hpux9" rename/RnMonad_HC_OPTS = -O2 -O2-for-C 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. @@ -658,6 +684,10 @@ parser/Lexer_HC_OPTS += -funbox-strict-fields # prototype via a global option instead of a myriad of per-file OPTIONS SRC_HC_OPTS += '-\#include "cutils.h"' +ifeq "$(ghc_ge_605)" "NO" +utils/LazyUniqFM_HC_OPTS += -fallow-undecidable-instances +endif + # ---------------------------------------------------------------------------- # Generate supporting stuff for prelude/PrimOp.lhs # from prelude/primops.txt @@ -729,14 +759,12 @@ primop-usage.hs-incl: prelude/primops.txt #----------------------------------------------------------------------------- # Linking -# Include libghccompat in stage1 only. In stage2 onwards, all these -# libraries will be available from the main libraries. - -ifeq "$(stage)" "1" -include $(GHC_COMPAT_DIR)/compat.mk +ifeq "$(GhcUnregisterised)" "NO" +ifeq "$(HOSTPLATFORM)" "ia64-unknown-linux" +# needed for generating proper relocation in large binaries: trac #856 +SRC_LD_OPTS += -optl-Wl,--relax +endif endif - -SRC_LD_OPTS += -no-link-chk # ----------------------------------------------------------------------------- # create ghc-inplace, a convenient way to run ghc from the build tree... @@ -745,16 +773,13 @@ 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 CLEAN_FILES += $(INPLACE_SRC) GHC_PATH=$(FPTOOLS_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 $(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 $@ @@ -829,7 +854,6 @@ endif # typecheck/TcUnify_HC_OPTS += -auto-all # coreSyn/CorePrep_HC_OPTS += -auto-all -# parser/Parser_HC_OPTS += -fasm #----------------------------------------------------------------------------- # Building the GHC package @@ -851,6 +875,8 @@ 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)))' +# We want to define STAGE to be like "2" in the Haskell code, so we need +# to quote the "s so that they don't get interpreted by the shell. PACKAGE_CPP_OPTS += -DSTAGE='"$(stage)"' # Omit Main from the library, the client will want to plug their own Main in @@ -961,7 +987,7 @@ 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)) @@ -1009,7 +1035,7 @@ endif # careful to recompile stuff you need if you reconfigure or change HsVersions.h. # Aargh, these don't work properly anyway, because GHC's recompilation checker -# just reports "compilation NOT required". Do we have to add -no-recomp for each +# just reports "compilation NOT required". Do we have to add -fforce-recomp for each # of these .hs files? I haven't done anything about this yet. $(odir)/codeGen/Bitmap.$(way_)o : ../includes/MachDeps.h @@ -1058,12 +1084,8 @@ 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;' <.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