X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=arch%2Fi386%2Freloc.h;h=da0bc05dc72c4f00087e5e0c2d65c2741efd87f9;hp=02b5fa0291679416963ac6a7414eacae2ee305ec;hb=5e642b5a2395893873affa2a121a694943b3f4e0;hpb=51e2d8310222ddd4d4e895f55c627100d863aa95 diff --git a/arch/i386/reloc.h b/arch/i386/reloc.h index 02b5fa02..da0bc05d 100644 --- a/arch/i386/reloc.h +++ b/arch/i386/reloc.h @@ -1,9 +1,16 @@ #include #include +#define ETC_LDSO_PATH "/etc/ld-musl-i386.path" + #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: @@ -22,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; } }