X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fghc.mk;h=397ab8d187362d89d10214b1a2de78e0d79c5f84;hb=888b4e89a4a4e3f39a3ba567c796b3a79b63bf61;hp=bf110faeb98351fcea2f9dcd3e9dfa62f608e1d2;hpb=c24af7168babfe2a7c231c1c7a61b74d952aee84;p=ghc-hetmet.git

diff --git a/rts/ghc.mk b/rts/ghc.mk
index bf110fa..397ab8d 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -167,15 +167,15 @@ $$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) 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) $$(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)" -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)
@@ -307,6 +307,34 @@ 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.
+
+ifeq "$(TargetArch_CPP)" "i386"
+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
+
 # ffi.h triggers prototype warnings, so disable them here:
 rts/Interpreter_CC_OPTS += -Wno-strict-prototypes
 rts/Adjustor_CC_OPTS    += -Wno-strict-prototypes