diff options
| author | Rich Felker <dalias@aerifal.cx> | 2012-10-04 22:48:33 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2012-10-04 22:48:33 -0400 |
| commit | 9c74856af78ac3e8aaa5f8b560e5022d2e6037d1 (patch) | |
| tree | 2cab0360309f85ae6ec132ac46d4d31cd7038abb /arch/x86_64 | |
| parent | c91aa03d2488ef2c48276510dec360ed9582e861 (diff) | |
| download | musl-9c74856af78ac3e8aaa5f8b560e5022d2e6037d1.tar.gz musl-9c74856af78ac3e8aaa5f8b560e5022d2e6037d1.tar.bz2 musl-9c74856af78ac3e8aaa5f8b560e5022d2e6037d1.tar.xz musl-9c74856af78ac3e8aaa5f8b560e5022d2e6037d1.zip | |
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.
Diffstat (limited to 'arch/x86_64')
| -rw-r--r-- | arch/x86_64/reloc.h | 17 |
1 files changed, 16 insertions, 1 deletions
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; } } |