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 8833b1da335f2450eb453074a860ee91b28463d2..ed8762118b59c4863de2f6c5c1b78ac04cc7786e 100644 (file)
--- 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 8c2c40b7ec9f8cb5f43a8451f24c710237d7f0f2..2c4764d1aa494c26c2c64de2285cb1cc398c819b 100644 (file)
--- 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 6c4e6b6c918fccb7d87ac03b171eb5987ec8ca49..437bd8cde74572c291bf7c4583440734c1d6bb19 100644 (file)
--- 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