vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

RISC-V: Fix computation of pc-relative relocation offset

Browse source 
The offset calculation was missing the relocation addend.

Signed-off-by: Andreas Schwab <schwab@suse.de>
Tested-by: Chester Lin <clin@suse.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Andreas Schwab 2019-06-26 16:50:03 +02:00 committed by Daniel Kiper
parent 2d55ffecbb
commit 2bf40e9e5b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
util/grub-mkimagexx.c
View file

@ -1232,8 +1232,7 @@ SUFFIX (relocate_addrs) (Elf_Ehdr *e, struct section_metadata *smd,
grub_uint32_t *t32 = (grub_uint32_t *) target; grub_uint32_t *t32 = (grub_uint32_t *) target;
grub_uint16_t *t16 = (grub_uint16_t *) target; grub_uint16_t *t16 = (grub_uint16_t *) target;
grub_uint8_t *t8 = (grub_uint8_t *) target; grub_uint8_t *t8 = (grub_uint8_t *) target;
grub_int64_t off = (long)sym_addr - target_section_addr - offset grub_int64_t off;
- image_target->vaddr_offset;
/* /*
* Instructions and instruction encoding are documented in the RISC-V * Instructions and instruction encoding are documented in the RISC-V
@ -1243,6 +1242,7 @@ SUFFIX (relocate_addrs) (Elf_Ehdr *e, struct section_metadata *smd,
*/ */
sym_addr += addend; sym_addr += addend;
off = sym_addr - target_section_addr - offset - image_target->vaddr_offset;
switch (ELF_R_TYPE (info)) switch (ELF_R_TYPE (info))
{ {