From: Florian Weimer <fweimer@redhat.com>
Date: Thu, 1 Mar 2018 13:38:00 +0000 (+0100)
Subject: nptl: Turn libpthread.so into a symbolic link to the real DSO
X-Git-Tag: glibc-2.28~524
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1efe13586124f536437ee031626f94a2cf2a502a;p=thirdparty%2Fglibc.git

nptl: Turn libpthread.so into a symbolic link to the real DSO

The linker script is no longer needed.
---

diff --git a/ChangeLog b/ChangeLog
index 53c8e9b5237..1992ccdde46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-03-01  Florian Weimer  <fweimer@redhat.com>
+
+	* nptl/Makefile (install-lib-ldscripts): Remove.
+	(install): Remove rule.
+	($(inst_libdir)/libpthread.so): Likewise.
+
 2018-03-01  Mike FABIAN  <mfabian@redhat.com>
 
 	[BZ #22896]
diff --git a/nptl/Makefile b/nptl/Makefile
index e18f9a6b84d..94be92c7896 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -26,7 +26,6 @@ headers := pthread.h semaphore.h bits/semaphore.h
 
 extra-libs := libpthread
 extra-libs-others := $(extra-libs)
-install-lib-ldscripts := libpthread.so
 
 routines = alloca_cutoff forward libc-lowlevellock libc-cancellation \
 	   libc-cleanup libc_pthread_init libc_multiple_threads \
@@ -473,24 +472,6 @@ ifeq (yes,$(build-shared))
 # Make sure these things are built in the `make lib' pass so they can be used
 # to run programs during the `make others' pass.
 lib-noranlib: $(addprefix $(objpfx),$(extra-objs))
-
-# What we install as libpthread.so for programs to link against is in fact a
-# link script.  It contains references for the various libraries we need.
-# We need to use absolute paths since otherwise local copies (if they exist)
-# of the files are taken by the linker.
-install: $(inst_libdir)/libpthread.so
-
-$(inst_libdir)/libpthread.so: $(common-objpfx)format.lds \
-			      $(objpfx)libpthread.so$(libpthread.so-version) \
-			      $(+force)
-	(echo '/* GNU ld script';\
-	 echo '   Use the shared library, but some functions are only in';\
-	 echo '   the static library, so try that secondarily.  */';\
-	 cat $<; \
-	 echo 'GROUP ( $(slibdir)/libpthread.so$(libpthread.so-version)' \
-	      ')' \
-	) > $@.new
-	mv -f $@.new $@
 endif