diff options
Diffstat (limited to 'rts')
| -rw-r--r-- | rts/Capability.h | 2 | ||||
| -rw-r--r-- | rts/Interpreter.c | 2 | ||||
| -rw-r--r-- | rts/Makefile | 499 | ||||
| -rw-r--r-- | rts/ghc.mk | 393 | ||||
| -rw-r--r-- | rts/package.conf.in | 10 |
5 files changed, 403 insertions, 503 deletions
diff --git a/rts/Capability.h b/rts/Capability.h index 0f61fad913..d2fcc5ed7b 100644 --- a/rts/Capability.h +++ b/rts/Capability.h @@ -148,7 +148,7 @@ struct Capability_ { INLINE_HEADER Capability * regTableToCapability (StgRegTable *reg) { - return (Capability *)((void *)((unsigned char*)reg - FIELD_OFFSET(Capability,r))); + return (Capability *)((void *)((unsigned char*)reg - STG_FIELD_OFFSET(Capability,r))); } // Initialise the available capabilities. diff --git a/rts/Interpreter.c b/rts/Interpreter.c index 1a6e9273e0..3a99d42139 100644 --- a/rts/Interpreter.c +++ b/rts/Interpreter.c @@ -1425,7 +1425,7 @@ run_BCO: ffi_call(cif, fn, ret, argptrs); // And restart the thread again, popping the RET_DYN frame. - cap = (Capability *)((void *)((unsigned char*)resumeThread(tok) - FIELD_OFFSET(Capability,r))); + cap = (Capability *)((void *)((unsigned char*)resumeThread(tok) - STG_FIELD_OFFSET(Capability,r))); LOAD_STACK_POINTERS; // Re-load the pointer to the BCO from the RET_DYN frame, diff --git a/rts/Makefile b/rts/Makefile index bda4bc7afe..0497a74442 100644 --- a/rts/Makefile +++ b/rts/Makefile @@ -1,497 +1,4 @@ -#----------------------------------------------------------------------------- -# -# This is the Makefile for the runtime-system stuff. -# This stuff is written in C (and cannot be written in Haskell). -# -# .c files are vanilla C, -# .hc files are "Haskellized-C", compiled using the C compiler and -# (possibly) the assembly-mangler. The GHC driver script -# knows how to compile this stuff. - -#----------------------------------------------------------------------------- -# Preamble - -TOP=.. - -# Set UseGhcForCc: this causes the fptools build system to use a different -# set of suffix rules for compiling C code, using $(HC) rather than $(CC) -# and prepending "-optc" to $(CC_OPTS). NB. must be done before including -# boilerplate.mk below. -UseGhcForCc = YES - -include $(TOP)/mk/boilerplate.mk - -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=$(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) -NON_HS_PACKAGE = YES - -# grab sources from these subdirectories -ALL_DIRS = hooks parallel sm eventlog - -ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" -ALL_DIRS += win32 -else -ALL_DIRS += posix -endif - -ifneq "$(findstring dyn, $(way))" "" -DYNAMIC_RTS=YES -else -DYNAMIC_RTS=NO -endif - -ifeq "$(DYNAMIC_RTS) $(HOSTPLATFORM)" "YES i386-unknown-mingw32" -EXCLUDED_SRCS += Main.c -# It's not included in the DLL, but we need to compile it up separately. - -all :: Main.$(way_)o -INSTALL_LIBS += Main.$(way_)o -else -EXCLUDED_SRCS += RtsDllMain.c -endif - -# This file ends up being empty unless we're building for a powerpc -# or darwin system, and it is reported that Solaris ld chokes on it when -# building HSrts.o. -ifeq "$(findstring $(TargetArch_CPP), powerpc powerpc64)" "" -ifeq "$(findstring $(TargetOS_CPP), darwin)" "" -EXCLUDED_SRCS += AdjustorAsm.S -endif -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)) - -CLEAN_FILES += $(CMM_OBJS) - -# Override the default $(LIBOBJS) (defaults to $(HS_OBJS)) -LIBOBJS = $(C_OBJS) $(CMM_OBJS) - -SplitObjs=NO - -H_FILES = $(wildcard ../includes/*.h) $(wildcard *.h) - -#----------------------------------------------------------------------------- -# Flags for compiling RTS .c and .hc files - -# gcc provides lots of useful warnings if you ask it. -# This is a pretty good list to start with - use a # to comment out -# any you don't like. -WARNING_OPTS += -Wall -WARNING_OPTS += -W -WARNING_OPTS += -Wstrict-prototypes -WARNING_OPTS += -Wmissing-prototypes -WARNING_OPTS += -Wmissing-declarations -WARNING_OPTS += -Winline -WARNING_OPTS += -Waggregate-return -#WARNING_OPTS += -Wpointer-arith -#WARNING_OPTS += -Wbad-function-cast -#WARNING_OPTS += -Wcast-align -#WARNING_OPTS += -Wnested-externs -#WARNING_OPTS += -Wshadow -#WARNING_OPTS += -Wcast-qual -#WARNING_OPTS += -Wno-unused -#WARNING_OPTS += -Wredundant-decls -#WARNING_OPTS += -Wconversion - -STANDARD_OPTS += -I../includes -I. -Iparallel -Ism -Ieventlog - -# COMPILING_RTS is only used when building Win32 DLL support. -STANDARD_OPTS += -DCOMPILING_RTS - -# HC_OPTS is included in both .c and .cmm compilations, whereas CC_OPTS is -# only included in .c compilations. HC_OPTS included the WAY_* opts, which -# must be included in both types of compilations. - -SRC_CC_OPTS += $(WARNING_OPTS) -SRC_CC_OPTS += $(STANDARD_OPTS) - -SRC_CC_OPTS += $(GhcRtsCcOpts) -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" -LIB_DEPS=buildbase -.PHONY: 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 = $(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 - -# 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 -endif - -# If -DDEBUG is in effect, adjust package conf accordingly.. -ifneq "$(strip $(filter -optc-DDEBUG,$(GhcRtsHcOpts)))" "" -PACKAGE_CPP_OPTS += -DDEBUG -endif - -ifeq "$(HaveLibMingwEx)" "YES" -PACKAGE_CPP_OPTS += -DHAVE_LIBMINGWEX -endif - -ifeq "$(GhciWithDebugger)" "YES" -STANDARD_OPTS += -DDEBUGGER -endif - -ifeq "$(DotnetSupport)" "YES" - -# -# Would like to just use SUBDIRS here, but need to -# descend into dotnet/ earlier than that. -# -all :: - $(MAKE) -C dotnet all - -# But use SUBDIRS for other recursive targets. -SUBDIRS += dotnet - -LIBOBJS += dotnet/Invoke.o -endif - -# Suppress uninitialized variable warnings for GC.c -GC_CC_OPTS += -Wno-uninitialized - -#----------------------------------------------------------------------------- -# Include the Front panel code? - -# we need GTK+ for the front panel -ifneq "$(GTK_CONFIG)" "" -ifeq "$(GhcRtsWithFrontPanel)" "YES" -SRC_HC_OPTS += `$(GTK_CONFIG) --cflags` -optc-DRTS_GTK_FRONTPANEL -VisCallbacks_CC_OPTS += -Wno-unused -SRC_MKDEPENDC_OPTS += `$(GTK_CONFIG) --cflags` -else # GhcRtsWithFrontPanel -EXCLUDED_SRCS += $(wildcard Vis*.c) -endif -else # GTK_CONFIG -EXCLUDED_SRCS += $(wildcard Vis*.c) -endif - -#----------------------------------------------------------------------------- -# Add PAPI library if needed - -ifeq "$(GhcRtsWithPapi)" "YES" - -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_INCLUDE_DIR="" -PACKAGE_CPP_OPTS += -DPAPI_LIB_DIR="" - -endif - -#----------------------------------------------------------------------------- -# make depend setup - -SRC_MKDEPENDC_OPTS += -I. -I../includes - -# Hack: we define every way-related option here, so that we get (hopefully) -# 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 -DEVENTLOG - -# ----------------------------------------------------------------------------- -# The auto-generated apply code - -# We want a slightly different version for the unregisterised way, so we make -# AutoApply on a per-way basis (eg. AutoApply_p.cmm). - -ifneq "$(DOING_BIN_DIST)" "YES" - -AUTO_APPLY_CMM = AutoApply$(_way).cmm - -ifneq "$(BootingFromHc)" "YES" -$(AUTO_APPLY_CMM): $(GHC_GENAPPLY) - @$(RM) $@ - $(GENAPPLY) $(if $(filter $(way), u debug_u), -u) >$@ -endif - -EXTRA_CMM_SRCS += $(AUTO_APPLY_CMM) - -CLEAN_FILES += $(AUTO_APPLY_CMM) - -endif - -# ----------------------------------------------------------------------------- - -# Need to get the GMP vars in through CPP to package.conf.in, and put -# quotes around each element. - -empty = -space = $(empty) $(empty) -comma = , -PACKAGE_CPP_OPTS += -DGMP_INCLUDE_DIRS='$(subst $(space),$(comma),$(patsubst %,"%",$(strip $(GMP_INCLUDE_DIRS))))' -PACKAGE_CPP_OPTS += -DGMP_LIB_DIRS='$(subst $(space),$(comma),$(patsubst %,"%",$(strip $(GMP_LIB_DIRS))))' - -ifneq "$(GMP_INCLUDE_DIRS)" "" -SRC_HC_OPTS += -I$(GMP_INCLUDE_DIRS) -SRC_CC_OPTS += -I$(GMP_INCLUDE_DIRS) -SRC_HSC2HS_OPTS += -I$(GMP_INCLUDE_DIRS) -endif -ifneq "$(GMP_LIB_DIRS)" "" -SRC_LD_OPTS += -L$(GMP_LIB_DIRS) -endif - -SRC_CC_OPTS += -I../gmp/gmpbuild -SRC_HC_OPTS += -I../gmp/gmpbuild -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 -# - -ifeq "$(way)" "mp" -all :: parallel/SysMan - -ifdef solaris2_TARGET_OS -__socket_libs = -lsocket -lnsl -else -__socket_libs = -endif - -parallel/SysMan : parallel/SysMan.mp_o parallel/LLComms.mp_o RtsUtils.mp_o RtsFlags.mp_o - $(RM) $@ - gcc -o $@ parallel/SysMan.mp_o parallel/LLComms.mp_o -L$$PVM_ROOT/lib/$$PVM_ARCH -lgpvm3 -lpvm3 $(__socket_libs) - -CLEAN_FILES += parallel/SysMan.mp_o parallel/SysMan -INSTALL_LIBEXECS += parallel/SysMan -endif - -#----------------------------------------------------------------------------- -# Compiling the cmm files - -# ToDo: should we really include Rts.h here? Required for GNU_ATTRIBUTE(). -SRC_HC_OPTS += -I. - -# Otherwise the stack-smash handler gets triggered. -ifeq "$(TargetOS_CPP)" "openbsd" -SRC_HC_OPTS += -optc-fno-stack-protector -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 - -sm/Evac_thr_HC_OPTS += -optc-funroll-loops -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 - -# -fno-strict-aliasing is required for the runtime, because we often -# 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 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 - -# We *want* type-checking of hand-written cmm. -SRC_HC_OPTS += -dcmm-lint - -ifneq "$(BootingFromHc)" "YES" -# .cmm files depend on all the .h files, to a first approximation. -%.$(way_)o : %.cmm $(H_FILES) - $(HC_PRE_OPTS) - $(HC) $(HC_OPTS) -c $< -o $@ - $(HC_POST_OPTS) - -%.$(way_)hc : %.cmm $(H_FILES) - $(HC) $(HC_OPTS) -C $< -o $@ - -%.$(way_)s : %.cmm $(H_FILES) - $(HC) $(HC_OPTS) -S $< -o $@ -endif - -#----------------------------------------------------------------------------- -# -# Files to install -# -# Just libHSrts is installed uniformly across ways -# - -include $(TOP)/mk/target.mk - -ifeq "$(DYNAMIC_RTS) $(HOSTPLATFORM)" "YES i386-unknown-mingw32" -# $(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 - -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 +dir = rts +TOP = .. +include $(TOP)/mk/sub-makefile.mk diff --git a/rts/ghc.mk b/rts/ghc.mk new file mode 100644 index 0000000000..e684f62c28 --- /dev/null +++ b/rts/ghc.mk @@ -0,0 +1,393 @@ +# ----------------------------------------------------------------------------- +# Building the RTS + +# We build the RTS with stage 1 +rts_dist_HC = $(GHC_STAGE1) + +rts_WAYS = $(strip $(GhcLibWays) $(GhcRTSWays)) + +ALL_RTS_LIBS = $(foreach way,$(rts_WAYS),rts/dist/build/libHSrts$($(way)__way).a) +all_rts : $(ALL_RTS_LIBS) + +# The per-dir options +$(eval $(call distdir-opts,rts,dist)) + +# ----------------------------------------------------------------------------- +# Defining the sources + +ALL_DIRS = hooks parallel sm + +ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" +ALL_DIRS += win32 +else +ALL_DIRS += posix +endif + +EXCLUDED_SRCS += rts/parallel/SysMan.c +EXCLUDED_SRCS += rts/dyn-wrapper.c +EXCLUDED_SRCS += $(wildcard rts/Vis*.c) + +rts_C_SRCS = $(filter-out $(EXCLUDED_SRCS),$(wildcard rts/*.c $(foreach dir,$(ALL_DIRS),rts/$(dir)/*.c))) +rts_CMM_SRCS = $(wildcard rts/*.cmm) + +ifneq "$(findstring $(TargetArch_CPP), powerpc powerpc64)" "" +rts_S_SRCS += rts/AdjustorAsm.S +else +ifneq "$(findstring $(TargetOS_CPP), darwin)" "" +rts_S_SRCS += rts/AdjustorAsm.S +endif +endif + +ifeq "$(GhcUnregisterised)" "YES" +GENAPPLY_OPTS = -u +endif + +rts_AUTO_APPLY_CMM = rts/dist/build/AutoApply.cmm + +$(rts_AUTO_APPLY_CMM): $(GENAPPLY_INPLACE) + $(RM) $@ + $(GENAPPLY_INPLACE) >$@ + +rts/dist/build/sm/Evac_thr.c : rts/sm/Evac.c + $(MKDIRHIER) $(dir $@) + cp $< $@ +rts/dist/build/sm/Scav_thr.c : rts/sm/Scav.c + $(MKDIRHIER) $(dir $@) + cp $< $@ + +rts_H_FILES = $(wildcard $(GHC_INCLUDE_DIR)/*.h) $(wildcard rts/*.h) + +#----------------------------------------------------------------------------- +# Building one way + +define cmm-suffix-rules +# $1 = dir +# $2 = distdir +# $3 = way + +# .cmm files depend on all the .h files, to a first approximation. + +$1/$2/build/%.$$($3_way_)o : $1/%.cmm $$(rts_H_FILES) $$($1_$2_HC) + $$($1_$2_HC) $$($1_$2_$3_MOST_HC_OPTS) -c $$< -o $$@ + +$1/$2/build/%.$$($3_way_)o : $1/$2/build/%.cmm $$(rts_H_FILES) $$($1_$2_HC) + $$($1_$2_HC) $$($1_$2_$3_MOST_HC_OPTS) -c $$< -o $$@ + +$1/$2/build/%.$$($3_way_)hc : $1/%.cmm $$(rts_H_FILES) $$($1_$2_HC) + $$($1_$2_HC) $$($1_$2_$3_MOST_HC_OPTS) -c $$< -o $$@ + +$1/$2/build/%.$$($3_way_)hc : $1/$2/build/%.cmm $$(rts_H_FILES) $$($1_$2_HC) + $$($1_$2_HC) $$($1_$2_$3_MOST_HC_OPTS) -c $$< -o $$@ + +$1/$2/build/%.$$($3_way_)s : $1/%.cmm $$(rts_H_FILES) $$($1_$2_HC) + $$($1_$2_HC) $$($1_$2_$3_MOST_HC_OPTS) -c $$< -o $$@ + +$1/$2/build/%.$$($3_way_)s : $1/$2/build/%.cmm $$(rts_H_FILES) $$($1_$2_HC) + $$($1_$2_HC) $$($1_$2_$3_MOST_HC_OPTS) -c $$< -o $$@ + +endef + + +define build-rts-way # args: $1 = way + +# The per-way CC_OPTS +ifneq "$$(findstring debug, $1)" "" +rts_dist_$1_HC_OPTS = +rts_dist_$1_CC_OPTS = -g -O0 +else +rts_dist_$1_HC_OPTS = $(GhcRtsHcOpts) +rts_dist_$1_CC_OPTS = $(GhcRtsCcOpts) +endif + +ifneq "$$(findstring thr, $1)" "" +rts_$1_EXTRA_C_SRCS = rts/dist/build/sm/Evac_thr.c rts/dist/build/sm/Scav_thr.c +endif + +$(call distdir-way-opts,rts,dist,$1) +$(call c-suffix-rules,rts,dist,$1,YES) +$(call cmm-suffix-rules,rts,dist,$1) + +rts_$1_LIB = rts/dist/build/libHSrts$$($1__way).a + +rts_$1_C_OBJS = $$(patsubst rts/%.c,rts/dist/build/%.$$($1_osuf),$$(rts_C_SRCS)) $$(patsubst %.c,%.$$($1_osuf),$$(rts_$1_EXTRA_C_SRCS)) +rts_$1_S_OBJS = $$(patsubst rts/%.S,rts/dist/build/%.$$($1_osuf),$$(rts_S_SRCS)) +rts_$1_CMM_OBJS = $$(patsubst rts/%.cmm,rts/dist/build/%.$$($1_osuf),$$(rts_CMM_SRCS)) $$(patsubst %.cmm,%.$$($1_osuf),$(rts_AUTO_APPLY_CMM)) + +rts_$1_OBJS = $$(rts_$1_C_OBJS) $$(rts_$1_S_OBJS) $$(rts_$1_CMM_OBJS) + +$$(rts_$1_LIB) : $$(rts_$1_OBJS) + $$(RM) $$@ + echo $$(rts_$1_OBJS) | xargs $$(AR) $$(EXTRA_AR_ARGS) $$@ + +endef + +# And expand the above for each way: +$(foreach way,$(rts_WAYS),$(eval $(call build-rts-way,$(way)))) + +#----------------------------------------------------------------------------- +# Flags for compiling every file + +# gcc provides lots of useful warnings if you ask it. +# This is a pretty good list to start with - use a # to comment out +# any you don't like. +WARNING_OPTS += -Wall +WARNING_OPTS += -W +WARNING_OPTS += -Wstrict-prototypes +WARNING_OPTS += -Wmissing-prototypes +WARNING_OPTS += -Wmissing-declarations +WARNING_OPTS += -Winline +WARNING_OPTS += -Waggregate-return +#WARNING_OPTS += -Wpointer-arith +#WARNING_OPTS += -Wbad-function-cast +#WARNING_OPTS += -Wcast-align +#WARNING_OPTS += -Wnested-externs +#WARNING_OPTS += -Wshadow +#WARNING_OPTS += -Wcast-qual +#WARNING_OPTS += -Wno-unused +#WARNING_OPTS += -Wredundant-decls +#WARNING_OPTS += -Wconversion + +STANDARD_OPTS += -I$(GHC_INCLUDE_DIR) -I$(GHC_RTS_DIR) -Irts/parallel -Irts/sm -Irts/eventlog +# COMPILING_RTS is only used when building Win32 DLL support. +STANDARD_OPTS += -DCOMPILING_RTS + +# HC_OPTS is included in both .c and .cmm compilations, whereas CC_OPTS is +# only included in .c compilations. HC_OPTS included the WAY_* opts, which +# must be included in both types of compilations. + +rts_CC_OPTS += $(WARNING_OPTS) +rts_CC_OPTS += $(STANDARD_OPTS) + +rts_HC_OPTS += $(STANDARD_OPTS) -package-name rts + +ifneq "$(GhcWithSMP)" "YES" +rts_CC_OPTS += -DNOSMP +rts_HC_OPTS += -optc-DNOSMP +endif + +ifeq "$(UseLibFFIForAdjustors)" "YES" +rts_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: +rts_HC_OPTS += -fvia-C +endif + +ifneq "$(DYNAMIC_RTS)" "YES" +rts_HC_OPTS += -static +else +$(error ToDo: DYNAMIC_RTS) +endif + +# Mac OS X: make sure we compile for the right OS version +rts_CC_OPTS += $(MACOSX_DEPLOYMENT_CC_OPTS) +rts_HC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS)) +rts_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS)) + +# Otherwise the stack-smash handler gets triggered. +ifeq "$(TargetOS_CPP)" "openbsd" +rts_HC_OPTS += -optc-fno-stack-protector +endif + +# We *want* type-checking of hand-written cmm. +rts_HC_OPTS += -dcmm-lint + +# -fno-strict-aliasing is required for the runtime, because we often +# 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 sm/Evac.c:copy() with gcc 3.4.3, the +# upd_evacee() assigments get moved before the object copy. +rts_CC_OPTS += -fno-strict-aliasing + +ifeq "$(BeConservative)" "YES" +rts_CC_OPTS += -DBE_CONSERVATIVE +endif + +#----------------------------------------------------------------------------- +# Flags for compiling specific files + +# 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 + +# Without this, thread_obj will not be inlined (at least on x86 with GCC 4.1.0) +sm/Compact_CC_OPTS += -finline-limit=2500 + +# -O3 helps unroll some loops (especially in copy() with a constant argument). +sm/Evac_CC_OPTS += -funroll-loops +sm/Evac_thr_HC_OPTS += -optc-funroll-loops + +# These files are just copies of sm/Evac.c and sm/Scav.c respectively, +# but compiled with -DPARALLEL_GC. +sm/Evac_thr_HC_OPTS += -optc-DPARALLEL_GC +sm/Scav_thr_HC_OPTS += -optc-DPARALLEL_GC + +#----------------------------------------------------------------------------- +# Add PAPI library if needed + +ifeq "$(GhcRtsWithPapi)" "YES" + +rts_CC_OPTS += -DUSE_PAPI + +rts_PACKAGE_CPP_OPTS += -DUSE_PAPI +rts_PACKAGE_CPP_OPTS += -DPAPI_INCLUDE_DIR=$(PapiIncludeDir) +rts_PACKAGE_CPP_OPTS += -DPAPI_LIB_DIR=$(PapiLibDir) + +ifneq "$(PapiIncludeDir)" "" +rts_HC_OPTS += -I$(PapiIncludeDir) +rts_CC_OPTS += -I$(PapiIncludeDir) +rts_HSC2HS_OPTS += -I$(PapiIncludeDir) +endif +ifneq "$(PapiLibDirs)" "" +rts_LD_OPTS += -L$(PapiLibDirs) +endif + +else # GhcRtsWithPapi==YES + +rts_PACKAGE_CPP_OPTS += -DPAPI_INCLUDE_DIR="" +rts_PACKAGE_CPP_OPTS += -DPAPI_LIB_DIR="" + +endif + +# ----------------------------------------------------------------------------- +# dependencies + +# Hack: we define every way-related option here, so that we get (hopefully) +# 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. +rts_MKDEPENDC_OPTS += -DPROFILING -DTHREADED_RTS -DDEBUG + +rts_WAYS_DASHED = $(subst $(space),,$(patsubst %,-%,$(strip $(rts_WAYS)))) +rts_dist_depfile = rts/dist/build/.depend$(rts_WAYS_DASHED) + +rts_dist_C_SRCS = $(rts_C_SRCS) +rts_dist_S_SRCS = $(rts_S_SRCS) +rts_dist_C_FILES = $(rts_C_SRCS) $(rts_S_SRCS) + +$(eval $(call build-dependencies,rts,dist)) + +$(rts_dist_depfile) : libffi/ffi.h + +# ----------------------------------------------------------------------------- + +# Need to get the GMP vars in through CPP to package.conf.in, and put +# quotes around each element. + +rts_PACKAGE_CPP_OPTS += -DGMP_INCLUDE_DIRS='$(subst $(space),$(comma),$(patsubst %,"%",$(strip $(GMP_INCLUDE_DIRS))))' +rts_PACKAGE_CPP_OPTS += -DGMP_LIB_DIRS='$(subst $(space),$(comma),$(patsubst %,"%",$(strip $(GMP_LIB_DIRS))))' + +ifneq "$(GMP_INCLUDE_DIRS)" "" +rts_HC_OPTS += -I$(GMP_INCLUDE_DIRS) +rts_CC_OPTS += -I$(GMP_INCLUDE_DIRS) +rts_HSC2HS_OPTS += -I$(GMP_INCLUDE_DIRS) +endif +ifneq "$(GMP_LIB_DIRS)" "" +rts_LD_OPTS += -L$(GMP_LIB_DIRS) +endif + +rts_CC_OPTS += -Igmp/gmpbuild +rts_HC_OPTS += -Igmp/gmpbuild +rts_HSC2HS_OPTS += -Igmp/gmpbuild +rts_LD_OPTS += -Lgmp/gmpbuild + +#----------------------------------------------------------------------------- +# libffi stuff + +rts_CC_OPTS += -Ilibffi/build/include +rts_HC_OPTS += -Ilibffi/build/include +rts_HSC2HS_OPTS += -Ilibffi/build/include +rts_LD_OPTS += -Llibffi/build/include + +# ----------------------------------------------------------------------------- +# compile generic patchable dyn-wrapper + +DYNWRAPPER_SRC = rts/dyn-wrapper.c +DYNWRAPPER_PROG = rts/dyn-wrapper$(exeext) +$(DYNWRAPPER_PROG): $(DYNWRAPPER_SRC) + $(HC) -cpp -optc-include -optcdyn-wrapper-patchable-behaviour.h $(INPLACE_EXTRA_FLAGS) $< -o $@ + +# ----------------------------------------------------------------------------- +# The RTS package config + +# If -DDEBUG is in effect, adjust package conf accordingly.. +ifneq "$(strip $(filter -optc-DDEBUG,$(GhcRtsHcOpts)))" "" +rts_PACKAGE_CPP_OPTS += -DDEBUG +endif + +ifeq "$(HaveLibMingwEx)" "YES" +rts_PACKAGE_CPP_OPTS += -DHAVE_LIBMINGWEX +endif + +$(eval $(call manual-package-config,rts)) + +rts/package.conf.inplace : $(includes_H_CONFIG) $(includes_H_PLATFORM) + +# ----------------------------------------------------------------------------- +# installing + +install : install_rts + +.PHONY: install_rts +install_rts: + $(MKDIRHIER) $(DESTDIR)$(libdir) + $(MKDIRHIER) $(DESTDIR)$(libdir)/include + $(CP) $(ALL_RTS_LIBS) $(DESTDIR)$(libdir) + +# ----------------------------------------------------------------------------- +# cleaning + +$(eval $(call clean-target,rts,dist,rts/dist)) + +BINDIST_EXTRAS += rts/package.conf.in +BINDIST_EXTRAS += $(ALL_RTS_LIBS) + diff --git a/rts/package.conf.in b/rts/package.conf.in index 490222fdb9..54f3b27543 100644 --- a/rts/package.conf.in +++ b/rts/package.conf.in @@ -3,7 +3,7 @@ #include "ghcconfig.h" #include "RtsConfig.h" -name: PACKAGE +name: rts version: 1.0 license: BSD3 maintainer: glasgow-haskell-users@haskell.org @@ -21,9 +21,9 @@ library-dirs: LIB_DIR GMP_LIB_DIRS PAPI_LIB_DIR /* force the dist-provided gcc-lib/ into scope. */ # endif #else /* !INSTALLING */ -library-dirs: FPTOOLS_TOP_ABS"/rts" GMP_LIB_DIRS PAPI_LIB_DIR +library-dirs: TOP"/rts/dist/build" GMP_LIB_DIRS PAPI_LIB_DIR # if !defined(HAVE_LIB_GMP) && !defined(HAVE_FRAMEWORK_GMP) - , FPTOOLS_TOP_ABS"/gmp" + , TOP"/gmp" # endif #endif @@ -60,9 +60,9 @@ extra-libraries: "m" /* for ldexp() */ #ifdef INSTALLING include-dirs: INCLUDE_DIR GMP_INCLUDE_DIRS PAPI_INCLUDE_DIR #else /* !INSTALLING */ -include-dirs: FPTOOLS_TOP_ABS"/includes" +include-dirs: TOP"/includes" # if !defined(HAVE_LIB_GMP) && !defined(HAVE_FRAMEWORK_GMP) - FPTOOLS_TOP_ABS"/gmp/gmpbuild" + TOP"/gmp/gmpbuild" # endif GMP_INCLUDE_DIRS #endif |