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>

diff --git a/sysdeps/loongarch/dl-tls.h b/sysdeps/loongarch/dl-tls.h
index 9a0035fd4654a3155d0c2cecbfe67690f9b6d59e..b25d59988257239565ad925eed8910bdbe90015c 100644 (file)
--- 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 ae96daa4b9b64bcec7f4f774de1a8a65beb9570a..e3c10e664d6371d1bcc97e9fe86b07a9ef682687 100644 (file)
--- 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 d4fbbd081b0c2356adf2bcfdf357d0117c7045a7..458027868f0ed792286ad09c7ecc8d4431104c9f 100644 (file)
--- 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 1791ffe4aa04e78e6af8ec340b84a48111629a98..5d83e27ee594e18ebcd95002d4f238dd2a7987ea 100644 (file)
--- 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 b4e800cddd5cc8a0ff310f5c0e46e3810ce00d27..1ce3054bbb4457e426aeb641f1fe68e496b52f0e 100644 (file)
--- 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 3ddb73e4817fa89ee7a9819ca55148b2360291f3..5d8d21d2bb9abf1f543c035a04d4ad4c58c6dd55 100644 (file)
--- 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 fc4b9bfa393f90e3a60e32f1daf652767d6d7b9d..52d67a1fa1aa8b71e2371c2f53fe619b83f5e6e8 100644 (file)
--- 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 302fd0252d5b67e5b735ff36edca4303698cb8c1..467c0b617935b63de0ad9888006c45336eac6ea1 100644 (file)
--- 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 6110d9ed62a964cbc6a8b5993dea3893df66082e..a08555f81af662296ae33a37fa7511893910fdfd 100644 (file)
--- 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;
 }