X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2Fghc.mk;h=dd9851a3f0f6b836f4af63293c183dbd2df30a0b;hp=7276e72bcde96dac65cd3f2f13485bc8610c570c;hb=d108044bef62f6a0d579c92ced5e8188f72edc2d;hpb=fcf0225457abec189ea630163fa56bc48c2d796d diff --git a/rts/ghc.mk b/rts/ghc.mk index 7276e72..dd9851a 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -18,9 +18,10 @@ rts_dist_HC = $(GHC_STAGE1) # merge GhcLibWays and GhcRTSWays but strip out duplicates rts_WAYS = $(GhcLibWays) $(filter-out $(GhcLibWays),$(GhcRTSWays)) +rts_dist_WAYS = $(rts_WAYS) -ALL_RTS_LIBS = $(foreach way,$(rts_WAYS),rts/dist/build/libHSrts$($(way)_libsuf)) \ - rts/dist/build/libHSrtsmain.a +ALL_RTS_LIBS = rts/dist/build/libHSrtsmain.a \ + $(foreach way,$(rts_WAYS),rts/dist/build/libHSrts$($(way)_libsuf)) all_rts : $(ALL_RTS_LIBS) # ----------------------------------------------------------------------------- @@ -36,14 +37,13 @@ endif EXCLUDED_SRCS += rts/Main.c 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) # Don't compile .S files when bootstrapping a new arch -ifeq "$(TARGETPLATFORM)" "$(HOSTPLATFORM)" +ifneq "$(PORTING_HOST)" "YES" ifneq "$(findstring $(TargetArch_CPP), powerpc powerpc64)" "" rts_S_SRCS += rts/AdjustorAsm.S else @@ -69,6 +69,11 @@ rts/dist/build/sm/Scav_thr.c : rts/sm/Scav.c | $$(dir $$@)/. rts_H_FILES = $(wildcard includes/*.h) $(wildcard rts/*.h) +ifeq "$(HaveDtrace)" "YES" +DTRACEPROBES_H = rts/dist/build/RtsProbes.h +rts_H_FILES += $(DTRACEPROBES_H) +endif + # collect the -l flags that we need to link the rts dyn lib. rts/libs.depend : $(GHC_PKG_INPLACE) "$(GHC_PKG_INPLACE)" field rts extra-libraries \ @@ -88,9 +93,7 @@ ALL_RTS_DEF_LIBNAMES = base ghc-prim ALL_RTS_DEF_LIBS = \ rts/dist/build/win32/libHSbase.dll.a \ rts/dist/build/win32/libHSghc-prim.dll.a \ - rts/dist/build/win32/libHSffi.dll.a \ - gmp/libgmp.dll.a - + rts/dist/build/win32/libHSffi.dll.a # -- import libs for the regular Haskell libraries define make-importlib-def # args $1 = lib name @@ -99,7 +102,7 @@ rts/dist/build/win32/libHS$1.def : rts/win32/libHS$1.def | sed "s/@LibVersion@/$$(libraries/$1_dist-install_VERSION)/" \ | sed "s/@ProjectVersion@/$(ProjectVersion)/" \ > rts/dist/build/win32/libHS$1.def - + rts/dist/build/win32/libHS$1.dll.a : rts/dist/build/win32/libHS$1.def "$$(DLLTOOL)" -d rts/dist/build/win32/libHS$1.def \ -l rts/dist/build/win32/libHS$1.dll.a @@ -112,7 +115,7 @@ rts/dist/build/win32/libHSffi.def : rts/win32/libHSffi.def cat rts/win32/libHSffi.def \ | sed "s/@ProjectVersion@/$(ProjectVersion)/" \ > rts/dist/build/win32/libHSffi.def - + rts/dist/build/win32/libHSffi.dll.a : rts/dist/build/win32/libHSffi.def "$(DLLTOOL)" -d rts/dist/build/win32/libHSffi.def \ -l rts/dist/build/win32/libHSffi.dll.a @@ -124,6 +127,8 @@ endif # Building one way define build-rts-way # args: $1 = way +ifneq "$$(BINDIST)" "YES" + # The per-way CC_OPTS ifneq "$$(findstring debug, $1)" "" rts_dist_$1_HC_OPTS = @@ -143,7 +148,8 @@ $(call cmm-suffix-rules,rts,dist,$1) $(call hs-suffix-rules-srcdir,rts,dist,$1,$$(dir)) # hs-suffix-rules-srcdir is needed when BootingFromHc to get the .hc rules -rts_$1_LIB = rts/dist/build/libHSrts$$($1_libsuf) +rts_$1_LIB_NAME = libHSrts$$($1_libsuf) +rts_$1_LIB = rts/dist/build/$$(rts_$1_LIB_NAME) 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)) @@ -155,16 +161,20 @@ rts_dist_$1_CC_OPTS += -DRtsWay=$$(DQ)rts_$1$$(DQ) # Making a shared library for the RTS. ifneq "$$(findstring dyn, $1)" "" -ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" +ifeq "$$(HOSTPLATFORM)" "i386-unknown-mingw32" $$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) rts/libs.depend "$$(RM)" $$(RM_OPTS) $$@ - "$$(rts_dist_HC)" -shared -dynamic -dynload deploy \ + "$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \ -no-auto-link-packages `cat rts/libs.depend` $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) -o $$@ else $$(rts_$1_LIB) : $$(rts_$1_OBJS) rts/libs.depend "$$(RM)" $$(RM_OPTS) $$@ - "$$(rts_dist_HC)" -shared -dynamic -dynload deploy \ + "$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \ -no-auto-link-packages `cat rts/libs.depend` $$(rts_$1_OBJS) -o $$@ +ifeq "$$(darwin_HOST_OS)" "1" + # Ensure library's install name is correct before anyone links with it. + install_name_tool -id $(ghclibdir)/$$(rts_$1_LIB_NAME) $$@ +endif endif else $$(rts_$1_LIB) : $$(rts_$1_OBJS) @@ -172,6 +182,8 @@ $$(rts_$1_LIB) : $$(rts_$1_OBJS) echo $$(rts_$1_OBJS) | "$$(XARGS)" $$(XARGS_OPTS) "$$(AR)" $$(AR_OPTS) $$(EXTRA_AR_ARGS) $$@ endif +endif + endef # And expand the above for each way: @@ -194,7 +206,6 @@ WARNING_OPTS += -Winline WARNING_OPTS += -Waggregate-return WARNING_OPTS += -Wpointer-arith WARNING_OPTS += -Wmissing-noreturn -WARNING_OPTS += -Wcast-align WARNING_OPTS += -Wnested-externs WARNING_OPTS += -Wredundant-decls @@ -204,6 +215,15 @@ WARNING_OPTS += -Wredundant-decls #WARNING_OPTS += -Wshadow #WARNING_OPTS += -Wcast-qual +# This one seems buggy on GCC 4.1.2, which is the only GCC version we +# have that can bootstrap the SPARC build. We end up with lots of supurious +# warnings of the form "cast increases required alignment of target type". +# Some legitimate warnings can be fixed by adding an intermediate cast to +# (void*), but we get others in rts/sm/GCUtils.c concerning the gct var +# that look innocuous to me. We could enable this again once we deprecate +# support for registerised builds on this arch. -- BL 2010/02/03 +# WARNING_OPTS += -Wcast-align + STANDARD_OPTS += -Iincludes -Irts # COMPILING_RTS is only used when building Win32 DLL support. STANDARD_OPTS += -DCOMPILING_RTS @@ -231,11 +251,6 @@ 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. -ifneq "$(findstring $(TargetOS_CPP), darwin openbsd)" "" -rts_HC_OPTS += -optc-fno-stack-protector -endif - # We *want* type-checking of hand-written cmm. rts_HC_OPTS += -dcmm-lint @@ -286,6 +301,45 @@ rts/RtsUtils_CC_OPTS += -DTargetVendor=$(DQ)$(TargetVendor_CPP)$(DQ) rts/RtsUtils_CC_OPTS += -DGhcUnregisterised=$(DQ)$(GhcUnregisterised)$(DQ) rts/RtsUtils_CC_OPTS += -DGhcEnableTablesNextToCode=$(DQ)$(GhcEnableTablesNextToCode)$(DQ) +# Compile various performance-critical pieces *without* -fPIC -dynamic +# even when building a shared library. If we don't do this, then the +# GC runs about 50% slower on x86 due to the overheads of PIC. The +# cost of doing this is a little runtime linking and less sharing, but +# not much. +# +# On x86_64 this doesn't work, because all objects in a shared library +# must be compiled with -fPIC (since the 32-bit relocations generated +# by the default small memory can't be resolved at runtime). So we +# only do this on i386. +# +# This apparently doesn't work on OS X (Darwin) where we get errors of +# the form +# +# ld: absolute addressing (perhaps -mdynamic-no-pic) used in _stg_ap_0_fast from rts/dist/build/Apply.dyn_o not allowed in slidable image +# +# and lots of these warnings: +# +# ld: warning codegen in _stg_ap_pppv_fast (offset 0x0000005E) prevents image from loading in dyld shared cache +# +ifeq "$(TargetArch_CPP)" "i386" +ifneq "$(TargetOS_CPP)" "darwin" +rts/sm/Evac_HC_OPTS += -fno-PIC +rts/sm/Evac_thr_HC_OPTS += -fno-PIC +rts/sm/Scav_HC_OPTS += -fno-PIC +rts/sm/Scav_thr_HC_OPTS += -fno-PIC +rts/sm/Compact_HC_OPTS += -fno-PIC +rts/sm/GC_HC_OPTS += -fno-PIC + +# -static is also necessary for these bits, otherwise the NCG +# -generates dynamic references: +rts/Updates_HC_OPTS += -fno-PIC -static +rts/StgMiscClosures_HC_OPTS += -fno-PIC -static +rts/PrimOps_HC_OPTS += -fno-PIC -static +rts/Apply_HC_OPTS += -fno-PIC -static +rts/dist/build/AutoApply_HC_OPTS += -fno-PIC -static +endif +endif + # ffi.h triggers prototype warnings, so disable them here: rts/Interpreter_CC_OPTS += -Wno-strict-prototypes rts/Adjustor_CC_OPTS += -Wno-strict-prototypes @@ -302,7 +356,6 @@ rts/RetainerSet_CC_OPTS += -Wno-format # On Windows: rts/win32/ConsoleHandler_CC_OPTS += -w rts/win32/ThrIOManager_CC_OPTS += -w -rts/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 @@ -318,8 +371,8 @@ rts/dist/build/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. -rts/dist/build/sm/Evac_thr_HC_OPTS += -optc-DPARALLEL_GC -Irts/sm -rts/dist/build/sm/Scav_thr_HC_OPTS += -optc-DPARALLEL_GC -Irts/sm +rts/dist/build/sm/Evac_thr_CC_OPTS += -DPARALLEL_GC -Irts/sm +rts/dist/build/sm/Scav_thr_CC_OPTS += -DPARALLEL_GC -Irts/sm #----------------------------------------------------------------------------- # Add PAPI library if needed @@ -351,23 +404,29 @@ 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_MKDEPENDC_OPTS += -Irts/sm - rts_WAYS_DASHED = $(subst $(space),,$(patsubst %,-%,$(strip $(rts_WAYS)))) -rts_dist_depfile = rts/dist/build/.depend$(rts_WAYS_DASHED) +rts_dist_depfile_base = rts/dist/build/.depend$(rts_WAYS_DASHED) rts_dist_C_SRCS = $(rts_C_SRCS) $(rts_thr_EXTRA_C_SRCS) rts_dist_S_SRCS = $(rts_S_SRCS) rts_dist_C_FILES = $(rts_C_SRCS) $(rts_thr_EXTRA_C_SRCS) $(rts_S_SRCS) -$(eval $(call build-dependencies,rts,dist)) +# 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 an + +# TICKY_TICKY can't be used together, so we omit TICKY_TICKY for now. +rts_dist_MKDEPENDC_OPTS += -DPROFILING -DTHREADED_RTS -DDEBUG + +ifeq "$(HaveDtrace)" "YES" -$(rts_dist_depfile) : libffi/dist-install/build/ffi.h +rts_dist_MKDEPENDC_OPTS += -Irts/dist/build + +endif + +$(eval $(call build-dependencies,rts,dist,1)) + +$(rts_dist_depfile_c_asm) : libffi/dist-install/build/ffi.h $(DTRACEPROBES_H) #----------------------------------------------------------------------------- # libffi stuff @@ -378,18 +437,27 @@ rts_HSC2HS_OPTS += -Ilibffi/build/include rts_LD_OPTS += -Llibffi/build/include # ----------------------------------------------------------------------------- -# compile generic patchable dyn-wrapper +# compile dtrace probes if dtrace is supported + +ifeq "$(HaveDtrace)" "YES" -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 $@ +rts_CC_OPTS += -DDTRACE +rts_HC_OPTS += -DDTRACE + +DTRACEPROBES_SRC = rts/RtsProbes.d +$(DTRACEPROBES_H): $(DTRACEPROBES_SRC) | $(dir $@)/. + "$(DTRACE)" $(filter -I%,$(rts_CC_OPTS)) -C -h -o $@ -s $< + +endif # ----------------------------------------------------------------------------- # build the static lib containing the C main symbol +ifneq "$(BINDIST)" "YES" rts/dist/build/libHSrtsmain.a : rts/dist/build/Main.o + "$(RM)" $(RM_OPTS) $@ "$(AR)" $(AR_OPTS) $(EXTRA_AR_ARGS) $@ $< +endif # ----------------------------------------------------------------------------- # The RTS package config @@ -412,13 +480,7 @@ endif # ----------------------------------------------------------------------------- # installing -install : install_rts - -.PHONY: install_rts -install_rts: - $(INSTALL_DIR) "$(DESTDIR)$(ghclibdir)" - $(INSTALL_DIR) "$(DESTDIR)$(ghclibdir)/include" - "$(CP)" $(ALL_RTS_LIBS) "$(DESTDIR)$(ghclibdir)" +INSTALL_LIBS += $(ALL_RTS_LIBS) # ----------------------------------------------------------------------------- # cleaning