Author: jhibbits
Date: Tue Jan 1 20:12:58 2019
New Revision: 342671
URL: https://svnweb.freebsd.org/changeset/base/342671
Log:
rtld-elf: Fix powerpc64 TLS handling, matching powerpc's fix
We need to subtract the TLS_TCB_SIZE to get to the real data pointer, since
r13 points to the end of the TCB structure. Prior to this, devel/protobuf-c
port broke with recent update to devel/protobuf, which exposed this issue.
Submitted by: andreast
Reported by: Piotr Kubaj
MFC after: 1 week
Modified:
head/libexec/rtld-elf/powerpc64/reloc.c
Modified: head/libexec/rtld-elf/powerpc64/reloc.c
==============================================================================
--- head/libexec/rtld-elf/powerpc64/reloc.c Tue Jan 1 19:56:49 2019
(r342670)
+++ head/libexec/rtld-elf/powerpc64/reloc.c Tue Jan 1 20:12:58 2019
(r342671)
@@ -256,7 +256,7 @@ reloc_nonplt_object(Obj_Entry *obj_rtld __unused, Obj_
*(Elf_Addr **)where = *where * sizeof(Elf_Addr)
+ (Elf_Addr *)(def->st_value + rela->r_addend
- + defobj->tlsoffset - TLS_TP_OFFSET);
+ + defobj->tlsoffset - TLS_TP_OFFSET - TLS_TCB_SIZE);
break;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
