Author: andrew
Date: Sun Jul 5 11:42:01 2015
New Revision: 285159
URL: https://svnweb.freebsd.org/changeset/base/285159
Log:
Add on the addend when in the R_AARCH64_ABS64 and R_AARCH64_GLOB_DAT cases.
This fixes at least sshd, and some of the boehm-gc tests.
Sponsored by: ABT Systems Ltd
Modified:
head/libexec/rtld-elf/aarch64/reloc.c
Modified: head/libexec/rtld-elf/aarch64/reloc.c
==============================================================================
--- head/libexec/rtld-elf/aarch64/reloc.c Sun Jul 5 10:14:34 2015
(r285158)
+++ head/libexec/rtld-elf/aarch64/reloc.c Sun Jul 5 11:42:01 2015
(r285159)
@@ -341,7 +341,8 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry
if (def == NULL)
return (-1);
- *where = (Elf_Addr)defobj->relocbase + def->st_value;
+ *where = (Elf_Addr)defobj->relocbase + def->st_value +
+ rela->r_addend;
break;
case R_AARCH64_COPY:
/*
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
