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

The linker script is no longer needed.
This commit is contained in:
Florian Weimer 2018-03-01 14:38:00 +01:00
parent a527f09cd1
commit 1efe135861
2 changed files with 6 additions and 19 deletions

View File

@ -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]

View File

@ -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