X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=arch%2Fpowerpc%2Freloc.h;h=80b9ebc9812bd53e5b1c2f0546d7d7d165d9da09;hb=9448b0513e2eec020fbca9c10412b83df5027a16;hp=58e482d6b819886f2bd673e958b56c0ca9b04407;hpb=1c8eb8bad791fe9d01d0d4ab77882db634fa933d;p=musl

diff --git a/arch/powerpc/reloc.h b/arch/powerpc/reloc.h
index 58e482d6..80b9ebc9 100644
--- a/arch/powerpc/reloc.h
+++ b/arch/powerpc/reloc.h
@@ -1,7 +1,7 @@
 #include <string.h>
 #include <elf.h>
 
-#define ETC_LDSO_PATH "/etc/ld-musl-powerpc.path"
+#define LDSO_ARCH "powerpc" ENDIAN_SUFFIX
 
 #define IS_COPY(x) ((x)==R_PPC_COPY)
 #define IS_PLT(x) ((x)==R_PPC_JMP_SLOT)
@@ -16,21 +16,40 @@ static inline void do_single_reloc(
 	switch(type) {
 	case R_PPC_GLOB_DAT:
 	case R_PPC_JMP_SLOT:
-		*reloc_addr = sym_val;
-		break;
-	case R_PPC_REL32:
-		if (sym_val) *reloc_addr += sym_val;
-		else *reloc_addr += (size_t)base_addr;
+	case R_PPC_ADDR32:
+		*reloc_addr = sym_val + addend;
 		break;
 	case R_PPC_COPY:
 		memcpy(reloc_addr, (void *)sym_val, sym_size);
 		break;
 	case R_PPC_RELATIVE:
-		*reloc_addr += (size_t)base_addr;
+		*reloc_addr = (size_t)base_addr + addend;
 		break;
-	//case R_PPC64_DTPMOD64:  //R_X86_64_DTPMOD64:
-	case R_PPC_DTPMOD32:  //R_386_TLS_DTPMOD32:
+	case R_PPC_DTPMOD32:
 		*reloc_addr = def.dso ? def.dso->tls_id : self->tls_id;
 		break;
+	case R_PPC_DTPREL32:
+		*reloc_addr = def.sym->st_value + addend;
+		break;
+	case R_PPC_TPREL32:
+		*reloc_addr += def.sym
+			? def.sym->st_value + def.dso->tls_offset - 0x7000
+			: self->tls_offset - 0x7000;
+		break;
 	}
 }
+
+void __reloc_self(int c, size_t *a, size_t *dynv)
+{
+	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_PPC_RELATIVE)
+			*(size_t *)(base+a[0]) = (size_t)base + a[2];
+}