X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2Fghc.mk;h=7815e77e2e494df5ef7b89465be1df3fbae68359;hp=e71473d4e2916c2dd8c9d73ec9828a26ec5432ea;hb=062aa8af7b8545386514ecc9359c485f34e7c0c7;hpb=f999a6a2fc2954701d1f84684546c97312a9674c

diff --git a/rts/ghc.mk b/rts/ghc.mk
index e71473d..7815e77 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -165,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_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
 endif
 else
 $$(rts_$1_LIB) : $$(rts_$1_OBJS)
@@ -207,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 
 
@@ -217,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
@@ -299,6 +307,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
@@ -315,7 +362,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
@@ -384,7 +430,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)