X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=arch%2Fi386%2Freloc.h;h=da0bc05dc72c4f00087e5e0c2d65c2741efd87f9;hb=e7257d3e63b10d4725450c383e94cdbb997d9151;hp=490113a0f367b86bf957a57ddc193f3720c79de2;hpb=32de61e81a64c8bb2cd23e3476f00433692f8e59;p=musl 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; } }