diff options
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/pthread_arch.h | 9 | ||||
| -rw-r--r-- | arch/arm/reloc.h | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/arch/arm/pthread_arch.h b/arch/arm/pthread_arch.h index 5f96f2b0..43a1c012 100644 --- a/arch/arm/pthread_arch.h +++ b/arch/arm/pthread_arch.h @@ -1,6 +1,9 @@ -typedef pthread_t (*__pthread_self_func_t)(void) __attribute__((const)); +typedef char *(*__ptr_func_t)(void) __attribute__((const)); -#define __pthread_self ((__pthread_self_func_t)0xffff0fe0) +#define __pthread_self() \ + ((pthread_t)(((__ptr_func_t)0xffff0fe0)()+8-sizeof(struct pthread))) + +#define TLS_ABOVE_TP +#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) - 8) -#define CANCEL_REG_SP 16 #define CANCEL_REG_IP 18 diff --git a/arch/arm/reloc.h b/arch/arm/reloc.h index c37af07b..b41314de 100644 --- a/arch/arm/reloc.h +++ b/arch/arm/reloc.h @@ -34,8 +34,8 @@ static inline void do_single_reloc( break; case R_ARM_TLS_TPOFF32: *reloc_addr += def.sym - ? def.sym->st_value - def.dso->tls_offset - : 0 - self->tls_offset; + ? def.sym->st_value + def.dso->tls_offset + 8 + : self->tls_offset + 8; break; } } |