dynamic linker bootstrap overhaul

[musl] / arch / i386 / reloc.h

diff --git a/arch/i386/reloc.h b/arch/i386/reloc.h
index eaf5aae..b52ef40 100644 (file)
--- a/arch/i386/reloc.h
+++ b/arch/i386/reloc.h
@@ -1,33 +1,16 @@
-#include <string.h>
-#include <elf.h>
-
 #define LDSO_ARCH "i386"
 
-static int remap_rel(int type)
-{
-       switch(type) {
-       case R_386_32:
-               return REL_SYMBOLIC;
-       case R_386_PC32:
-               return REL_OFFSET;
-       case R_386_GLOB_DAT:
-               return REL_GOT;
-       case R_386_JMP_SLOT:
-               return REL_PLT;
-       case R_386_RELATIVE:
-               return REL_RELATIVE;
-       case R_386_COPY:
-               return REL_COPY;
-       case R_386_TLS_DTPMOD32:
-               return REL_DTPMOD;
-       case R_386_TLS_DTPOFF32:
-               return REL_DTPOFF;
-       case R_386_TLS_TPOFF:
-               return REL_TPOFF;
-       case R_386_TLS_TPOFF32:
-               return REL_TPOFF_NEG;
-       case R_386_TLS_DESC:
-               return REL_TLSDESC;
-       }
-       return 0;
-}
+#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 CRTJMP(pc,sp) __asm__ __volatile__( \
+       "mov %1,%%esp ; jmp *%0" : : "r"(pc), "r"(sp) : "memory" )