Correct the offset of static TLS variables for Initial-Exec on RISC-V.

TP points to the start of the TLS block after the tcb, but
Obj_Entry.tlsoffset includes the tcb, so subtract the size of the tcb
to compute the offset relative to TP.

This is identical to the same fixes for powerpc in r339072 and r342671.

Reviewed by:	James Clarke
Sponsored by:	DARPA
Differential Revision:	https://reviews.freebsd.org/D22661
This commit is contained in:
John Baldwin 2019-12-10 21:56:44 +00:00
parent f24f20f435
commit 15d0350503

View File

@ -354,7 +354,7 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry *obj_rtld, int flags,
}
*where = (def->st_value + rela->r_addend +
defobj->tlsoffset - TLS_TP_OFFSET);
defobj->tlsoffset - TLS_TP_OFFSET - TLS_TCB_SIZE);
break;
case R_RISCV_RELATIVE:
*where = (Elf_Addr)(obj->relocbase + rela->r_addend);