summaryrefslogtreecommitdiff
path: root/arch/i386
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2012-10-04 22:48:33 -0400
committerRich Felker <dalias@aerifal.cx>2012-10-04 22:48:33 -0400
commit9c74856af78ac3e8aaa5f8b560e5022d2e6037d1 (patch)
tree2cab0360309f85ae6ec132ac46d4d31cd7038abb /arch/i386
parentc91aa03d2488ef2c48276510dec360ed9582e861 (diff)
downloadmusl-9c74856af78ac3e8aaa5f8b560e5022d2e6037d1.tar.gz
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/i386')
-rw-r--r--arch/i386/reloc.h22
1 files changed, 21 insertions, 1 deletions
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;
}
}