53 lines
1.7 KiB
Diff
53 lines
1.7 KiB
Diff
From d39c4a5ec099548f4f7864f29873e15f5ceb93e7 Mon Sep 17 00:00:00 2001
|
|
From: Florian Weimer <fweimer@redhat.com>
|
|
Date: Thu, 4 Aug 2016 11:10:57 +0200
|
|
Subject: [PATCH 01] 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)
|
|
---
|
|
ChangeLog | 7 +++++++
|
|
sysdeps/unix/sysv/linux/i386/Makefile | 2 ++
|
|
2 files changed, 9 insertions(+)
|
|
|
|
diff --git a/ChangeLog b/ChangeLog
|
|
index c44c926..5dc53ac 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 71ba61e..b015ff7 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
|
|
--
|
|
2.7.4.GIT
|
|
|
|
|