X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FMakefile;h=585958fca37dd925f4843f6c9ae6e2b79f5af828;hb=59fa6266f00b6edcfc20c491c8de9a1b215dfa22;hp=2a20279382a0358c042e5b1c34d496afb4e32d3d;hpb=b808a3175fcfb4fcf0f77ca1ebd5f97eecf7001d;p=ghc-hetmet.git diff --git a/rts/Makefile b/rts/Makefile index 2a20279..585958f 100644 --- a/rts/Makefile +++ b/rts/Makefile @@ -27,8 +27,7 @@ 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 making and installing -# bindists. +# rather than just libHSrts.a when we are installing bindists. ifeq "$(DOING_BIN_DIST)" "YES" _way = * endif @@ -58,7 +57,7 @@ override HADDOCK_DOCS = NO NON_HS_PACKAGE = YES # grab sources from these subdirectories -ALL_DIRS = hooks parallel sm +ALL_DIRS = hooks parallel sm eventlog ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" ALL_DIRS += win32 @@ -95,7 +94,7 @@ EXCLUDED_SRCS += parallel/SysMan.c EXCLUDED_SRCS += dyn-wrapper.c -# compile generatic patchable dyn-wrapper +# compile generic patchable dyn-wrapper DYNWRAPPER_SRC = dyn-wrapper.c DYNWRAPPER_PROG = dyn-wrapper$(exeext) @@ -138,7 +137,8 @@ WARNING_OPTS += -Waggregate-return #WARNING_OPTS += -Wredundant-decls #WARNING_OPTS += -Wconversion -STANDARD_OPTS += -I../includes -I. -Iparallel -Ism +STANDARD_OPTS += -I../includes -I. -Iparallel -Ism -Ieventlog + # COMPILING_RTS is only used when building Win32 DLL support. STANDARD_OPTS += -DCOMPILING_RTS @@ -157,9 +157,14 @@ SRC_CC_OPTS += -DNOSMP SRC_HC_OPTS += -optc-DNOSMP endif -ifeq "$(UseLibFFI)" "YES" -SRC_CC_OPTS += -DUSE_LIBFFI -PACKAGE_CPP_OPTS += -DUSE_LIBFFI +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" @@ -173,7 +178,7 @@ LIB_DEPS=buildbase BASE_DIST_LIB=$(TOP)/libraries/base/dist/build # The following must be a one liner otherwise its evaluation won't be delayed until base/rts packages are properly registered -LIB_LD_OPTS = -L$(shell $(GHC_PKG_INPLACE) field base library-dirs | sed -e 's/library-dirs: //') -l$(shell $(GHC_PKG_INPLACE) field base hs-libraries | sed -e 's/hs-libraries: //')-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 rts library-dirs | sed -e s/library-dirs://),"-L$(libdir)") +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 @@ -194,12 +199,30 @@ 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 @@ -208,9 +231,6 @@ sm/Compact_CC_OPTS += -w win32/ConsoleHandler_CC_OPTS += -w win32/ThrIOManager_CC_OPTS += -w win32/Ticker_CC_OPTS += -w -Threads_CC_OPTS += -w -Capability_CC_OPTS += -w -Schedule_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 @@ -272,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 #----------------------------------------------------------------------------- @@ -285,7 +323,7 @@ SRC_MKDEPENDC_OPTS += -I. -I../includes # a superset of the dependencies. To do this properly, we should generate # a different set of dependencies for each way. Further hack: PROFILING and # TICKY_TICKY can't be used together, so we omit TICKY_TICKY for now. -SRC_MKDEPENDC_OPTS += -DPROFILING -DTHREADED_RTS -DDEBUG +SRC_MKDEPENDC_OPTS += -DPROFILING -DTHREADED_RTS -DDEBUG -DEVENTLOG # ----------------------------------------------------------------------------- # The auto-generated apply code @@ -310,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. @@ -341,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 # @@ -366,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" @@ -382,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 @@ -389,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 @@ -424,6 +473,8 @@ ifeq "$(DYNAMIC_RTS) $(HOSTPLATFORM)" "YES i386-unknown-mingw32" # 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 @@ -431,14 +482,13 @@ 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 +