mirror of
https://sourceware.org/git/glibc.git
synced 2025-08-07 06:43:00 +03:00
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>
This commit is contained in:
@@ -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. */
|
||||
|
@@ -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;
|
||||
}
|
||||
|
@@ -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)
|
||||
|
@@ -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;
|
||||
}
|
||||
|
@@ -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)
|
||||
|
@@ -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;
|
||||
}
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -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. */
|
||||
|
@@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user