move MREMAP_MAYMOVE and MREMAP_FIXED out of bits

[musl] / arch / sh / reloc.h

diff --git a/arch/sh/reloc.h b/arch/sh/reloc.h
index db3de08..aeb02d0 100644 (file)
--- a/arch/sh/reloc.h
+++ b/arch/sh/reloc.h
@@ -6,42 +6,29 @@
 
 #define LDSO_ARCH "sh" ENDIAN_SUFFIX
 
-#define IS_COPY(x) ((x) == R_SH_COPY)
-#define IS_PLT(x)  ((x) == R_SH_JMP_SLOT)
+#define TPOFF_K 8
 
-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)
+static int remap_rel(int type)
 {
        switch(type) {
+       case R_SH_DIR32:
+               return REL_SYMBOLIC;
+       case R_SH_REL32:
+               return REL_OFFSET;
        case R_SH_GLOB_DAT:
+               return REL_GOT;
        case R_SH_JMP_SLOT:
-               *reloc_addr = sym_val;
-               break;
+               return REL_PLT;
        case R_SH_RELATIVE:
-               *reloc_addr = (size_t)base_addr + addend;
-               break;
-       case R_SH_DIR32:
-               *reloc_addr = sym_val + addend;
-               break;
-       case R_SH_REL32:
-               *reloc_addr = sym_val + addend - (size_t)reloc_addr + (size_t)base_addr;
-               break;
+               return REL_RELATIVE;
        case R_SH_COPY:
-               memcpy(reloc_addr, (void *)sym_val, sym_size);
-               break;
+               return REL_COPY;
        case R_SH_TLS_DTPMOD32:
-               *reloc_addr += def.dso ? def.dso->tls_id : self->tls_id;
-               break;
+               return REL_DTPMOD;
        case R_SH_TLS_DTPOFF32:
-               *reloc_addr += def.sym->st_value;
-               break;
+               return REL_DTPOFF;
        case R_SH_TLS_TPOFF32:
-               *reloc_addr += def.sym
-                       ? def.sym->st_value + def.dso->tls_offset + 8
-                       : self->tls_offset + 8;
-               break;
+               return REL_TPOFF;
        }
+       return 0;
 }