From: Rich Felker <dalias@aerifal.cx>
Date: Tue, 17 Jun 2014 18:32:43 +0000 (-0400)
Subject: fix powerpc dynamic linker thread-pointer-relative relocations
X-Git-Tag: v1.0.4~26
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f70401eae5c5ca3db2fbf8c7bf758eca40ab5bc3;p=oweals%2Fmusl.git

fix powerpc dynamic linker thread-pointer-relative relocations

processing of R_PPC_TPREL32 was ignoring the addend provided by the
RELA-style relocation and instead using the inline value as the
addend. this presumably broke dynamic-linked access to initial TLS in
cases where the addend was nonzero.

(cherry picked from commit 94cf991bf4b18bb87a15a96e7b5e7d92fab787ba)
---

diff --git a/arch/powerpc/reloc.h b/arch/powerpc/reloc.h
index 38034c56..6b98a7ca 100644
--- a/arch/powerpc/reloc.h
+++ b/arch/powerpc/reloc.h
@@ -32,9 +32,9 @@ static inline void do_single_reloc(
 		*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;
+		*reloc_addr = (def.sym
+			? def.sym->st_value + def.dso->tls_offset
+			: self->tls_offset) - 0x7000 + addend;
 		break;
 	}
 }