elf: Always define TLS_TP_OFFSET

This will be needed to compute __rseq_offset outside of the TLS
relocation machinery.

Reviewed-by: Michael Jeanson <mjeanson@efficios.com>
This commit is contained in:
Florian Weimer 2025-01-09 19:30:44 +01:00
parent 9b71570c46
commit d1da011118
6 changed files with 70 additions and 0 deletions

View file

@ -322,6 +322,7 @@ tests := \
tests-internal := \
$(tests-static-internal) \
tst-tls1 \
tst-tls_tp_offset \
# tests-internal
tests-static := $(tests-static-normal) $(tests-static-internal)

57
elf/tst-tls_tp_offset.c Normal file
View file

@ -0,0 +1,57 @@
/* Check compile-time definition of TLS_TP_OFFSET against run-time value.
Copyright (C) 2025 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 <thread_pointer.h>
#include <dl-tls.h>
#include <link.h>
#include <pthread.h>
#include <stdint.h>
#include <stdio.h>
#include <support/check.h>
static __thread char thread_var __attribute__ ((tls_model ("initial-exec")));
static int
do_test (void)
{
printf ("thread variable address: %p\n", &thread_var);
printf ("thread pointer address: %p\n", __thread_pointer ());
printf ("pthread_self address: %p\n", (void *) pthread_self ());
ptrdiff_t block_offset = ((struct link_map *) _r_debug.r_map)->l_tls_offset;
printf ("main program TLS block offset: %td\n", block_offset);
if ((uintptr_t) &thread_var < (uintptr_t) pthread_self ())
{
puts("TLS variables are located before struct pthread.");
TEST_COMPARE (((intptr_t) __thread_pointer () - block_offset)
- (intptr_t) &thread_var,
TLS_TP_OFFSET);
}
else
{
puts("TLS variables are located after struct pthread.");
TEST_COMPARE (((intptr_t) __thread_pointer () + block_offset)
- (intptr_t) &thread_var,
TLS_TP_OFFSET);
}
return 0;
}
#include <support/test-driver.c>

View file

@ -33,4 +33,7 @@ extern void *__tls_get_addr (tls_index *ti);
TLS block. */
#define TLS_DTV_OFFSET 0
/* Static TLS offsets are relative to the unadjusted thread pointer. */
#define TLS_TP_OFFSET 0
#endif /* _DL_TLS_H */

View file

@ -28,6 +28,9 @@ typedef struct dl_tls_index
TLS block. */
#define TLS_DTV_OFFSET 0
/* Static TLS offsets are relative to the unadjusted thread pointer. */
#define TLS_TP_OFFSET 0
#ifdef SHARED
/* This is the prototype for the GNU version. */
extern void *___tls_get_addr (tls_index *ti)

View file

@ -28,6 +28,9 @@ typedef struct
TP-relative addresses. */
#define TLS_DTV_OFFSET (-(unsigned long int) __builtin_thread_pointer ())
/* Static TLS offsets are relative to the unadjusted thread pointer. */
#define TLS_TP_OFFSET 0
#ifdef SHARED
extern unsigned long __tls_get_offset (unsigned long got_offset);

View file

@ -35,4 +35,7 @@ extern void *__tls_get_addr (tls_index *ti);
TLS block. */
#define TLS_DTV_OFFSET 0
/* Static TLS offsets are relative to the unadjusted thread pointer. */
#define TLS_TP_OFFSET 0
#endif /* _X86_64_DL_TLS_H */