fix rejection of dns responses with pointers past 512 byte offset

[musl] / arch / microblaze / reloc.h

diff --git a/arch/microblaze/reloc.h b/arch/microblaze/reloc.h
index 81add5e..6302c6e 100644 (file)
--- a/arch/microblaze/reloc.h
+++ b/arch/microblaze/reloc.h
@@ -1,51 +1,27 @@
-#include <string.h>
-#include <elf.h>
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define ENDIAN_SUFFIX "el"
+#else
+#define ENDIAN_SUFFIX ""
+#endif
 
-#define ETC_LDSO_PATH "/etc/ld-musl-microblaze.path"
+#define LDSO_ARCH "microblaze" ENDIAN_SUFFIX
 
-#define IS_COPY(x) ((x)==R_MICROBLAZE_COPY)
-#define IS_PLT(x) ((x)==R_MICROBLAZE_JUMP_SLOT)
+#define TPOFF_K 0
 
-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_MICROBLAZE_32:
-       case R_MICROBLAZE_GLOB_DAT:
-       case R_MICROBLAZE_JUMP_SLOT:
-               *reloc_addr = sym_val + addend;
-               break;
-       case R_MICROBLAZE_REL:
-               *reloc_addr = (size_t)base_addr + addend;
-               break;
-       case R_MICROBLAZE_COPY:
-               memcpy(reloc_addr, (void *)sym_val, sym_size);
-               break;
-       case R_MICROBLAZE_TLSDTPMOD32:
-               *reloc_addr = def.dso ? def.dso->tls_id : self->tls_id;
-               break;
-       case R_MICROBLAZE_TLSDTPREL32:
-               *reloc_addr = def.sym->st_value + addend;
-               break;
-       }
-}
+#define REL_SYMBOLIC    R_MICROBLAZE_32
+#define REL_GOT         R_MICROBLAZE_GLOB_DAT
+#define REL_PLT         R_MICROBLAZE_JUMP_SLOT
+#define REL_RELATIVE    R_MICROBLAZE_REL
+#define REL_COPY        R_MICROBLAZE_COPY
+#define REL_DTPMOD      R_MICROBLAZE_TLSDTPMOD32
+#define REL_DTPOFF      R_MICROBLAZE_TLSDTPREL32
 
-#include "syscall.h"
-void __reloc_self(int c, size_t *a, size_t *dynv)
-{
-       char dot = '.', ex = 'x';
-       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<20) t[*a] = a[1];
-       n = t[DT_RELASZ];
-       for (a=(void *)(base+t[DT_RELA]); n; a+=3, n-=12)
-               if (a[1]%256 == R_MICROBLAZE_REL)
-                       *(size_t *)(base+a[0]) = (size_t)base + a[2];
-}
+#define CRTJMP(pc,sp) __asm__ __volatile__( \
+       "addik r1,%1,0 ; bra %0" : : "r"(pc), "r"(sp) : "memory" )
+
+#define GETFUNCSYM(fp, sym, got) __asm__ ( \
+       ".hidden " #sym " \n" \
+       "       mfs %0, rpc \n" \
+       "       addik %0, %0, _GLOBAL_OFFSET_TABLE_+8 \n" \
+       "       addik %0, %0, " #sym "@GOTOFF \n" \
+       : "=r"(*(fp)) : : "memory" )