From: Florian Weimer Date: Thu, 4 Aug 2016 09:10:57 +0000 (+0200) Subject: x86: Use sysdep.o from libc.a in static libraries X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3e0bedf697c8c5858cd7ad1a541a179a20a6320;p=thirdparty%2Fglibc.git 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) --- diff --git a/ChangeLog b/ChangeLog index 4310cc0dd3a..ab1ab1fc9bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2016-08-04 Florian Weimer + + 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-06-30 Aurelien Jarno * sysdeps/unix/sysv/linux/sparc/sparc64/localplt.data: Add _Qp_cmp. diff --git a/sysdeps/unix/sysv/linux/i386/Makefile b/sysdeps/unix/sysv/linux/i386/Makefile index 71ba61e9d75..b015ff7c760 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