diff options
| -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 9a0035f..b25d599 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 ae96daa..e3c10e6 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 d4fbbd0..4580278 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 1791ffe..5d83e27 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 b4e800c..1ce3054 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 3ddb73e..5d8d21d 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 fc4b9bf..52d67a1 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 302fd02..467c0b6 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 6110d9e..a08555f 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; } |