123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490 |
- From 1f34a2328890aa192141f96449d25b77f666bf47 Mon Sep 17 00:00:00 2001
- From: Florian Weimer <fweimer@redhat.com>
- Date: Thu, 3 Nov 2022 17:28:03 +0100
- Subject: [PATCH] elf: Introduce <dl-call_tls_init_tp.h> and call_tls_init_tp
- (bug 29249)
- This makes it more likely that the compiler can compute the strlen
- argument in _startup_fatal at compile time, which is required to
- avoid a dependency on strlen this early during process startup.
- Reviewed-by: Szabolcs Nagy <szabolcs.nagy@arm.com>
- ---
- csu/libc-tls.c | 14 ++++-------
- elf/rtld.c | 14 +++--------
- sysdeps/aarch64/nptl/tls.h | 2 +-
- sysdeps/alpha/nptl/tls.h | 2 +-
- sysdeps/arc/nptl/tls.h | 3 +--
- sysdeps/csky/nptl/tls.h | 3 +--
- sysdeps/generic/dl-call_tls_init_tp.h | 34 +++++++++++++++++++++++++++
- sysdeps/generic/startup.h | 2 +-
- sysdeps/hppa/nptl/tls.h | 2 +-
- sysdeps/i386/nptl/tls.h | 3 +--
- sysdeps/ia64/nptl/tls.h | 2 +-
- sysdeps/loongarch/nptl/tls.h | 2 +-
- sysdeps/m68k/nptl/tls.h | 2 +-
- sysdeps/mach/hurd/i386/tls.h | 10 ++++----
- sysdeps/microblaze/nptl/tls.h | 2 +-
- sysdeps/mips/nptl/tls.h | 3 +--
- sysdeps/nios2/nptl/tls.h | 2 +-
- sysdeps/or1k/nptl/tls.h | 2 +-
- sysdeps/powerpc/nptl/tls.h | 2 +-
- sysdeps/riscv/nptl/tls.h | 2 +-
- sysdeps/s390/nptl/tls.h | 2 +-
- sysdeps/sh/nptl/tls.h | 2 +-
- sysdeps/sparc/nptl/tls.h | 2 +-
- sysdeps/unix/sysv/linux/arm/tls.h | 3 +--
- sysdeps/x86_64/nptl/tls.h | 2 +-
- 25 files changed, 68 insertions(+), 51 deletions(-)
- create mode 100644 sysdeps/generic/dl-call_tls_init_tp.h
- diff --git a/csu/libc-tls.c b/csu/libc-tls.c
- index 0a216c55028..ca4def26133 100644
- --- a/csu/libc-tls.c
- +++ b/csu/libc-tls.c
- @@ -25,6 +25,7 @@
- #include <sys/param.h>
- #include <array_length.h>
- #include <pthreadP.h>
- +#include <dl-call_tls_init_tp.h>
-
- #ifdef SHARED
- #error makefile bug, this file is for static only
- @@ -147,14 +148,14 @@ __libc_setup_tls (void)
- tcb_offset = roundup (memsz + GLRO(dl_tls_static_surplus), max_align);
- tlsblock = _dl_early_allocate (tcb_offset + TLS_INIT_TCB_SIZE + max_align);
- if (tlsblock == NULL)
- - _startup_fatal ("Fatal glibc error: Cannot allocate TLS block\n");
- + _startup_fatal_tls_error ();
- #elif TLS_DTV_AT_TP
- tcb_offset = roundup (TLS_INIT_TCB_SIZE, align ?: 1);
- tlsblock = _dl_early_allocate (tcb_offset + memsz + max_align
- + TLS_PRE_TCB_SIZE
- + GLRO(dl_tls_static_surplus));
- if (tlsblock == NULL)
- - _startup_fatal ("Fatal glibc error: Cannot allocate TLS block\n");
- + _startup_fatal_tls_error ();
- tlsblock += TLS_PRE_TCB_SIZE;
- #else
- /* In case a model with a different layout for the TCB and DTV
- @@ -191,16 +192,11 @@ __libc_setup_tls (void)
- #if TLS_TCB_AT_TP
- INSTALL_DTV ((char *) tlsblock + tcb_offset, _dl_static_dtv);
-
- - const char *lossage = TLS_INIT_TP ((char *) tlsblock + tcb_offset);
- + call_tls_init_tp ((char *) tlsblock + tcb_offset);
- #elif TLS_DTV_AT_TP
- INSTALL_DTV (tlsblock, _dl_static_dtv);
- - const char *lossage = TLS_INIT_TP (tlsblock);
- -#else
- -# error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined"
- + call_tls_init_tp (tlsblock);
- #endif
- - if (__builtin_expect (lossage != NULL, 0))
- - _startup_fatal (lossage);
- - __tls_init_tp ();
-
- /* Update the executable's link map with enough information to make
- the TLS routines happy. */
- diff --git a/elf/rtld.c b/elf/rtld.c
- index 8671594f1f5..70ad1acc43e 100644
- --- a/elf/rtld.c
- +++ b/elf/rtld.c
- @@ -52,6 +52,7 @@
- #include <dl-execve.h>
- #include <dl-find_object.h>
- #include <dl-audit-check.h>
- +#include <dl-call_tls_init_tp.h>
-
- #include <assert.h>
-
- @@ -796,10 +797,7 @@ cannot allocate TLS data structures for initial thread\n");
- GL(dl_initial_dtv) = GET_DTV (tcbp);
-
- /* And finally install it for the main thread. */
- - const char *lossage = TLS_INIT_TP (tcbp);
- - if (__glibc_unlikely (lossage != NULL))
- - _dl_fatal_printf ("cannot set up thread-local storage: %s\n", lossage);
- - __tls_init_tp ();
- + call_tls_init_tp (tcbp);
- tls_init_tp_called = true;
-
- return tcbp;
- @@ -2348,13 +2346,7 @@ dl_main (const ElfW(Phdr) *phdr,
-
- /* And finally install it for the main thread. */
- if (! tls_init_tp_called)
- - {
- - const char *lossage = TLS_INIT_TP (tcbp);
- - if (__glibc_unlikely (lossage != NULL))
- - _dl_fatal_printf ("cannot set up thread-local storage: %s\n",
- - lossage);
- - __tls_init_tp ();
- - }
- + call_tls_init_tp (tcbp);
-
- /* Make sure no new search directories have been added. */
- assert (GLRO(dl_init_all_dirs) == GL(dl_all_dirs));
- diff --git a/sysdeps/aarch64/nptl/tls.h b/sysdeps/aarch64/nptl/tls.h
- index 08aa2eff891..6fe084c1ef9 100644
- --- a/sysdeps/aarch64/nptl/tls.h
- +++ b/sysdeps/aarch64/nptl/tls.h
- @@ -72,7 +72,7 @@ typedef struct
- special attention since 'errno' is not yet available and if the
- operation can cause a failure 'errno' must not be touched. */
- # define TLS_INIT_TP(tcbp) \
- - ({ __asm __volatile ("msr tpidr_el0, %0" : : "r" (tcbp)); NULL; })
- + ({ __asm __volatile ("msr tpidr_el0, %0" : : "r" (tcbp)); true; })
-
- /* Value passed to 'clone' for initialization of the thread register. */
- # define TLS_DEFINE_INIT_TP(tp, pd) void *tp = (pd) + 1
- diff --git a/sysdeps/alpha/nptl/tls.h b/sysdeps/alpha/nptl/tls.h
- index 8f5b69ad3b1..48dc1369fc1 100644
- --- a/sysdeps/alpha/nptl/tls.h
- +++ b/sysdeps/alpha/nptl/tls.h
- @@ -69,7 +69,7 @@ typedef struct
- special attention since 'errno' is not yet available and if the
- operation can cause a failure 'errno' must not be touched. */
- # define TLS_INIT_TP(tcbp) \
- - (__builtin_set_thread_pointer ((void *)(tcbp)), NULL)
- + (__builtin_set_thread_pointer ((void *)(tcbp)), true)
-
- /* Value passed to 'clone' for initialization of the thread register. */
- # define TLS_DEFINE_INIT_TP(tp, pd) void *tp = (pd) + 1
- diff --git a/sysdeps/arc/nptl/tls.h b/sysdeps/arc/nptl/tls.h
- index 7fc6602b236..948e618a3aa 100644
- --- a/sysdeps/arc/nptl/tls.h
- +++ b/sysdeps/arc/nptl/tls.h
- @@ -75,8 +75,7 @@ typedef struct
- long result_var; \
- __builtin_set_thread_pointer (tcbp); \
- result_var = INTERNAL_SYSCALL_CALL (arc_settls, (tcbp));\
- - INTERNAL_SYSCALL_ERROR_P (result_var) \
- - ? "settls syscall error" : NULL; \
- + !INTERNAL_SYSCALL_ERROR_P (result_var); \
- })
-
- /* Value passed to 'clone' for initialization of the thread register. */
- diff --git a/sysdeps/csky/nptl/tls.h b/sysdeps/csky/nptl/tls.h
- index 58d6ab0fb2a..3f7afc93391 100644
- --- a/sysdeps/csky/nptl/tls.h
- +++ b/sysdeps/csky/nptl/tls.h
- @@ -92,8 +92,7 @@ typedef struct
- ({ long int result_var; \
- result_var = INTERNAL_SYSCALL_CALL (set_thread_area, \
- (char *) (tcbp) + TLS_TCB_OFFSET); \
- - INTERNAL_SYSCALL_ERROR_P (result_var) \
- - ? "unknown error" : NULL; })
- + !INTERNAL_SYSCALL_ERROR_P (result_var); })
-
- /* Return the address of the dtv for the current thread. */
- # define THREAD_DTV() \
- diff --git a/sysdeps/generic/dl-call_tls_init_tp.h b/sysdeps/generic/dl-call_tls_init_tp.h
- new file mode 100644
- index 00000000000..411feda3fc0
- --- /dev/null
- +++ b/sysdeps/generic/dl-call_tls_init_tp.h
- @@ -0,0 +1,34 @@
- +/* Invoke TLS_INIT_TP and __tls_init_tp with error handling.
- + Copyright (C) 2022 Free Software Foundation, Inc.
- + This file is part of the GNU C Library.
- +
- + The GNU C Library is free software; you can redistribute it and/or
- + modify it under the terms of the GNU Lesser General Public
- + License as published by the Free Software Foundation; either
- + version 2.1 of the License, or (at your option) any later version.
- +
- + The GNU C Library is distributed in the hope that it will be useful,
- + but WITHOUT ANY WARRANTY; without even the implied warranty of
- + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- + Lesser General Public License for more details.
- +
- + You should have received a copy of the GNU Lesser General Public
- + License along with the GNU C Library; if not, see
- + <https://www.gnu.org/licenses/>. */
- +
- +#include <startup.h>
- +#include <tls.h>
- +
- +static inline void
- +_startup_fatal_tls_error (void)
- +{
- + _startup_fatal ("Fatal glibc error: Cannot allocate TLS block\n");
- +}
- +
- +static inline void
- +call_tls_init_tp (void *addr)
- +{
- + if (!TLS_INIT_TP (addr))
- + _startup_fatal_tls_error ();
- + __tls_init_tp ();
- +}
- diff --git a/sysdeps/generic/startup.h b/sysdeps/generic/startup.h
- index 45979ab2319..4b444511b4f 100644
- --- a/sysdeps/generic/startup.h
- +++ b/sysdeps/generic/startup.h
- @@ -19,7 +19,7 @@
- /* Targets should override this file if the default definitions below
- will not work correctly very early before TLS is initialized. */
-
- -#include <unistd.h>
- +#include <stdio.h>
-
- /* Use macro instead of inline function to avoid including <stdio.h>. */
- #define _startup_fatal(message) __libc_fatal ((message))
- diff --git a/sysdeps/hppa/nptl/tls.h b/sysdeps/hppa/nptl/tls.h
- index e6b0bd5c718..6af22cdc004 100644
- --- a/sysdeps/hppa/nptl/tls.h
- +++ b/sysdeps/hppa/nptl/tls.h
- @@ -74,7 +74,7 @@ typedef struct
- special attention since 'errno' is not yet available and if the
- operation can cause a failure 'errno' must not be touched. */
- # define TLS_INIT_TP(tcbp) \
- - ({ __set_cr27(tcbp); NULL; })
- + ({ __set_cr27(tcbp); true; })
-
- /* Value passed to 'clone' for initialization of the thread register. */
- # define TLS_DEFINE_INIT_TP(tp, pd) void *tp = (pd) + 1
- diff --git a/sysdeps/i386/nptl/tls.h b/sysdeps/i386/nptl/tls.h
- index 91090bf2877..553b55b3f2d 100644
- --- a/sysdeps/i386/nptl/tls.h
- +++ b/sysdeps/i386/nptl/tls.h
- @@ -203,8 +203,7 @@ tls_fill_user_desc (union user_desc_init *desc,
- which is necessary since we have changed it. */ \
- TLS_SET_GS (_segdescr.desc.entry_number * 8 + 3); \
- \
- - _result == 0 ? NULL \
- - : "set_thread_area failed when setting up thread-local storage\n"; })
- + _result == 0; })
-
- # define TLS_DEFINE_INIT_TP(tp, pd) \
- union user_desc_init _segdescr; \
- diff --git a/sysdeps/ia64/nptl/tls.h b/sysdeps/ia64/nptl/tls.h
- index d2411b3c1ac..4085c568326 100644
- --- a/sysdeps/ia64/nptl/tls.h
- +++ b/sysdeps/ia64/nptl/tls.h
- @@ -105,7 +105,7 @@ register struct pthread *__thread_self __asm__("r13");
- special attention since 'errno' is not yet available and if the
- operation can cause a failure 'errno' must not be touched. */
- # define TLS_INIT_TP(thrdescr) \
- - (__thread_self = (thrdescr), INIT_SYSINFO, NULL)
- + (__thread_self = (thrdescr), INIT_SYSINFO, true)
-
- /* Value passed to 'clone2' for initialization of the thread register. */
- # define TLS_DEFINE_INIT_TP(tp, pd) \
- diff --git a/sysdeps/loongarch/nptl/tls.h b/sysdeps/loongarch/nptl/tls.h
- index 24bffe3a0ad..e8b616854f7 100644
- --- a/sysdeps/loongarch/nptl/tls.h
- +++ b/sysdeps/loongarch/nptl/tls.h
- @@ -83,7 +83,7 @@ typedef struct
- #define TLS_INIT_TP(tcbp) \
- ({ \
- __thread_self = (char *) tcbp + TLS_TCB_OFFSET; \
- - NULL; \
- + true; \
- })
-
- /* Return the address of the dtv for the current thread. */
- diff --git a/sysdeps/m68k/nptl/tls.h b/sysdeps/m68k/nptl/tls.h
- index 742e1b6767d..ebcc118bbe2 100644
- --- a/sysdeps/m68k/nptl/tls.h
- +++ b/sysdeps/m68k/nptl/tls.h
- @@ -90,7 +90,7 @@ typedef struct
- \
- _sys_result = INTERNAL_SYSCALL_CALL (set_thread_area, \
- ((void *) (tcbp)) + TLS_TCB_OFFSET); \
- - INTERNAL_SYSCALL_ERROR_P (_sys_result) ? "unknown error" : NULL; })
- + !INTERNAL_SYSCALL_ERROR_P (_sys_result); })
-
- # define TLS_DEFINE_INIT_TP(tp, pd) \
- void *tp = (void *) (pd) + TLS_TCB_OFFSET + TLS_PRE_TCB_SIZE
- diff --git a/sysdeps/mach/hurd/i386/tls.h b/sysdeps/mach/hurd/i386/tls.h
- index 602bacc0de0..2847e3ee61c 100644
- --- a/sysdeps/mach/hurd/i386/tls.h
- +++ b/sysdeps/mach/hurd/i386/tls.h
- @@ -117,12 +117,12 @@ extern unsigned short __init1_desc;
-
- # define HURD_SEL_LDT(sel) (__builtin_expect ((sel) & 4, 0))
-
- -static inline const char * __attribute__ ((unused))
- +static inline bool __attribute__ ((unused))
- _hurd_tls_init (tcbhead_t *tcb)
- {
- HURD_TLS_DESC_DECL (desc, tcb);
- thread_t self = __mach_thread_self ();
- - const char *msg = NULL;
- + bool success = true;
-
- /* This field is used by TLS accesses to get our "thread pointer"
- from the TLS point of view. */
- @@ -141,14 +141,14 @@ _hurd_tls_init (tcbhead_t *tcb)
- assert_perror (err);
- if (err)
- {
- - msg = "i386_set_ldt failed";
- + success = false;
- goto out;
- }
- }
- else if (err)
- {
- assert_perror (err); /* Separate from above with different line #. */
- - msg = "i386_set_gdt failed";
- + success = false;
- goto out;
- }
-
- @@ -157,7 +157,7 @@ _hurd_tls_init (tcbhead_t *tcb)
-
- out:
- __mach_port_deallocate (__mach_task_self (), self);
- - return msg;
- + return success;
- }
-
- /* Code to initially initialize the thread pointer. This might need
- diff --git a/sysdeps/microblaze/nptl/tls.h b/sysdeps/microblaze/nptl/tls.h
- index 588fd1c5d63..d8be1932b9b 100644
- --- a/sysdeps/microblaze/nptl/tls.h
- +++ b/sysdeps/microblaze/nptl/tls.h
- @@ -75,7 +75,7 @@ typedef struct
- /* Code to initially initialize the thread pointer.
- r21 is reserved for thread pointer. */
- # define TLS_INIT_TP(tcbp) \
- - ({ __asm __volatile ("or r21,r0,%0" : : "r" ((void *)tcbp)); NULL; })
- + ({ __asm __volatile ("or r21,r0,%0" : : "r" ((void *)tcbp)); true; })
-
- # define TLS_DEFINE_INIT_TP(tp, pd) void *tp = (pd) + 1
-
- diff --git a/sysdeps/mips/nptl/tls.h b/sysdeps/mips/nptl/tls.h
- index 2aa7cb4bb8d..bac6e8771cd 100644
- --- a/sysdeps/mips/nptl/tls.h
- +++ b/sysdeps/mips/nptl/tls.h
- @@ -116,8 +116,7 @@ typedef struct
- ({ long int result_var; \
- result_var = INTERNAL_SYSCALL_CALL (set_thread_area, \
- (char *) (tcbp) + TLS_TCB_OFFSET); \
- - INTERNAL_SYSCALL_ERROR_P (result_var) \
- - ? "unknown error" : NULL; })
- + !INTERNAL_SYSCALL_ERROR_P (result_var); })
-
- /* Value passed to 'clone' for initialization of the thread register. */
- # define TLS_DEFINE_INIT_TP(tp, pd) \
- diff --git a/sysdeps/nios2/nptl/tls.h b/sysdeps/nios2/nptl/tls.h
- index cb231e2a4bb..f5a9713f93f 100644
- --- a/sysdeps/nios2/nptl/tls.h
- +++ b/sysdeps/nios2/nptl/tls.h
- @@ -88,7 +88,7 @@ register struct pthread *__thread_self __asm__("r23");
-
- /* Code to initially initialize the thread pointer. */
- # define TLS_INIT_TP(tcbp) \
- - (__thread_self = (struct pthread *) ((char *) tcbp + TLS_TCB_OFFSET), NULL)
- + (__thread_self = (struct pthread *) ((char *) tcbp + TLS_TCB_OFFSET), true)
-
- /* Value passed to 'clone' for initialization of the thread register. */
- # define TLS_DEFINE_INIT_TP(tp, pd) \
- diff --git a/sysdeps/or1k/nptl/tls.h b/sysdeps/or1k/nptl/tls.h
- index e82f444738d..eda0e893aea 100644
- --- a/sysdeps/or1k/nptl/tls.h
- +++ b/sysdeps/or1k/nptl/tls.h
- @@ -112,7 +112,7 @@ register tcbhead_t *__thread_self __asm__("r10");
- It's hard to fail this, so return NULL always. */
-
- # define TLS_INIT_TP(tcbp) \
- - ({__thread_self = ((tcbhead_t *)tcbp + 1); NULL;})
- + ({__thread_self = ((tcbhead_t *)tcbp + 1); true;})
-
- /* Value passed to 'clone' for initialization of the thread register. */
- # define TLS_DEFINE_INIT_TP(tp, pd) \
- diff --git a/sysdeps/powerpc/nptl/tls.h b/sysdeps/powerpc/nptl/tls.h
- index e62a96238aa..68a1d8b546b 100644
- --- a/sysdeps/powerpc/nptl/tls.h
- +++ b/sysdeps/powerpc/nptl/tls.h
- @@ -139,7 +139,7 @@ typedef struct
- __thread_register = (void *) (tcbp) + TLS_TCB_OFFSET; \
- THREAD_SET_HWCAP (__tcb.hwcap); \
- THREAD_SET_AT_PLATFORM (__tcb.at_platform); \
- - NULL; \
- + true; \
- })
-
- /* Value passed to 'clone' for initialization of the thread register. */
- diff --git a/sysdeps/riscv/nptl/tls.h b/sysdeps/riscv/nptl/tls.h
- index 700c2f51899..b221980399b 100644
- --- a/sysdeps/riscv/nptl/tls.h
- +++ b/sysdeps/riscv/nptl/tls.h
- @@ -79,7 +79,7 @@ typedef struct
-
- /* Code to initially initialize the thread pointer. */
- # define TLS_INIT_TP(tcbp) \
- - ({ __thread_self = (char*)tcbp + TLS_TCB_OFFSET; NULL; })
- + ({ __thread_self = (char*)tcbp + TLS_TCB_OFFSET; true; })
-
- /* Return the address of the dtv for the current thread. */
- # define THREAD_DTV() \
- diff --git a/sysdeps/s390/nptl/tls.h b/sysdeps/s390/nptl/tls.h
- index 98d7870148c..937c49dda68 100644
- --- a/sysdeps/s390/nptl/tls.h
- +++ b/sysdeps/s390/nptl/tls.h
- @@ -112,7 +112,7 @@ typedef struct
- INIT_SYSINFO; \
- \
- __builtin_set_thread_pointer (_thrdescr); \
- - NULL; \
- + true; \
- })
-
- /* Value passed to 'clone' for initialization of the thread register. */
- diff --git a/sysdeps/sh/nptl/tls.h b/sysdeps/sh/nptl/tls.h
- index 1530489a6ce..3882114f5c8 100644
- --- a/sysdeps/sh/nptl/tls.h
- +++ b/sysdeps/sh/nptl/tls.h
- @@ -83,7 +83,7 @@ typedef struct
- special attention since 'errno' is not yet available and if the
- operation can cause a failure 'errno' must not be touched. */
- # define TLS_INIT_TP(tcbp) \
- - ({ __asm __volatile ("ldc %0,gbr" : : "r" (tcbp)); NULL; })
- + ({ __asm __volatile ("ldc %0,gbr" : : "r" (tcbp)); true; })
-
- # define TLS_DEFINE_INIT_TP(tp, pd) void *tp = (pd) + 1
-
- diff --git a/sysdeps/sparc/nptl/tls.h b/sysdeps/sparc/nptl/tls.h
- index 95a69cb8249..e8fbe40e7bb 100644
- --- a/sysdeps/sparc/nptl/tls.h
- +++ b/sysdeps/sparc/nptl/tls.h
- @@ -89,7 +89,7 @@ register struct pthread *__thread_self __asm__("%g7");
-
- /* Code to initially initialize the thread pointer. */
- # define TLS_INIT_TP(descr) \
- - (__thread_self = (__typeof (__thread_self)) (descr), NULL)
- + (__thread_self = (__typeof (__thread_self)) (descr), true)
-
- /* Value passed to 'clone' for initialization of the thread register. */
- # define TLS_DEFINE_INIT_TP(tp, pd) void *tp = (pd)
- diff --git a/sysdeps/unix/sysv/linux/arm/tls.h b/sysdeps/unix/sysv/linux/arm/tls.h
- index 9d1601af44c..045fad22751 100644
- --- a/sysdeps/unix/sysv/linux/arm/tls.h
- +++ b/sysdeps/unix/sysv/linux/arm/tls.h
- @@ -33,8 +33,7 @@
- # define TLS_INIT_TP(tcbp) \
- ({ long int result_var; \
- result_var = INTERNAL_SYSCALL_CALL (set_tls, (tcbp)); \
- - INTERNAL_SYSCALL_ERROR_P (result_var) \
- - ? "unknown error" : NULL; })
- + !INTERNAL_SYSCALL_ERROR_P (result_var); })
-
- #endif /* __ASSEMBLER__ */
-
- diff --git a/sysdeps/x86_64/nptl/tls.h b/sysdeps/x86_64/nptl/tls.h
- index 75f80209758..63744f63845 100644
- --- a/sysdeps/x86_64/nptl/tls.h
- +++ b/sysdeps/x86_64/nptl/tls.h
- @@ -156,7 +156,7 @@ _Static_assert (offsetof (tcbhead_t, __glibc_unused2) == 0x80,
- "S" (_thrdescr) \
- : "memory", "cc", "r11", "cx"); \
- \
- - _result ? "cannot set %fs base address for thread-local storage" : 0; \
- + _result == 0; \
- })
-
- # define TLS_DEFINE_INIT_TP(tp, pd) void *tp = (pd)
|