From 9c74856af78ac3e8aaa5f8b560e5022d2e6037d1 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Thu, 4 Oct 2012 22:48:33 -0400 Subject: dynamic-linked TLS support for everything but dlopen'd libs currently, only i386 is tested. x86_64 and arm should probably work. the necessary relocation types for mips and microblaze have not been added because I don't understand how they're supposed to work, and I'm not even sure if it's defined yet on microblaze. I may be able to reverse engineer the requirements out of gcc/binutils output. --- arch/arm/reloc.h | 17 ++++++++++++++++- arch/i386/reloc.h | 22 +++++++++++++++++++++- arch/microblaze/reloc.h | 6 +++++- arch/mips/reloc.h | 6 +++++- arch/x86_64/reloc.h | 17 ++++++++++++++++- 5 files changed, 63 insertions(+), 5 deletions(-) (limited to 'arch') diff --git a/arch/arm/reloc.h b/arch/arm/reloc.h index 10e89aa3..c37af07b 100644 --- a/arch/arm/reloc.h +++ b/arch/arm/reloc.h @@ -6,7 +6,11 @@ #define IS_COPY(x) ((x)==R_ARM_COPY) #define IS_PLT(x) ((x)==R_ARM_JUMP_SLOT) -static inline void do_single_reloc(size_t *reloc_addr, int type, size_t sym_val, size_t sym_size, unsigned char *base_addr, size_t addend) +static inline void do_single_reloc( + struct dso *self, unsigned char *base_addr, + size_t *reloc_addr, int type, size_t addend, + Sym *sym, size_t sym_size, + struct symdef def, size_t sym_val) { switch(type) { case R_ARM_ABS32: @@ -22,5 +26,16 @@ static inline void do_single_reloc(size_t *reloc_addr, int type, size_t sym_val, case R_ARM_COPY: memcpy(reloc_addr, (void *)sym_val, sym_size); break; + case R_ARM_TLS_DTPMOD32: + *reloc_addr = def.dso ? def.dso->tls_id : self->tls_id; + break; + case R_ARM_TLS_DTPOFF32: + *reloc_addr += def.sym->st_value; + break; + case R_ARM_TLS_TPOFF32: + *reloc_addr += def.sym + ? def.sym->st_value - def.dso->tls_offset + : 0 - self->tls_offset; + break; } } diff --git a/arch/i386/reloc.h b/arch/i386/reloc.h index 490113a0..da0bc05d 100644 --- a/arch/i386/reloc.h +++ b/arch/i386/reloc.h @@ -6,7 +6,11 @@ #define IS_COPY(x) ((x)==R_386_COPY) #define IS_PLT(x) ((x)==R_386_JMP_SLOT) -static inline void do_single_reloc(size_t *reloc_addr, int type, size_t sym_val, size_t sym_size, unsigned char *base_addr, size_t addend) +static inline void do_single_reloc( + struct dso *self, unsigned char *base_addr, + size_t *reloc_addr, int type, size_t addend, + Sym *sym, size_t sym_size, + struct symdef def, size_t sym_val) { switch(type) { case R_386_32: @@ -25,5 +29,21 @@ static inline void do_single_reloc(size_t *reloc_addr, int type, size_t sym_val, case R_386_COPY: memcpy(reloc_addr, (void *)sym_val, sym_size); break; + case R_386_TLS_DTPMOD32: + *reloc_addr = def.dso ? def.dso->tls_id : self->tls_id; + break; + case R_386_TLS_DTPOFF32: + *reloc_addr = def.sym->st_value; + break; + case R_386_TLS_TPOFF: + *reloc_addr += def.sym + ? def.sym->st_value - def.dso->tls_offset + : 0 - self->tls_offset; + break; + case R_386_TLS_TPOFF32: + *reloc_addr += def.sym + ? def.dso->tls_offset - def.sym->st_value + : self->tls_offset; + break; } } diff --git a/arch/microblaze/reloc.h b/arch/microblaze/reloc.h index 9f04f125..67cb3c2e 100644 --- a/arch/microblaze/reloc.h +++ b/arch/microblaze/reloc.h @@ -6,7 +6,11 @@ #define IS_COPY(x) ((x)==R_MICROBLAZE_COPY) #define IS_PLT(x) ((x)==R_MICROBLAZE_JUMP_SLOT) -static inline void do_single_reloc(size_t *reloc_addr, int type, size_t sym_val, size_t sym_size, unsigned char *base_addr, size_t addend) +static inline void do_single_reloc( + struct dso *self, unsigned char *base_addr, + size_t *reloc_addr, int type, size_t addend, + Sym *sym, size_t sym_size, + struct symdef def, size_t sym_val) { switch(type) { case R_MICROBLAZE_32: diff --git a/arch/mips/reloc.h b/arch/mips/reloc.h index e8925264..785489ed 100644 --- a/arch/mips/reloc.h +++ b/arch/mips/reloc.h @@ -6,7 +6,11 @@ #define IS_COPY(x) ((x)==R_MIPS_COPY) #define IS_PLT(x) 1 -static inline void do_single_reloc(size_t *reloc_addr, int type, size_t sym_val, size_t sym_size, unsigned char *base_addr, size_t addend) +static inline void do_single_reloc( + struct dso *self, unsigned char *base_addr, + size_t *reloc_addr, int type, size_t addend, + Sym *sym, size_t sym_size, + struct symdef def, size_t sym_val) { switch(type) { case R_MIPS_JUMP_SLOT: diff --git a/arch/x86_64/reloc.h b/arch/x86_64/reloc.h index b0bbfb3e..a09df337 100644 --- a/arch/x86_64/reloc.h +++ b/arch/x86_64/reloc.h @@ -7,7 +7,11 @@ #define IS_COPY(x) ((x)==R_X86_64_COPY) #define IS_PLT(x) ((x)==R_X86_64_JUMP_SLOT) -static inline void do_single_reloc(size_t *reloc_addr, int type, size_t sym_val, size_t sym_size, unsigned char *base_addr, size_t addend) +static inline void do_single_reloc( + struct dso *self, unsigned char *base_addr, + size_t *reloc_addr, int type, size_t addend, + Sym *sym, size_t sym_size, + struct symdef def, size_t sym_val) { switch(type) { case R_X86_64_GLOB_DAT: @@ -27,5 +31,16 @@ static inline void do_single_reloc(size_t *reloc_addr, int type, size_t sym_val, case R_X86_64_COPY: memcpy(reloc_addr, (void *)sym_val, sym_size); break; + case R_X86_64_TLS_DTPMOD64: + *reloc_addr = def.dso ? def.dso->tls_id : self->tls_id; + break; + case R_X86_64_TLS_DTPOFF64: + *reloc_addr = def.sym->st_value + addend; + break; + case R_X86_64_TLS_TPOFF64: + *reloc_addr = (def.sym + ? def.sym->st_value - def.dso->tls_offset + : 0 - self->tls_offset) + addend; + break; } } -- cgit v1.2.1