X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=arch%2Fi386%2Freloc.h;h=da0bc05dc72c4f00087e5e0c2d65c2741efd87f9;hp=3ca9d11dba17729b353aa43cefecf35f6c7840a6;hb=12e9b4faf68a1a02ebf5ad69c03ac10f170f14cb;hpb=568b8075a4406ca8cb1f718e74fd0829cb7f0b90

diff --git a/arch/i386/reloc.h b/arch/i386/reloc.h
index 3ca9d11d..da0bc05d 100644
--- a/arch/i386/reloc.h
+++ b/arch/i386/reloc.h
@@ -4,8 +4,13 @@
 #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:
@@ -24,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;
 	}
 }