|
@@ -4,7 +4,7 @@
|
|
#define ETC_LDSO_PATH "/etc/ld-musl-mips.path"
|
|
#define ETC_LDSO_PATH "/etc/ld-musl-mips.path"
|
|
|
|
|
|
#define IS_COPY(x) ((x)==R_MIPS_COPY)
|
|
#define IS_COPY(x) ((x)==R_MIPS_COPY)
|
|
-#define IS_PLT(x) ((x)==R_MIPS_JUMP_SLOT)
|
|
|
|
|
|
+#define IS_PLT(x) 1
|
|
|
|
|
|
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(size_t *reloc_addr, int type, size_t sym_val, size_t sym_size, unsigned char *base_addr, size_t addend)
|
|
{
|
|
{
|
|
@@ -13,11 +13,61 @@ static inline void do_single_reloc(size_t *reloc_addr, int type, size_t sym_val,
|
|
*reloc_addr = sym_val;
|
|
*reloc_addr = sym_val;
|
|
break;
|
|
break;
|
|
case R_MIPS_REL32:
|
|
case R_MIPS_REL32:
|
|
- // FIXME: how do symbolic relocs come in here ?
|
|
|
|
- *reloc_addr += (size_t)base_addr;
|
|
|
|
|
|
+ if (sym_val) *reloc_addr += sym_val;
|
|
|
|
+ else *reloc_addr += (size_t)base_addr;
|
|
break;
|
|
break;
|
|
case R_MIPS_COPY:
|
|
case R_MIPS_COPY:
|
|
memcpy(reloc_addr, (void *)sym_val, sym_size);
|
|
memcpy(reloc_addr, (void *)sym_val, sym_size);
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+void __reloc_self(int c, size_t *a, size_t *dynv, size_t *got)
|
|
|
|
+{
|
|
|
|
+ char *base;
|
|
|
|
+ size_t t[20], n;
|
|
|
|
+ for (a+=c+1; *a; a++);
|
|
|
|
+ for (a++; *a; a+=2) if (*a<20) t[*a] = a[1];
|
|
|
|
+ base = (char *)t[AT_BASE];
|
|
|
|
+ if (!base) base = (char *)(t[AT_PHDR] & -4096);
|
|
|
|
+ for (a=dynv; *a; a+=2) if (*a-0x70000000UL<20) t[*a&31] = a[1];
|
|
|
|
+ n = t[DT_MIPS_LOCAL_GOTNO - 0x70000000];
|
|
|
|
+ for (a=got; n; a++, n--) *a += (size_t)base;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+static void do_relocs(unsigned char *base, size_t *rel, size_t rel_size, size_t stride, Sym *syms, char *strings, struct dso *dso);
|
|
|
|
+
|
|
|
|
+static void do_arch_relocs(struct dso *this, struct dso *head)
|
|
|
|
+{
|
|
|
|
+ unsigned char *base = this->base;
|
|
|
|
+ size_t *dynv = this->dynv;
|
|
|
|
+ size_t dyn[20] = {0};
|
|
|
|
+ size_t i;
|
|
|
|
+ size_t rel[2], got=0;
|
|
|
|
+ Sym *sym;
|
|
|
|
+
|
|
|
|
+ for (i=0; dynv[i]; i+=2) {
|
|
|
|
+ if (dynv[i]-0x70000000UL<20)
|
|
|
|
+ dyn[dynv[i]&31] = dynv[i+1];
|
|
|
|
+ else if (dynv[i] == DT_PLTGOT)
|
|
|
|
+ got = dynv[i+1];
|
|
|
|
+ }
|
|
|
|
+ i = dyn[DT_MIPS_LOCAL_GOTNO-0x70000000];
|
|
|
|
+ if (this->shortname && !strcmp(this->shortname, "libc.so")) {
|
|
|
|
+ got += sizeof(size_t) * i;
|
|
|
|
+ } else {
|
|
|
|
+ for (; i; i--, got+=sizeof(size_t))
|
|
|
|
+ *(size_t *)(base+got) += (size_t)base;
|
|
|
|
+ }
|
|
|
|
+ sym = this->syms + dyn[DT_MIPS_GOTSYM-0x70000000];
|
|
|
|
+ i = dyn[DT_MIPS_SYMTABNO-0x70000000] - dyn[DT_MIPS_GOTSYM-0x70000000];
|
|
|
|
+ for (; i; i--, got+=sizeof(size_t), sym++) {
|
|
|
|
+ rel[0] = got;
|
|
|
|
+ rel[1] = sym-this->syms << 8 | R_MIPS_JUMP_SLOT;
|
|
|
|
+ *(size_t *)(base+got) = 0;
|
|
|
|
+ do_relocs(base, rel, sizeof rel, 2, this->syms, this->strings, head);
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+#define NEED_ARCH_RELOCS 1
|
|
|
|
+#define DYNAMIC_IS_RO 1
|