[Glibc-bsd-commits] r4586 - trunk/glibc-ports/fbtl

[Petr Salinger]

Author: ps-guest
Date: 2013-06-23 07:50:01 +0000 (Sun, 23 Jun 2013)
New Revision: 4586

Modified:
   trunk/glibc-ports/fbtl/Makefile
Log:
pre-2.18 support in Makefile


Modified: trunk/glibc-ports/fbtl/Makefile
===================================================================
--- trunk/glibc-ports/fbtl/Makefile	2013-06-23 07:49:20 UTC (rev 4585)
+++ trunk/glibc-ports/fbtl/Makefile	2013-06-23 07:50:01 UTC (rev 4586)
@@ -517,6 +517,16 @@
 $(objpfx)libpthread.so: +preinit += $(addprefix $(objpfx),$(crti-objs))
 $(objpfx)libpthread.so: +postinit += $(addprefix $(objpfx),$(crtn-objs))
 
+# the next rule is pre-2.18 only
+# Depend on libc.so so a DT_NEEDED is generated in the shared objects.
+# This ensures they will load libc.so for needed symbols if loaded by
+# a statically-linked program that hasn't already loaded it.
+# Depend on ld.so too to get proper versions of ld.so symbols.
+$(objpfx)libpthread.so: $(common-objpfx)libc.so \
+			$(common-objpfx)libc_nonshared.a \
+			$(elfobjdir)/ld.so
+
+
 # Make sure we link with the thread library.
 ifeq ($(build-shared),yes)
 $(addprefix $(objpfx), \