about summary refs log tree commit diff
diff options
context:
space:
mode:
-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 $@