nptl: Drop libpthread_nonshared.a from libpthread.so
authorFlorian Weimer <fweimer@redhat.com>
Thu, 1 Mar 2018 11:53:09 +0000 (12:53 +0100)
committerFlorian Weimer <fweimer@redhat.com>
Thu, 1 Mar 2018 11:53:09 +0000 (12:53 +0100)
Fixes commit bd60ce86520b781ca24b99b2555e2ad389bbfeaa (nptl: Move
pthread_atfork to libc_nonshared.a).

ChangeLog
nptl/Makefile

index aab581a..c8f0bc3 100644 (file)
--- 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.
index ba586c2..e18f9a6 100644 (file)
@@ -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 $@