diff options
| author | Florian Weimer <fweimer@redhat.com> | 2016-08-04 11:10:57 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2016-08-04 11:45:53 +0200 |
| commit | d39c4a5ec099548f4f7864f29873e15f5ceb93e7 (patch) | |
| tree | 3ab69a8b07edd8c7fc62a80b01dc1384826ea806 | |
| parent | fdfc9260b61d3d72541f18104d24c7bcb0ce5ca2 (diff) | |
| download | glibc-d39c4a5ec099548f4f7864f29873e15f5ceb93e7.tar.gz glibc-d39c4a5ec099548f4f7864f29873e15f5ceb93e7.tar.xz glibc-d39c4a5ec099548f4f7864f29873e15f5ceb93e7.zip | |
x86: Use sysdep.o from libc.a in static libraries
Static libraries can use the sysdep.o copy in libc.a without a performance penalty. This results in a visible difference if libpthread.a is relinked into a single object file (which is needed to support libraries which check for the presence of certain symbols to enable threading support, which generally fails with static linking unless libpthread.a is relinked). (cherry picked from commit e67330ab57bfd0f964539576ae7dcc658c456724)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/Makefile | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index c44c926094..5dc53ac586 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2016-08-04 Florian Weimer <fweimer@redhat.com> + + Use sysdep.o from libc.a in static libraries. + * sysdeps/unix/sysv/linux/i386/Makefile + (libpthread-shared-only-routines): Add sysdep. + (librt-shared-only-routines): Likewise. + 2016-08-01 Carlos O'Donell <carlos@redhat.com> * version.h (RELEASE): Set to "stable" diff --git a/sysdeps/unix/sysv/linux/i386/Makefile b/sysdeps/unix/sysv/linux/i386/Makefile index 71ba61e9d7..b015ff7c76 100644 --- a/sysdeps/unix/sysv/linux/i386/Makefile +++ b/sysdeps/unix/sysv/linux/i386/Makefile @@ -48,9 +48,11 @@ endif ifeq ($(subdir),nptl) # pull in __syscall_error routine libpthread-routines += sysdep +libpthread-shared-only-routines += sysdep endif ifeq ($(subdir),rt) # pull in __syscall_error routine librt-routines += sysdep +librt-shared-only-routines += sysdep endif |