about summary refs log tree commit diff
path: root/nptl/Makefile
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-01-03 21:15:43 +0000
committerUlrich Drepper <drepper@redhat.com>2003-01-03 21:15:43 +0000
commit733f25e6d34d8ced182ffd6366d7914d56e71d98 (patch)
tree18b3f08bbfa7cf6c37e254df3824bb24be4c5d35 /nptl/Makefile
parent686b7223d5e87538d8bc7eaf9581f4ad11d666f1 (diff)
downloadglibc-733f25e6d34d8ced182ffd6366d7914d56e71d98.tar.gz
glibc-733f25e6d34d8ced182ffd6366d7914d56e71d98.tar.xz
glibc-733f25e6d34d8ced182ffd6366d7914d56e71d98.zip
Update.
2003-01-03  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/generic/ldsodefs.h (_dl_allocate_tls, _dl_deallocate_tls):
	Add rtld_hidden_proto.
	* sysdeps/generic/dl-tls.c (_dl_deallocate_tls): Add rtld_hidden_def.
	(_dl_allocate_tls): Likewise.  Remove INTDEF.
Diffstat (limited to 'nptl/Makefile')
-rw-r--r--nptl/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/nptl/Makefile b/nptl/Makefile
index 2a68c2e566..ceee78758c 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -212,8 +212,10 @@ $(objpfx)libpthread.so: +preinit += $(objpfx)crti.o
 # 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
+			$(common-objpfx)libc_nonshared.a \
+			$(if $(filter yes,$(elf)), $(elfobjdir)/ld.so)
 
 # Make sure we link with the thread library.
 ifeq ($(build-shared),yes)