X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=arch%2Fi386%2Freloc.h;h=032f454bda5f2898f841f9bcb925976dd602166c;hb=4df42163511182bfd6fc55e85250b93786dcce7e;hp=da0bc05dc72c4f00087e5e0c2d65c2741efd87f9;hpb=9c74856af78ac3e8aaa5f8b560e5022d2e6037d1;p=musl

diff --git a/arch/i386/reloc.h b/arch/i386/reloc.h
index da0bc05d..032f454b 100644
--- a/arch/i386/reloc.h
+++ b/arch/i386/reloc.h
@@ -1,49 +1,23 @@
-#include <string.h>
-#include <elf.h>
+#define LDSO_ARCH "i386"
 
-#define ETC_LDSO_PATH "/etc/ld-musl-i386.path"
+#define REL_SYMBOLIC    R_386_32
+#define REL_OFFSET      R_386_PC32
+#define REL_GOT         R_386_GLOB_DAT
+#define REL_PLT         R_386_JMP_SLOT
+#define REL_RELATIVE    R_386_RELATIVE
+#define REL_COPY        R_386_COPY
+#define REL_DTPMOD      R_386_TLS_DTPMOD32
+#define REL_DTPOFF      R_386_TLS_DTPOFF32
+#define REL_TPOFF       R_386_TLS_TPOFF
+#define REL_TPOFF_NEG   R_386_TLS_TPOFF32
+#define REL_TLSDESC     R_386_TLS_DESC
 
-#define IS_COPY(x) ((x)==R_386_COPY)
-#define IS_PLT(x) ((x)==R_386_JMP_SLOT)
+#define CRTJMP(pc,sp) __asm__ __volatile__( \
+	"mov %1,%%esp ; jmp *%0" : : "r"(pc), "r"(sp) : "memory" )
 
-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:
-		*reloc_addr += sym_val;
-		break;
-	case R_386_PC32:
-		*reloc_addr += sym_val - (size_t)reloc_addr;
-		break;
-	case R_386_GLOB_DAT:
-	case R_386_JMP_SLOT:
-		*reloc_addr = sym_val;
-		break;
-	case R_386_RELATIVE:
-		*reloc_addr += (size_t)base_addr;
-		break;
-	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;
-	}
-}
+#define GETFUNCSYM(fp, sym, got) __asm__ ( \
+	".hidden " #sym "\n" \
+	"	call 1f\n" \
+	"1:	addl $" #sym "-.,(%%esp)\n" \
+	"	pop %0" \
+	: "=r"(*fp) : : "memory" )