diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/internal/pthread_impl.h | 4 | ||||
| -rw-r--r-- | src/ldso/dynlink.c | 6 | ||||
| -rw-r--r-- | src/thread/__tls_get_addr.c | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h index e29f9c82..3890bb56 100644 --- a/src/internal/pthread_impl.h +++ b/src/internal/pthread_impl.h @@ -94,6 +94,10 @@ struct __timer { #define CANARY canary #endif +#ifndef DTP_OFFSET +#define DTP_OFFSET 0 +#endif + #define SIGTIMER 32 #define SIGCANCEL 33 #define SIGSYNCCALL 34 diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c index b77c6f6b..d2a72492 100644 --- a/src/ldso/dynlink.c +++ b/src/ldso/dynlink.c @@ -337,7 +337,7 @@ static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stri *reloc_addr = def.dso->tls_id; break; case REL_DTPOFF: - *reloc_addr = tls_val + addend; + *reloc_addr = tls_val + addend - DTP_OFFSET; break; #ifdef TLS_ABOVE_TP case REL_TPOFF: @@ -1102,7 +1102,7 @@ void *__tls_get_new(size_t *v) __block_all_sigs(&set); if (v[0]<=(size_t)self->dtv[0]) { __restore_sigs(&set); - return (char *)self->dtv[v[0]]+v[1]; + return (char *)self->dtv[v[0]]+v[1]+DTP_OFFSET; } /* This is safe without any locks held because, if the caller @@ -1135,7 +1135,7 @@ void *__tls_get_new(size_t *v) if (p->tls_id == v[0]) break; } __restore_sigs(&set); - return mem + v[1]; + return mem + v[1] + DTP_OFFSET; } static void update_tls_size() diff --git a/src/thread/__tls_get_addr.c b/src/thread/__tls_get_addr.c index 36333967..84a413d4 100644 --- a/src/thread/__tls_get_addr.c +++ b/src/thread/__tls_get_addr.c @@ -8,9 +8,9 @@ void *__tls_get_addr(size_t *v) __attribute__((__visibility__("hidden"))) void *__tls_get_new(size_t *); if (v[0]<=(size_t)self->dtv[0]) - return (char *)self->dtv[v[0]]+v[1]; + return (char *)self->dtv[v[0]]+v[1]+DTP_OFFSET; return __tls_get_new(v); #else - return (char *)self->dtv[1]+v[1]; + return (char *)self->dtv[1]+v[1]+DTP_OFFSET; #endif } |