--- a/make-rules/shared-macros.mk	Wed Oct 16 06:53:51 2013 -0700
+++ b/make-rules/shared-macros.mk	Wed Oct 16 10:00:08 2013 -0700
@@ -631,7 +631,7 @@
 # only be required if the component's native build is horribly broken.
 LD_Z_RESCAN_NOW =	-z rescan-now
 
-LD_Z_TEXT =		-z direct
+LD_Z_TEXT =		-z text
 
 # make sure that -lc is always present when building shared objects.
 LD_DEF_LIBS +=		-lc
@@ -642,6 +642,9 @@
 # eliminate unreferenced dynamic dependencies
 LD_Z_IGNORE =		-z ignore
 
+# eliminate comments
+LD_Z_STRIP_CLASS =	-z strip-class=comment
+
 # use direct binding
 LD_B_DIRECT =		-Bdirect
 
@@ -686,7 +689,8 @@
 # libraries to this macro, as it will apply to everything linked during the
 # component build.
 LD_OPTIONS +=	$(LD_MAP_NOEXSTK.$(MACH)) $(LD_MAP_NOEXDATA.$(MACH)) \
-		$(LD_MAP_PAGEALIGN) $(LD_B_DIRECT) $(LD_Z_IGNORE)
+		$(LD_MAP_PAGEALIGN) $(LD_B_DIRECT) $(LD_Z_IGNORE) \
+		$(LD_Z_STRIP_CLASS)
 
 # only used on executables
 LD_EXEC_OPTIONS = $(LD_Z_ASLR)