diff options
| author | Florian Weimer <fweimer@redhat.com> | 2018-03-01 14:38:00 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2018-03-01 16:14:47 +0100 |
| commit | 1efe13586124f536437ee031626f94a2cf2a502a (patch) | |
| tree | 0a9933283fd74266ec4a8e8f2551eba05500c559 | |
| parent | a527f09cd1475dbc465ad476f0604951fa3590d7 (diff) | |
| download | glibc-1efe13586124f536437ee031626f94a2cf2a502a.tar.gz glibc-1efe13586124f536437ee031626f94a2cf2a502a.tar.xz glibc-1efe13586124f536437ee031626f94a2cf2a502a.zip | |
nptl: Turn libpthread.so into a symbolic link to the real DSO
The linker script is no longer needed.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | nptl/Makefile | 19 |
2 files changed, 6 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog index 53c8e9b523..1992ccdde4 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 e18f9a6b84..94be92c789 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 |