X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FMakefile;h=719b11c9abb3105a0763e2178da293c974c98b70;hb=a12e845684c10955bc594cdb20d1f13fae14873d;hp=2bc31b38828b4fa200be1528c5f4513c57e09870;hpb=0dfcd5776f3ef89ceaafef6c4730ddac759e3716;p=ghc-hetmet.git diff --git a/rts/Makefile b/rts/Makefile index 2bc31b3..719b11c 100644 --- a/rts/Makefile +++ b/rts/Makefile @@ -25,16 +25,33 @@ PACKAGE = rts HC=$(GHC_INPLACE) + +# Setting _way here is a nasty hack to make sure we get libHSrts*.a etc +# rather than just libHSrts.a when we are installing bindists. +ifeq "$(DOING_BIN_DIST)" "YES" +_way = * +endif + # ----------------------------------------------------------------------------- # RTS ways -WAYS=$(GhcLibWays) $(GhcRTSWays) +WAYS= +# $(strip $(GhcLibWays) $(GhcRTSWays)) ifneq "$(findstring debug, $(way))" "" GhcRtsHcOpts= GhcRtsCcOpts=-g -O0 endif +ifeq "$(BeConservative)" "YES" +GhcRtsCcOpts += -DBE_CONSERVATIVE +endif + +# ----------------------------------------------------------------------------- + +# There's nothing for Haddock here... +override HADDOCK_DOCS = NO + # ----------------------------------------------------------------------------- # Tells the build system not to add various Haskellish options to $(SRC_HC_OPTS) @@ -76,6 +93,15 @@ endif EXCLUDED_SRCS += parallel/SysMan.c +EXCLUDED_SRCS += dyn-wrapper.c + +# compile generic patchable dyn-wrapper + +DYNWRAPPER_SRC = dyn-wrapper.c +DYNWRAPPER_PROG = dyn-wrapper$(exeext) +$(DYNWRAPPER_PROG): $(DYNWRAPPER_SRC) + $(HC) -cpp -optc-include -optcdyn-wrapper-patchable-behaviour.h $(INPLACE_EXTRA_FLAGS) $< -o $@ + # The build system doesn't give us these CMM_SRCS = $(filter-out AutoApply%.cmm, $(wildcard *.cmm)) $(EXTRA_CMM_SRCS) CMM_OBJS = $(patsubst %.cmm,%.$(way_)o, $(CMM_SRCS)) @@ -124,38 +150,92 @@ SRC_CC_OPTS += $(WARNING_OPTS) SRC_CC_OPTS += $(STANDARD_OPTS) SRC_CC_OPTS += $(GhcRtsCcOpts) -SRC_HC_OPTS += $(GhcRtsHcOpts) -package-name rts +SRC_HC_OPTS += $(GhcRtsHcOpts) $(STANDARD_OPTS) -package-name rts ifneq "$(GhcWithSMP)" "YES" SRC_CC_OPTS += -DNOSMP SRC_HC_OPTS += -optc-DNOSMP endif +ifeq "$(UseLibFFIForAdjustors)" "YES" +SRC_CC_OPTS += -DUSE_LIBFFI_FOR_ADJUSTORS +endif + +ifeq "$(Windows)" "YES" +# SDM: when compiled with -fasm the RTS currently has bogus references to +# __imp_base_ things, so working around for now: +SRC_HC_OPTS = -fvia-C +endif + ifneq "$(DYNAMIC_RTS)" "YES" SRC_HC_OPTS += -static else LIB_LD_OPTS += -ignore-package base -ignore-package rts ifeq "$(DYNAMIC_RTS) $(HOSTPLATFORM)" "YES i386-unknown-mingw32" -BASE_VERSION=$(strip $(shell grep version: $(TOP)/libraries/base/base.cabal | cut -f2 -d:)) -BASE_NAME=HSbase-$(BASE_VERSION)-ghc$(ProjectVersion)$(soext) +LIB_DEPS=buildbase +.PHONY: buildbase + BASE_DIST_LIB=$(TOP)/libraries/base/dist/build -BASE_IMPORT_LIBRARY=$(BASE_DIST_LIB)/lib$(BASE_NAME).a -LIB_DEPS=$(BASE_IMPORT_LIBRARY) -LIB_LD_OPTS += -L$(BASE_DIST_LIB) -l$(BASE_NAME) -# We extract a good bit of information out of the rts package.conf by going via ghc-pkg -LIB_LD_OPTS += $(foreach lib,$(shell $(GHC_PKG_INPLACE) field rts extra-libraries | sed -e s/extra-libraries://),"-l$(lib)") -LIB_LD_OPTS += $(foreach libdir,$(shell $(GHC_PKG_INPLACE) field rts library-dirs | sed -e s/library-dirs://),"-L$(libdir)") + +# The following must be a one liner otherwise its evaluation won't be delayed until base/rts packages are properly registered +LIB_LD_OPTS = $(foreach lib,$(shell $(GHC_PKG_INPLACE) field base hs-libraries | sed -e 's/hs-libraries: //'),"-l$(lib)-ghc$(ProjectVersion)$(soext)") $(foreach lib,$(shell $(GHC_PKG_INPLACE) field rts extra-libraries | sed -e s/extra-libraries://),"-l$(lib)") $(foreach libdir,$(shell $(GHC_PKG_INPLACE) field base library-dirs | sed -e 's/library-dirs: //' | sed -e s,\\\\,/,g) $(shell $(GHC_PKG_INPLACE) field rts library-dirs | sed -e s/library-dirs:// | sed -e s/\\\\/\\\\\\\\/g),"-L$(libdir)") endif endif -RtsMessages_CC_OPTS += -DProjectVersion=\"$(ProjectVersion)\" -RtsUtils_CC_OPTS += -DProjectVersion=\"$(ProjectVersion)\" -RtsUtils_CC_OPTS += -DRtsWay=\"rts$(_way)\" -RtsUtils_CC_OPTS += -DHostPlatform=\"$(HOSTPLATFORM)\" -RtsUtils_CC_OPTS += -DBuildPlatform=\"$(BUILDPLATFORM)\" -RtsUtils_CC_OPTS += -DTargetPlatform=\"$(TARGETPLATFORM)\" -RtsUtils_CC_OPTS += -DGhcUnregisterised=\"$(GhcUnregisterised)\" -RtsUtils_CC_OPTS += -DGhcEnableTablesNextToCode=\"$(GhcEnableTablesNextToCode)\" +# Mac OS X: make sure we compile for the right OS version +SRC_CC_OPTS += $(MACOSX_DEPLOYMENT_CC_OPTS) +SRC_HC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS)) +LIB_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS)) + +# XXX DQ is now the same on all platforms, so get rid of it +DQ = \" + +# If Main.c is built with optimisation then the SEH exception stuff on +# Windows gets confused. +# This has to be in HC rather than CC opts, as otherwise there's a +# -optc-O2 that comes after it. +Main_HC_OPTS += -optc-O0 + +RtsMessages_CC_OPTS += -DProjectVersion=$(DQ)$(ProjectVersion)$(DQ) +RtsUtils_CC_OPTS += -DProjectVersion=$(DQ)$(ProjectVersion)$(DQ) +RtsUtils_CC_OPTS += -DRtsWay=$(DQ)rts$(_way)$(DQ) +# +RtsUtils_CC_OPTS += -DHostPlatform=$(DQ)$(HOSTPLATFORM)$(DQ) +RtsUtils_CC_OPTS += -DHostArch=$(DQ)$(HostArch_CPP)$(DQ) +RtsUtils_CC_OPTS += -DHostOS=$(DQ)$(HostOS_CPP)$(DQ) +RtsUtils_CC_OPTS += -DHostVendor=$(DQ)$(HostVendor_CPP)$(DQ) +# +RtsUtils_CC_OPTS += -DBuildPlatform=$(DQ)$(BUILDPLATFORM)$(DQ) +RtsUtils_CC_OPTS += -DBuildArch=$(DQ)$(BuildArch_CPP)$(DQ) +RtsUtils_CC_OPTS += -DBuildOS=$(DQ)$(BuildOS_CPP)$(DQ) +RtsUtils_CC_OPTS += -DBuildVendor=$(DQ)$(BuildVendor_CPP)$(DQ) +# +RtsUtils_CC_OPTS += -DTargetPlatform=$(DQ)$(TARGETPLATFORM)$(DQ) +RtsUtils_CC_OPTS += -DTargetArch=$(DQ)$(TargetArch_CPP)$(DQ) +RtsUtils_CC_OPTS += -DTargetOS=$(DQ)$(TargetOS_CPP)$(DQ) +RtsUtils_CC_OPTS += -DTargetVendor=$(DQ)$(TargetVendor_CPP)$(DQ) +# +RtsUtils_CC_OPTS += -DGhcUnregisterised=$(DQ)$(GhcUnregisterised)$(DQ) +RtsUtils_CC_OPTS += -DGhcEnableTablesNextToCode=$(DQ)$(GhcEnableTablesNextToCode)$(DQ) + +# ffi.h triggers prototype warnings, so disable them here: +Interpreter_CC_OPTS += -Wno-strict-prototypes +Adjustor_CC_OPTS += -Wno-strict-prototypes +sm/Storage_CC_OPTS += -Wno-strict-prototypes + +StgCRun_CC_OPTS += -w +Typeable_CC_OPTS += -w +RetainerProfile_CC_OPTS += -w +sm/Compact_CC_OPTS += -w +# On Windows: +win32/ConsoleHandler_CC_OPTS += -w +win32/ThrIOManager_CC_OPTS += -w +win32/Ticker_CC_OPTS += -w +# The above warning supression flags are a temporary kludge. +# While working on this module you are encouraged to remove it and fix +# any warnings in the module. See +# http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings +# for details ifeq "$(way)" "mp" SRC_HC_OPTS += -I$$PVM_ROOT/include @@ -212,8 +292,26 @@ endif # Add PAPI library if needed ifeq "$(GhcRtsWithPapi)" "YES" -SRC_HC_OPTS += -optc-DUSE_PAPI + +SRC_CC_OPTS += -DUSE_PAPI PACKAGE_CPP_OPTS += -DUSE_PAPI + +PACKAGE_CPP_OPTS += -DPAPI_INCLUDE_DIR=$(PapiIncludeDir) +PACKAGE_CPP_OPTS += -DPAPI_LIB_DIR=$(PapiLibDir) + +ifneq "$(PapiIncludeDir)" "" +SRC_HC_OPTS += -I$(PapiIncludeDir) +SRC_CC_OPTS += -I$(PapiIncludeDir) +SRC_HSC2HS_OPTS += -I$(PapiIncludeDir) +endif +ifneq "$(PapiLibDirs)" "" +SRC_LD_OPTS += -L$(PapiLibDirs) +endif + +else # GhcRtsWithPapi==YES + +PACKAGE_CPP_OPTS += -DPAPI_LIB_DIR="" + endif #----------------------------------------------------------------------------- @@ -250,12 +348,6 @@ CLEAN_FILES += $(AUTO_APPLY_CMM) endif # ----------------------------------------------------------------------------- -# Compile GMP only if we don't have it already -# -# We use GMP's own configuration stuff, because it's all rather hairy -# and not worth re-implementing in our Makefile framework. - -CLEAN_FILES += gmp/libgmp.a # Need to get the GMP vars in through CPP to package.conf.in, and put # quotes around each element. @@ -281,6 +373,14 @@ SRC_HSC2HS_OPTS += -I../gmp/gmpbuild SRC_LD_OPTS += -L../gmp/gmpbuild #----------------------------------------------------------------------------- +# libffi stuff + +SRC_CC_OPTS += -I../libffi/build/include +SRC_HC_OPTS += -I../libffi/build/include +SRC_HSC2HS_OPTS += -I../libffi/build/include +SRC_LD_OPTS += -L../libffi/build/include + +#----------------------------------------------------------------------------- # # Building the GUM SysMan # @@ -306,13 +406,7 @@ endif # Compiling the cmm files # ToDo: should we really include Rts.h here? Required for GNU_ATTRIBUTE(). -SRC_HC_OPTS += -I. -\#include HCIncludes.h - -ifeq "$(Windows)" "YES" -PrimOps_HC_OPTS += -\#include '' -\#include win32/AsyncIO.h -else -PrimOps_HC_OPTS += -\#include posix/Itimer.h -endif +SRC_HC_OPTS += -I. # Otherwise the stack-smash handler gets triggered. ifeq "$(TargetOS_CPP)" "openbsd" @@ -322,6 +416,21 @@ endif # -O3 helps unroll some loops (especially in copy() with a constant argument). sm/Evac_HC_OPTS += -optc-funroll-loops +ifneq "$(findstring thr, $(way))" "" +EXTRA_SRCS += sm/Evac_thr.c sm/Scav_thr.c +CLEAN_FILES += sm/Evac_thr.c sm/Scav_thr.c + +sm/Evac_thr.c : sm/Evac.c + cp $< $@ +sm/Scav_thr.c : sm/Scav.c + cp $< $@ + +sm/Evac_thr_HC_OPTS += -optc-DPARALLEL_GC +sm/Scav_thr_HC_OPTS += -optc-DPARALLEL_GC +else +EXCLUDED_SRCS += sm/Evac_thr.c sm/Scav_thr.c +endif + # Without this, thread_obj will not be inlined (at least on x86 with GCC 4.1.0) sm/Compact_HC_OPTS += -optc-finline-limit=2500 @@ -329,7 +438,7 @@ sm/Compact_HC_OPTS += -optc-finline-limit=2500 # use a variety of types to represent closure pointers (StgPtr, # StgClosure, StgMVar, etc.), and without -fno-strict-aliasing gcc is # allowed to assume that these pointers do not alias. eg. without -# this flag we get problems in GC.c:copy() with gcc 3.4.3, the +# this flag we get problems in sm/Evac.c:copy() with gcc 3.4.3, the # upd_evacee() assigments get moved before the object copy. SRC_CC_OPTS += -fno-strict-aliasing @@ -360,24 +469,26 @@ endif include $(TOP)/mk/target.mk ifeq "$(DYNAMIC_RTS) $(HOSTPLATFORM)" "YES i386-unknown-mingw32" -$(BASE_IMPORT_LIBRARY): $(LIBRARY).a - $(MAKE) -C ../libraries/ make.library.base -# just for the timestamps - touch $(BASE_IMPORT_LIBRARY) +# $(LIBRARY).a is not the static library libHSrts.a but +# libHSrts.dll.a, the import library for dynamic linking required for +# linking the dynamic version of base +buildbase: $(LIBRARY).a + $(MAKE) way="" -C ../libraries/ make.library.ghc-prim + $(MAKE) way="" -C ../libraries/ make.library.integer-gmp + $(MAKE) way="" -C ../libraries/ make.library.base endif #----------------------------------------------------------------------------- # # binary-dist -binary-dist: - $(INSTALL_DIR) $(BIN_DIST_DIR)/rts - $(INSTALL_DIR) $(BIN_DIST_DIR)/rts/gmp - $(INSTALL_DATA) Makefile $(BIN_DIST_DIR)/rts/ - $(INSTALL_DATA) package.conf.in $(BIN_DIST_DIR)/rts/ -ifneq "$(INSTALL_LIBS)" "" - $(INSTALL_DATA) $(INSTALL_LIBS) $(BIN_DIST_DIR)/rts/ -endif -ifneq "$(INSTALL_LIBEXECS)" "" - $(INSTALL_PROGRAM) $(INSTALL_LIBEXECS) $(BIN_DIST_DIR)/rts/ -endif +BINDIST_EXTRAS += package.conf.in +BINDIST_EXTRAS += $(INSTALL_LIBS) +BINDIST_EXTRAS += $(INSTALL_LIBEXECS) + +# Setting _way here is a nasty hack to make sure we get libHSrts*.a etc +# rather than just libHSrts.a when we are making bindists. +binary-dist: _way=* + +include $(TOP)/mk/bindist.mk +