X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=c1819f2cd269bcebd213caa4508bda25dc2240a0;hb=28a464a75e14cece5db40f2765a29348273ff2d2;hp=49890d12c02362c8410f418804ed5cf1a7ea5549;hpb=6bcf03432042d256262f7359fb7a02098b1da3e3;p=ghc-hetmet.git diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index 49890d1..c1819f2 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -157,10 +157,10 @@ SRC_HC_OPTS += $(patsubst %, -i$(odir)/%, $(ALL_DIRS)) HS_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(HS_SRCS)))) C_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(C_SRCS)))) -# Our standard cleaning rules don't know that we're doing our output into $(odir), so -# we have to augment CLEAN_FILES appropriateliy. +# Our standard cleaning rules don't know that we're doing our output +# into $(odir), so we have to augment CLEAN_FILES appropriateliy. -CLEAN_FILES += $(odir)/*/*.hi +CLEAN_FILES += $(odir)/*/*.hi $(odir)/*/*.hi-boot $(odir)/*/*.o-boot ifeq "$(UsingHsBoot)" "YES" CLEAN_FILES += $(odir)/*/*.hi-boot $(odir)/*/*.o-boot @@ -181,7 +181,6 @@ endif # be to do `env PATH=$(PATH) make ghc' to minimise the environment. (or the # equivalent of `env' if it doesn't exist locally). # -ifneq "$(BuildPackageGHC)" "YES" ifneq "$(way)" "dll" ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32" HS_PROG=$(odir)/ghc$(_way)-$(ProjectVersion) @@ -191,7 +190,6 @@ endif else HS_PROG=$(odir)/ghc-$(ProjectVersion) endif -endif # ----------------------------------------------------------------------------- # Create compiler configuration @@ -218,6 +216,8 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile @echo "cRAWCPP_FLAGS = \"$(RAWCPP_FLAGS)\"" >> $(CONFIG_HS) @echo "cGCC = \"$(WhatGccIsCalled)\"" >> $(CONFIG_HS) @echo "cMKDLL = \"$(BLD_DLL)\"" >> $(CONFIG_HS) + @echo "cLdIsGNULd = \"$(LdIsGNULd)\"" >> $(CONFIG_HS) + @echo "cLD_X = \"$(LD_X)\"" >> $(CONFIG_HS) @echo "cPROJECT_DIR = \"$(PROJECT_DIR)\"" >> $(CONFIG_HS) @echo "cGHC_DRIVER_DIR_REL = \"$(GHC_DRIVER_DIR_REL)\"" >> $(CONFIG_HS) @echo "cGHC_TOUCHY_PGM = \"$(GHC_TOUCHY_PGM)\"" >> $(CONFIG_HS) @@ -261,9 +261,9 @@ stage1/$(PLATFORM_H) : stage_dirs $(FPTOOLS_TOP)/mk/config.mk Makefile @echo "#ifndef __PLATFORM_H__" >$@ @echo "#define __PLATFORM_H__" >>$@ @echo >> $@ - @echo "#define BuildPlatform_TYPE $(BuildPlatform_CPP)" >> $@ - @echo "#define HostPlatform_TYPE $(HostPlatform_CPP)" >> $@ - @echo "#define TargetPlatform_TYPE $(TargetPlatform_CPP)" >> $@ + @echo "#define BuildPlatform_NAME \"$(BUILDPLATFORM)\"" >> $@ + @echo "#define HostPlatform_NAME \"$(HOSTPLATFORM)\"" >> $@ + @echo "#define TargetPlatform_NAME \"$(TARGETPLATFORM)\"" >> $@ @echo >> $@ @echo "#define $(BuildPlatform_CPP)_BUILD 1" >> $@ @echo "#define $(HostPlatform_CPP)_HOST 1" >> $@ @@ -307,9 +307,9 @@ stage2/$(PLATFORM_H) : stage_dirs $(FPTOOLS_TOP)/mk/config.mk Makefile @echo "#ifndef __PLATFORM_H__" >$@ @echo "#define __PLATFORM_H__" >>$@ @echo >> $@ - @echo "#define BuildPlatform_TYPE $(HostPlatform_CPP)" >> $@ - @echo "#define HostPlatform_TYPE $(TargetPlatform_CPP)" >> $@ - @echo "#define TargetPlatform_TYPE $(TargetPlatform_CPP)" >> $@ + @echo "#define BuildPlatform_NAME \"$(HOSTPLATFORM)\"" >> $@ + @echo "#define HostPlatform_NAME \"$(TARGETPLATFORM)\"" >> $@ + @echo "#define TargetPlatform_NAME \"$(TARGETPLATFORM)\"" >> $@ @echo >> $@ @echo "#define $(HostPlatform_CPP)_BUILD 1" >> $@ @echo "#define $(TargetPlatform_CPP)_HOST 1" >> $@ @@ -361,7 +361,7 @@ SRC_HC_OPTS += -Istage$(stage) ALL_DIRS = \ utils basicTypes types hsSyn prelude rename typecheck deSugar coreSyn \ specialise simplCore stranal stgSyn simplStg codeGen main \ - profiling parser cprAnalysis compMan ndpFlatten iface cmm + profiling parser cprAnalysis ndpFlatten iface cmm # Make sure we include Config.hs even if it doesn't exist yet... ALL_SRCS += $(CONFIG_HS) @@ -369,9 +369,6 @@ ALL_SRCS += $(CONFIG_HS) # HsGeneric.hs is not used just now EXCLUDED_SRCS += hsSyn/HsGeneric.hs -# main/GHC.hs is not ready yet -EXCLUDED_SRCS += main/GHC.hs - ifeq ($(GhcWithNativeCodeGen),YES) ALL_DIRS += nativeGen else @@ -395,7 +392,7 @@ else ifneq "$(findstring $(stage), 2 3)" "" bootstrapped = YES else -bootstrapped = $(shell if (test $(GhcCanonVersion) -ge $(ProjectVersionInt) -a $(GhcPatchLevel) -ge $(ProjectPatchLevel)); then echo YES; else echo NO; fi) +bootstrapped = $(shell if (test $(GhcCanonVersion) -eq $(ProjectVersionInt) -a $(GhcPatchLevel) -eq $(ProjectPatchLevel)); then echo YES; else echo NO; fi) endif endif @@ -410,9 +407,23 @@ ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES" # Yes, include the interepreter, readline, and Template Haskell extensions SRC_HC_OPTS += -DGHCI -package template-haskell +PKG_DEPENDS += template-haskell + +# Use threaded RTS with GHCi, so threads don't get blocked at the prompt. +SRC_HC_OPTS += -threaded ALL_DIRS += ghci +# If we are going to use dynamic libraries instead of .o files for ghci, +# we will need to always retain CAFs in the compiler. +# ghci/keepCAFsForGHCi contains a GNU C __attribute__((constructor)) +# function which sets the keepCAFs flag for the RTS before any Haskell +# code is run. +ifeq "$(GhcBuildDylibs)" "YES" +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 @@ -424,10 +435,12 @@ ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32" ifeq "$(stage)" "1" ifeq "$(GhcHasReadline)" "YES" SRC_HC_OPTS += -package readline -DUSE_READLINE +PKG_DEPENDS += readline endif else ifeq "$(GhcLibsWithReadline)" "YES" SRC_HC_OPTS += -package readline -DUSE_READLINE +PKG_DEPENDS += readline endif endif # stage=1 endif # not windows @@ -479,11 +492,22 @@ ifeq "$(bootstrapped) $(ghc_ge_601)" "NO NO" SRC_HC_OPTS += -package posix else SRC_HC_OPTS += -package unix +PKG_DEPENDS += unix endif endif -ifneq "$(findstring YES, $(bootstrapped) $(ghc_ge_603))" "" +# 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 @@ -502,13 +526,20 @@ endif # It's an expensive module to recompile! prelude/PrimOp_HC_OPTS = -H80m -# because the NCG can't handle the 64-bit math in here -prelude/PrelRules_HC_OPTS = -fvia-C 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 += -fno-warn-incomplete-patterns -fvia-C +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 @@ -528,15 +559,14 @@ ifeq "$(bootstrapped)" "YES" utils/Binary_HC_OPTS = -funbox-strict-fields endif -# ByteCodeItbls uses primops that the NCG doesn't support yet. -ghci/ByteCodeItbls_HC_OPTS += -fvia-C -ghci/ByteCodeLink_HC_OPTS += -fvia-C -monly-3-regs - -# BinIface and Binary take ages to both compile and run if you don's use -O +# We always optimise some low-level modules, otherwise performance of +# a non-optimised compiler is severely affected. main/BinIface_HC_OPTS += -O utils/Binary_HC_OPTS += -O utils/FastMutInt_HC_OPTS += -O - +utils/Encoding_HC_OPTS += -O +utils/StringBuffer_HC_OPTS += -O +utils/FastString_HC_OPTS += -O # ---- Profiling ---- #simplCore/Simplify_HC_OPTS = -auto-all @@ -547,7 +577,6 @@ utils/FastMutInt_HC_OPTS += -O # DriverMkDepend), causing some of them to be commoned up. We have a fix for # this in 5.00+, but earlier versions of the compiler will need CSE turned off. # To be on the safe side, we disable CSE in *all* modules with top-level IORefs. -compMan/CompManager_HC_OPTS = -fno-cse ghci/InteractiveUI_HC_OPTS = -fno-cse main/CmdLineOpts_HC_OPTS = -fno-cse main/DriverMkDepend_HC_OPTS = -fno-cse @@ -632,30 +661,9 @@ primop-usage.hs-incl: prelude/primops.txt # Include libghccompat in stage1 only. In stage2 onwards, all these # libraries will be available from the main libraries. + ifeq "$(stage)" "1" -SRC_HC_OPTS += -i$(GHC_LIB_COMPAT_DIR) -SRC_LD_OPTS += -L$(GHC_LIB_COMPAT_DIR) -lghccompat - -ifeq "$(Windows)" "YES" -# not very nice, but required for -lghccompat on Windows -SRC_LD_OPTS += -lshell32 -endif - -# This is horrible. We ought to be able to omit the entire directory -# from mkDependHS. -SRC_MKDEPENDHS_OPTS += \ - -optdep--exclude-module=Compat.RawSystem \ - -optdep--exclude-module=Compat.Directory \ - -optdep--exclude-module=Distribution.Compat.ReadP \ - -optdep--exclude-module=Distribution.Extension \ - -optdep--exclude-module=Distribution.GetOpt \ - -optdep--exclude-module=Distribution.InstalledPackageInfo \ - -optdep--exclude-module=Distribution.License \ - -optdep--exclude-module=Distribution.Package \ - -optdep--exclude-module=Distribution.ParseUtils \ - -optdep--exclude-module=Distribution.Setup \ - -optdep--exclude-module=Distribution.Version \ - -optdep--exclude-module=System.Directory.Internals +include $(GHC_LIB_COMPAT_DIR)/compat.mk endif SRC_LD_OPTS += -no-link-chk @@ -674,7 +682,11 @@ $(odir)/ghc-inplace : $(HS_PROG) ghc-inplace : stage1/ghc-inplace $(LN_S) -f $< $@ -CLEAN_FILES += $(odir)/ghc-inplace ghc-inplace +ifeq "$(stage)" "1" +CLEAN_FILES += ghc-inplace +endif + +CLEAN_FILES += $(odir)/ghc-inplace #----------------------------------------------------------------------------- # install @@ -733,17 +745,42 @@ endif # typecheck/TcUnify_HC_OPTS += -auto-all coreSyn/CorePrep_HC_OPTS += -auto-all +# parser/Parser_HC_OPTS += -fasm #----------------------------------------------------------------------------- -# Building GHC package +# Building the GHC package -ifeq "$(BuildPackageGHC)" "YES" +# The GHC package is made from the stage 2 build. Fortunately the +# package build system framework more or less does the right thing for +# us here. +ifeq "$(stage)" "2" PACKAGE = ghc -VERSION = 6.4 -STANDALONE_PACKAGE = YES -PACKAGE_DEPS = +HIERARCHICAL_LIB = NO +VERSION = $(ProjectVersion) +PKG_DEPENDS += base haskell98 +PACKAGE_CPP_OPTS += -DPKG_DEPENDS='$(PKG_DEPENDS)' + +# 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)) + +# disable splitting: it won't really help with GHC, and the specialised +# build system for ghc/compiler isn't set up to handle it. +SplitObjs = NO + +# the package build system likes to set WAYS=$(GhcLibWays), but we don't +# really want to build the whole of GHC multiple ways... if you do, +# set GhcCompilerWays instead. +GhcLibWays = $(GhcCompilerWays) +# override $(GhcLibHcOpts): we want GhcStage2HcOpts to take precedence +GhcLibHcOpts = + +# override default definition of HS_IFACES so we can add $(odir) +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 endif #----------------------------------------------------------------------------- @@ -788,7 +825,11 @@ 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' <.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@^.*/lib/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. -include .depend-$(stage)