nptl: Drop libpthread_nonshared.a from libpthread.so

Fixes commit bd60ce86520b781ca24b99b2555e2ad389bbfeaa (nptl: Move
pthread_atfork to libc_nonshared.a).

diff --git a/ChangeLog b/ChangeLog
index aab581ad42d1cd0296bdbea1c6338a374f4f07e7..c8f0bc3ee159dcf22efd044c35d93bc6a9c37825 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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.

diff --git a/nptl/Makefile b/nptl/Makefile
index ba586c247eebba4b4e80ba0001b05b3174c73788..e18f9a6b84d5ab75cc82b9d7a0d1863428495b75 100644 (file)
--- 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 $@