X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2Fghc.mk;h=53bb72c0afd18fa6cdbb5dcf71e5d9fe304650f6;hp=e71473d4e2916c2dd8c9d73ec9828a26ec5432ea;hb=cf5905ea24904cf73a041fd7535e8723a668cb9a;hpb=f999a6a2fc2954701d1f84684546c97312a9674c diff --git a/rts/ghc.mk b/rts/ghc.mk index e71473d..53bb72c 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -35,16 +35,16 @@ else ALL_DIRS += posix endif +EXCLUDED_SRCS := 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) +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 @@ -68,9 +68,9 @@ rts/dist/build/sm/Evac_thr.c : rts/sm/Evac.c | $$(dir $$@)/. rts/dist/build/sm/Scav_thr.c : rts/sm/Scav.c | $$(dir $$@)/. cp $< $@ -rts_H_FILES = $(wildcard includes/*.h) $(wildcard rts/*.h) +rts_H_FILES := $(wildcard rts/*.h) -ifeq "$(HaveDtrace)" "YES" +ifeq "$(USE_DTRACE)" "YES" DTRACEPROBES_H = rts/dist/build/RtsProbes.h rts_H_FILES += $(DTRACEPROBES_H) endif @@ -146,7 +146,7 @@ endif $(call distdir-way-opts,rts,dist,$1) $(call c-suffix-rules,rts,dist,$1,YES) $(call cmm-suffix-rules,rts,dist,$1) -$(call hs-suffix-rules-srcdir,rts,dist,$1,$$(dir)) +$(call hs-suffix-rules-srcdir,rts,dist,$1,.) # hs-suffix-rules-srcdir is needed when BootingFromHc to get the .hc rules rts_$1_LIB_NAME = libHSrts$$($1_libsuf) @@ -158,29 +158,44 @@ rts_$1_CMM_OBJS = $$(patsubst rts/%.cmm,rts/dist/build/%.$$($1_osuf),$$(rts_CMM_ rts_$1_OBJS = $$(rts_$1_C_OBJS) $$(rts_$1_S_OBJS) $$(rts_$1_CMM_OBJS) -rts_dist_$1_CC_OPTS += -DRtsWay=$$(DQ)rts_$1$$(DQ) +ifeq "$(USE_DTRACE)" "YES" +ifeq "$(TargetOS_CPP)" "solaris2" +# On Darwin we don't need to generate binary containing probes defined +# in DTrace script, but DTrace on Solaris expects generation of binary +# from the DTrace probes definitions +rts_$1_DTRACE_OBJS = rts/dist/build/RtsProbes.$$($1_osuf) + +rts/dist/build/RtsProbes.$$($1_osuf) : $$(rts_$1_OBJS) + $(DTRACE) -G -C -Iincludes -DDTRACE -s rts/RtsProbes.d -o \ + $$@ $$(rts_$1_OBJS) +endif +endif + +rts_dist_$1_CC_OPTS += -DRtsWay=\"rts_$1\" # Making a shared library for the RTS. ifneq "$$(findstring dyn, $1)" "" 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 $$@ -ifeq "$$(darwin_TARGET_OS)" "1" +else +$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) rts/libs.depend + "$$(RM)" $$(RM_OPTS) $$@ + "$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \ + -no-auto-link-packages `cat rts/libs.depend` $$(rts_$1_OBJS) \ + $$(rts_$1_DTRACE_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 -else -$$(rts_$1_LIB) : $$(rts_$1_OBJS) rts/libs.depend - "$$(RM)" $$(RM_OPTS) $$@ - "$$(rts_dist_HC)" -shared -dynamic -dynload deploy \ - -no-auto-link-packages `cat rts/libs.depend` $$(rts_$1_OBJS) -o $$@ endif else -$$(rts_$1_LIB) : $$(rts_$1_OBJS) +$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) "$$(RM)" $$(RM_OPTS) $$@ - echo $$(rts_$1_OBJS) | "$$(XARGS)" $$(XARGS_OPTS) "$$(AR)" $$(AR_OPTS) $$(EXTRA_AR_ARGS) $$@ + echo $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) | "$$(XARGS)" $$(XARGS_OPTS) "$$(AR)" \ + $$(AR_OPTS) $$(EXTRA_AR_ARGS) $$@ endif endif @@ -207,7 +222,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 @@ -217,6 +231,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 @@ -244,11 +267,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 @@ -269,35 +287,90 @@ endif #----------------------------------------------------------------------------- # Flags for compiling specific files -# XXX DQ is now the same on all platforms, so get rid of it -DQ = \" - # If RtsMain.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. rts/RtsMain_HC_OPTS += -optc-O0 -rts/RtsMessages_CC_OPTS += -DProjectVersion=$(DQ)$(ProjectVersion)$(DQ) -rts/RtsUtils_CC_OPTS += -DProjectVersion=$(DQ)$(ProjectVersion)$(DQ) +rts/RtsMessages_CC_OPTS += -DProjectVersion=\"$(ProjectVersion)\" +rts/RtsUtils_CC_OPTS += -DProjectVersion=\"$(ProjectVersion)\" +# +rts/RtsUtils_CC_OPTS += -DHostPlatform=\"$(HOSTPLATFORM)\" +rts/RtsUtils_CC_OPTS += -DHostArch=\"$(HostArch_CPP)\" +rts/RtsUtils_CC_OPTS += -DHostOS=\"$(HostOS_CPP)\" +rts/RtsUtils_CC_OPTS += -DHostVendor=\"$(HostVendor_CPP)\" +# +rts/RtsUtils_CC_OPTS += -DBuildPlatform=\"$(BUILDPLATFORM)\" +rts/RtsUtils_CC_OPTS += -DBuildArch=\"$(BuildArch_CPP)\" +rts/RtsUtils_CC_OPTS += -DBuildOS=\"$(BuildOS_CPP)\" +rts/RtsUtils_CC_OPTS += -DBuildVendor=\"$(BuildVendor_CPP)\" +# +rts/RtsUtils_CC_OPTS += -DTargetPlatform=\"$(TARGETPLATFORM)\" +rts/RtsUtils_CC_OPTS += -DTargetArch=\"$(TargetArch_CPP)\" +rts/RtsUtils_CC_OPTS += -DTargetOS=\"$(TargetOS_CPP)\" +rts/RtsUtils_CC_OPTS += -DTargetVendor=\"$(TargetVendor_CPP)\" +# +rts/RtsUtils_CC_OPTS += -DGhcUnregisterised=\"$(GhcUnregisterised)\" +rts/RtsUtils_CC_OPTS += -DGhcEnableTablesNextToCode=\"$(GhcEnableTablesNextToCode)\" + +# 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. # -rts/RtsUtils_CC_OPTS += -DHostPlatform=$(DQ)$(HOSTPLATFORM)$(DQ) -rts/RtsUtils_CC_OPTS += -DHostArch=$(DQ)$(HostArch_CPP)$(DQ) -rts/RtsUtils_CC_OPTS += -DHostOS=$(DQ)$(HostOS_CPP)$(DQ) -rts/RtsUtils_CC_OPTS += -DHostVendor=$(DQ)$(HostVendor_CPP)$(DQ) +# 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. # -rts/RtsUtils_CC_OPTS += -DBuildPlatform=$(DQ)$(BUILDPLATFORM)$(DQ) -rts/RtsUtils_CC_OPTS += -DBuildArch=$(DQ)$(BuildArch_CPP)$(DQ) -rts/RtsUtils_CC_OPTS += -DBuildOS=$(DQ)$(BuildOS_CPP)$(DQ) -rts/RtsUtils_CC_OPTS += -DBuildVendor=$(DQ)$(BuildVendor_CPP)$(DQ) +# This apparently doesn't work on OS X (Darwin) nor on Solaris. +# On Darwin we get errors of the form # -rts/RtsUtils_CC_OPTS += -DTargetPlatform=$(DQ)$(TARGETPLATFORM)$(DQ) -rts/RtsUtils_CC_OPTS += -DTargetArch=$(DQ)$(TargetArch_CPP)$(DQ) -rts/RtsUtils_CC_OPTS += -DTargetOS=$(DQ)$(TargetOS_CPP)$(DQ) -rts/RtsUtils_CC_OPTS += -DTargetVendor=$(DQ)$(TargetVendor_CPP)$(DQ) +# 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 # -rts/RtsUtils_CC_OPTS += -DGhcUnregisterised=$(DQ)$(GhcUnregisterised)$(DQ) -rts/RtsUtils_CC_OPTS += -DGhcEnableTablesNextToCode=$(DQ)$(GhcEnableTablesNextToCode)$(DQ) +# and lots of these warnings: +# +# ld: warning codegen in _stg_ap_pppv_fast (offset 0x0000005E) prevents image from loading in dyld shared cache +# +# On Solaris we get errors like: +# +# Text relocation remains referenced +# against symbol offset in file +# .rodata (section) 0x11 rts/dist/build/Apply.dyn_o +# ... +# ld: fatal: relocations remain against allocatable but non-writable sections +# collect2: ld returned 1 exit status + +ifeq "$(TargetArch_CPP)" "i386" +i386_SPEED_HACK := "YES" +ifeq "$(TargetOS_CPP)" "darwin" +i386_SPEED_HACK := "NO" +endif +ifeq "$(TargetOS_CPP)" "solaris2" +i386_SPEED_HACK := "NO" +endif +endif + +ifeq "$(TargetArch_CPP)" "i386" +ifeq "$(i386_SPEED_HACK)" "YES" +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 @@ -315,7 +388,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 @@ -378,13 +450,13 @@ rts_dist_C_FILES = $(rts_C_SRCS) $(rts_thr_EXTRA_C_SRCS) $(rts_S_SRCS) # 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" +ifeq "$(USE_DTRACE)" "YES" rts_dist_MKDEPENDC_OPTS += -Irts/dist/build endif -$(eval $(call build-dependencies,rts,dist)) +$(eval $(call dependencies,rts,dist,1)) $(rts_dist_depfile_c_asm) : libffi/dist-install/build/ffi.h $(DTRACEPROBES_H) @@ -397,25 +469,28 @@ 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 $@ - -# ----------------------------------------------------------------------------- # compile dtrace probes if dtrace is supported -ifeq "$(HaveDtrace)" "YES" +ifeq "$(USE_DTRACE)" "YES" 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 $< +# Apple's dtrace (the only one supported by ghc at the moment) uses +# gcc as its preprocessor. If gcc isn't at /usr/bin/gcc, or we need +# to force it to use a different gcc, we need to give the path in +# the option cpppath. + +ifeq "$(TargetOS_CPP)" "darwin" +# Darwin has a flag to tell dtrace which cpp to use. +# Unfortunately, this isn't supported on Solaris (See Solaris Dynamic Tracing +# Guide, Chapter 16, for the configuration variables available on Solaris) +DTRACE_FLAGS = -x cpppath=$(WhatGccIsCalled) +endif +DTRACEPROBES_SRC = rts/RtsProbes.d +$(DTRACEPROBES_H): $(DTRACEPROBES_SRC) includes/ghcplatform.h | $$(dir $$@)/. + "$(DTRACE)" $(filter -I%,$(rts_CC_OPTS)) -C $(DTRACE_FLAGS) -h -o $@ -s $< endif # ----------------------------------------------------------------------------- @@ -423,6 +498,7 @@ endif ifneq "$(BINDIST)" "YES" rts/dist/build/libHSrtsmain.a : rts/dist/build/Main.o + "$(RM)" $(RM_OPTS) $@ "$(AR)" $(AR_OPTS) $(EXTRA_AR_ARGS) $@ $< endif @@ -455,5 +531,4 @@ INSTALL_LIBS += $(ALL_RTS_LIBS) $(eval $(call clean-target,rts,dist,rts/dist)) BINDIST_EXTRAS += rts/package.conf.in -BINDIST_EXTRAS += $(ALL_RTS_LIBS)