diff options
| author | Florian Weimer <fweimer@redhat.com> | 2025-01-02 13:45:27 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2025-01-02 13:45:27 +0100 |
| commit | cc74583f23657515b1d09d0765032422af71de52 (patch) | |
| tree | 3fc3b63128ff27d179d33579ef3278dbdbd8a6bc /sysdeps | |
| parent | 30e32da6aafcef5a5d5a1c91e233636db6493fc8 (diff) | |
| download | glibc-cc74583f23657515b1d09d0765032422af71de52.tar.xz glibc-cc74583f23657515b1d09d0765032422af71de52.zip | |
elf: Remove the remaining uses of GET_ADDR_OFFSET
Expand the macro where it is used in static definitions of
__tls_get_addr.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/loongarch/dl-tls.h | 1 | ||||
| -rw-r--r-- | sysdeps/loongarch/libc-tls.c | 2 | ||||
| -rw-r--r-- | sysdeps/m68k/dl-tls.h | 1 | ||||
| -rw-r--r-- | sysdeps/m68k/libc-tls.c | 2 | ||||
| -rw-r--r-- | sysdeps/mips/dl-tls.h | 3 | ||||
| -rw-r--r-- | sysdeps/mips/libc-tls.c | 2 | ||||
| -rw-r--r-- | sysdeps/powerpc/dl-tls.h | 1 | ||||
| -rw-r--r-- | sysdeps/riscv/dl-tls.h | 1 | ||||
| -rw-r--r-- | sysdeps/riscv/libc-tls.c | 2 |
9 files changed, 5 insertions, 10 deletions
diff --git a/sysdeps/loongarch/dl-tls.h b/sysdeps/loongarch/dl-tls.h index 9a0035fd46..b25d599882 100644 --- a/sysdeps/loongarch/dl-tls.h +++ b/sysdeps/loongarch/dl-tls.h @@ -42,7 +42,6 @@ extern void *__tls_get_addr (tls_index *ti); /* Compute the value for a DTPREL reloc. */ #define TLS_DTPREL_VALUE(sym) ((sym)->st_value - TLS_DTV_OFFSET) -#define GET_ADDR_OFFSET (ti->ti_offset + TLS_DTV_OFFSET) #define __TLS_GET_ADDR(__ti) (__tls_get_addr (__ti) - TLS_DTV_OFFSET) /* Value used for dtv entries for which the allocation is delayed. */ diff --git a/sysdeps/loongarch/libc-tls.c b/sysdeps/loongarch/libc-tls.c index ae96daa4b9..e3c10e664d 100644 --- a/sysdeps/loongarch/libc-tls.c +++ b/sysdeps/loongarch/libc-tls.c @@ -28,5 +28,5 @@ void * __tls_get_addr (tls_index *ti) { dtv_t *dtv = THREAD_DTV (); - return (char *) dtv[1].pointer.val + GET_ADDR_OFFSET; + return (char *) dtv[1].pointer.val + ti->ti_offset + TLS_DTV_OFFSET; } diff --git a/sysdeps/m68k/dl-tls.h b/sysdeps/m68k/dl-tls.h index d4fbbd081b..458027868f 100644 --- a/sysdeps/m68k/dl-tls.h +++ b/sysdeps/m68k/dl-tls.h @@ -42,5 +42,4 @@ typedef struct extern void *__tls_get_addr (tls_index *ti); -#define GET_ADDR_OFFSET (ti->ti_offset + TLS_DTV_OFFSET) #define __TLS_GET_ADDR(__ti) (__tls_get_addr (__ti) - TLS_DTV_OFFSET) diff --git a/sysdeps/m68k/libc-tls.c b/sysdeps/m68k/libc-tls.c index 1791ffe4aa..5d83e27ee5 100644 --- a/sysdeps/m68k/libc-tls.c +++ b/sysdeps/m68k/libc-tls.c @@ -28,5 +28,5 @@ void * __tls_get_addr (tls_index *ti) { dtv_t *dtv = THREAD_DTV (); - return (char *) dtv[1].pointer.val + GET_ADDR_OFFSET; + return (char *) dtv[1].pointer.val + ti->ti_offset + TLS_DTV_OFFSET; } diff --git a/sysdeps/mips/dl-tls.h b/sysdeps/mips/dl-tls.h index b4e800cddd..1ce3054bbb 100644 --- a/sysdeps/mips/dl-tls.h +++ b/sysdeps/mips/dl-tls.h @@ -41,5 +41,4 @@ typedef struct extern void *__tls_get_addr (tls_index *ti); -# define GET_ADDR_OFFSET (ti->ti_offset + TLS_DTV_OFFSET) -# define __TLS_GET_ADDR(__ti) (__tls_get_addr (__ti) - TLS_DTV_OFFSET) +#define __TLS_GET_ADDR(__ti) (__tls_get_addr (__ti) - TLS_DTV_OFFSET) diff --git a/sysdeps/mips/libc-tls.c b/sysdeps/mips/libc-tls.c index 3ddb73e481..5d8d21d2bb 100644 --- a/sysdeps/mips/libc-tls.c +++ b/sysdeps/mips/libc-tls.c @@ -28,5 +28,5 @@ void * __tls_get_addr (tls_index *ti) { dtv_t *dtv = THREAD_DTV (); - return (char *) dtv[1].pointer.val + GET_ADDR_OFFSET; + return (char *) dtv[1].pointer.val + ti->ti_offset + TLS_DTV_OFFSET; } diff --git a/sysdeps/powerpc/dl-tls.h b/sysdeps/powerpc/dl-tls.h index fc4b9bfa39..52d67a1fa1 100644 --- a/sysdeps/powerpc/dl-tls.h +++ b/sysdeps/powerpc/dl-tls.h @@ -45,7 +45,6 @@ typedef struct #ifdef SHARED extern void *__tls_get_addr (tls_index *ti); -# define GET_ADDR_OFFSET (ti->ti_offset + TLS_DTV_OFFSET) # define __TLS_GET_ADDR(__ti) (__tls_get_addr (__ti) - TLS_DTV_OFFSET) #endif diff --git a/sysdeps/riscv/dl-tls.h b/sysdeps/riscv/dl-tls.h index 302fd0252d..467c0b6179 100644 --- a/sysdeps/riscv/dl-tls.h +++ b/sysdeps/riscv/dl-tls.h @@ -41,7 +41,6 @@ typedef struct extern void *__tls_get_addr (tls_index *ti); -#define GET_ADDR_OFFSET (ti->ti_offset + TLS_DTV_OFFSET) #define __TLS_GET_ADDR(__ti) (__tls_get_addr (__ti) - TLS_DTV_OFFSET) /* Value used for dtv entries for which the allocation is delayed. */ diff --git a/sysdeps/riscv/libc-tls.c b/sysdeps/riscv/libc-tls.c index 6110d9ed62..a08555f81a 100644 --- a/sysdeps/riscv/libc-tls.c +++ b/sysdeps/riscv/libc-tls.c @@ -28,5 +28,5 @@ void * __tls_get_addr (tls_index *ti) { dtv_t *dtv = THREAD_DTV (); - return (char *) dtv[1].pointer.val + GET_ADDR_OFFSET; + return (char *) dtv[1].pointer.val + ti->ti_offset + TLS_DTV_OFFSET; } |