X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fghc.mk;h=1ff6f625a058c1c5705d7be360d5fceb3a7155c2;hb=fa926e2e47c1a3e02e37e5446802e831e1b9ac7c;hp=ec2b9b37605456a5abee16f8c88d52badfdb831f;hpb=d3a24165eb14601191e344cb15b67ed69d617a9d;p=ghc-hetmet.git diff --git a/rts/ghc.mk b/rts/ghc.mk index ec2b9b3..1ff6f62 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -44,7 +44,7 @@ rts_C_SRCS = $(filter-out $(EXCLUDED_SRCS),$(wildcard rts/*.c $(foreach dir,$(AL 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 @@ -103,7 +103,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 @@ -116,7 +116,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 @@ -128,6 +128,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 = @@ -163,17 +165,17 @@ 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" - # 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 \ + "$$(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) @@ -181,6 +183,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: @@ -203,7 +207,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 @@ -213,6 +216,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 @@ -240,11 +252,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 @@ -295,6 +302,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 @@ -311,7 +357,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 @@ -380,7 +425,7 @@ rts_dist_MKDEPENDC_OPTS += -Irts/dist/build endif -$(eval $(call build-dependencies,rts,dist)) +$(eval $(call build-dependencies,rts,dist,1)) $(rts_dist_depfile_c_asm) : libffi/dist-install/build/ffi.h $(DTRACEPROBES_H) @@ -417,8 +462,11 @@ 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 @@ -441,13 +489,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