about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2016-08-04 11:10:57 +0200
committerFlorian Weimer <fweimer@redhat.com>2016-08-04 11:10:57 +0200
commite67330ab57bfd0f964539576ae7dcc658c456724 (patch)
tree363747fb6cc852321c9c848aa0c56c1e32515f04
parent146f208da68a3ff27a52f05536c61e6db69cd87f (diff)
downloadglibc-e67330ab57bfd0f964539576ae7dcc658c456724.tar.gz
glibc-e67330ab57bfd0f964539576ae7dcc658c456724.tar.xz
glibc-e67330ab57bfd0f964539576ae7dcc658c456724.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).
-rw-r--r--ChangeLog7
-rw-r--r--sysdeps/unix/sysv/linux/i386/Makefile2
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0fe7eafe99..d88654cb06 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-03  Joseph Myers  <joseph@codesourcery.com>
 
 	* math/tgmath.h (nextdown): Define if
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