aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2018-03-01 12:53:09 +0100
committerFlorian Weimer <fweimer@redhat.com>2018-03-01 12:53:09 +0100
commit1a2f44a848663036c8a14671fe0faa3fed0b2a25 (patch)
tree77fe706f5885c69b70cd3c170318545051d513eb
parentbd60ce86520b781ca24b99b2555e2ad389bbfeaa (diff)
downloadglibc-1a2f44a848663036c8a14671fe0faa3fed0b2a25.tar
glibc-1a2f44a848663036c8a14671fe0faa3fed0b2a25.tar.gz
glibc-1a2f44a848663036c8a14671fe0faa3fed0b2a25.tar.bz2
glibc-1a2f44a848663036c8a14671fe0faa3fed0b2a25.zip
nptl: Drop libpthread_nonshared.a from libpthread.so
Fixes commit bd60ce86520b781ca24b99b2555e2ad389bbfeaa (nptl: Move pthread_atfork to libc_nonshared.a).
-rw-r--r--ChangeLog5
-rw-r--r--nptl/Makefile1
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index aab581ad42..c8f0bc3ee1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2018-03-01 Florian Weimer <fweimer@redhat.com>
+ * nptl/Makefile (libpthread.so): Drop libpthread_nonshared.a
+ reference.
+
+2018-03-01 Florian Weimer <fweimer@redhat.com>
+
Move pthread_atfork to libc. Remove libpthread_nonshared.a.
* nptl/Makefile (routines): Add pthread_atfork.
(static-only-routines): Set to pthread_atfork.
diff --git a/nptl/Makefile b/nptl/Makefile
index ba586c247e..e18f9a6b84 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -488,7 +488,6 @@ $(inst_libdir)/libpthread.so: $(common-objpfx)format.lds \
echo ' the static library, so try that secondarily. */';\
cat $<; \
echo 'GROUP ( $(slibdir)/libpthread.so$(libpthread.so-version)' \
- '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)pthread)'\
')' \
) > $@.new
mv -f $@.new $@