diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-06-04 15:48:26 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-06-04 15:48:26 +0000 |
| commit | 8548b3be8c48bf62bd4e20fb0ee958338b01bc6c (patch) | |
| tree | 874deff152fded2f5b50110ee6d488d42605bb01 /libc/nptl | |
| parent | eab7f6089510455a9b26643c64da331749a15650 (diff) | |
Merge changes between r23097 and r23217 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@23218 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/nptl')
| -rw-r--r-- | libc/nptl/ChangeLog | 5 | ||||
| -rw-r--r-- | libc/nptl/Makefile | 8 |
2 files changed, 5 insertions, 8 deletions
diff --git a/libc/nptl/ChangeLog b/libc/nptl/ChangeLog index 6e5ca4cfa..7a9ce8e80 100644 --- a/libc/nptl/ChangeLog +++ b/libc/nptl/ChangeLog @@ -1,3 +1,8 @@ +2013-05-31 Joseph Myers <joseph@codesourcery.com> + + * Makefile ($(objpfx)libpthread.so): Remove dependencies on libc + and ld.so. + 2013-05-16 Ryan S. Arnold <rsa@linux.vnet.ibm.com> * pthread_create.c: Add missing #include <stdint.h> due to uint64_t or diff --git a/libc/nptl/Makefile b/libc/nptl/Makefile index 474a687f8..72ffa147b 100644 --- a/libc/nptl/Makefile +++ b/libc/nptl/Makefile @@ -526,14 +526,6 @@ $(objpfx)libpthread.so: $(addprefix $(objpfx),$(crti-objs) $(crtn-objs)) $(objpfx)libpthread.so: +preinit += $(addprefix $(objpfx),$(crti-objs)) $(objpfx)libpthread.so: +postinit += $(addprefix $(objpfx),$(crtn-objs)) -# 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), \ |