This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.26.9000-1083-g4a5ce6e
- From: sthibaul at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 6 Jan 2018 18:00:25 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.26.9000-1083-g4a5ce6e
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 4a5ce6e908c6b45d976fb78b65434b489dc570b6 (commit)
from fad7d57ef94bbb0254042cd213b6be2714c69df1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4a5ce6e908c6b45d976fb78b65434b489dc570b6
commit 4a5ce6e908c6b45d976fb78b65434b489dc570b6
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Jan 6 18:18:49 2018 +0100
hurd: Fix build without NO_HIDDEN
* sysdeps/i386/dl-tlsdesc.S (_dl_tlsdesc_dynamic) [NO_RTLD_HIDDEN]: Call
JUMPTARGET (___tls_get_addr) instead of HIDDEN_JUMPTARGET (___tls_get_addr).
* sysdeps/x86_64/dl-tlsdesc.S (_dl_tlsdesc_dynamic): Likewise.
diff --git a/ChangeLog b/ChangeLog
index 8833b1d..ed87621 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
2018-01-06 Samuel Thibault <samuel.thibault@ens-lyon.org>
* sysdeps/mach/hurd/i386/jmp_buf-macros.h: New file.
+ * sysdeps/i386/dl-tlsdesc.S (_dl_tlsdesc_dynamic) [NO_RTLD_HIDDEN]: Call
+ JUMPTARGET (___tls_get_addr) instead of HIDDEN_JUMPTARGET
+ (___tls_get_addr).
+ * sysdeps/x86_64/dl-tlsdesc.S (_dl_tlsdesc_dynamic): Likewise.
2018-01-05 Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>
diff --git a/sysdeps/i386/dl-tlsdesc.S b/sysdeps/i386/dl-tlsdesc.S
index 8c2c40b..2c4764d 100644
--- a/sysdeps/i386/dl-tlsdesc.S
+++ b/sysdeps/i386/dl-tlsdesc.S
@@ -126,7 +126,11 @@ _dl_tlsdesc_dynamic:
.p2align 4,,7
.Lslow:
cfi_adjust_cfa_offset (28)
+#ifdef NO_RTLD_HIDDEN
+ call JUMPTARGET (___tls_get_addr)
+#else
call HIDDEN_JUMPTARGET (___tls_get_addr)
+#endif
jmp .Lret
cfi_endproc
.size _dl_tlsdesc_dynamic, .-_dl_tlsdesc_dynamic
diff --git a/sysdeps/x86_64/dl-tlsdesc.S b/sysdeps/x86_64/dl-tlsdesc.S
index 6c4e6b6..437bd8c 100644
--- a/sysdeps/x86_64/dl-tlsdesc.S
+++ b/sysdeps/x86_64/dl-tlsdesc.S
@@ -128,7 +128,11 @@ _dl_tlsdesc_dynamic:
movq %r10, 40(%rsp)
movq %r11, 48(%rsp)
/* %rdi already points to the tlsinfo data structure. */
+#ifdef NO_RTLD_HIDDEN
+ call JUMPTARGET (__tls_get_addr)
+#else
call HIDDEN_JUMPTARGET (__tls_get_addr)
+#endif
movq 8(%rsp), %rdx
movq 16(%rsp), %rcx
movq 24(%rsp), %r8
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 ++++
sysdeps/i386/dl-tlsdesc.S | 4 ++++
sysdeps/x86_64/dl-tlsdesc.S | 4 ++++
3 files changed, 12 insertions(+), 0 deletions(-)
hooks/post-receive
--
GNU C Library master sources