From: Khem Raj Date: Thu, 23 Feb 2023 21:15:08 +0000 (-0800) Subject: RISC-V: Handle R_RISCV_CALL_PLT reloc X-Git-Tag: grub-2.12-rc1~121 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=403d6540cd608b2706cfa0cb4713f7e4b490ff45;p=thirdparty%2Fgrub.git RISC-V: Handle R_RISCV_CALL_PLT reloc GNU assembler starting 2.40 release always generates R_RISCV_CALL_PLT reloc for call in assembler [1], similarly LLVM does not make distinction between R_RISCV_CALL_PLT and R_RISCV_CALL [2]. Fixes "grub-mkimage: error: relocation 0x13 is not implemented yet.". [1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=70f35d72ef04cd23771875c1661c9975044a749c [2] https://reviews.llvm.org/D132530 Signed-off-by: Khem Raj Reviewed-by: Daniel Kiper --- diff --git a/grub-core/kern/riscv/dl.c b/grub-core/kern/riscv/dl.c index f26b12aaa..896653bb4 100644 --- a/grub-core/kern/riscv/dl.c +++ b/grub-core/kern/riscv/dl.c @@ -188,6 +188,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr, break; case R_RISCV_CALL: + case R_RISCV_CALL_PLT: { grub_uint32_t *abs_place = place; grub_ssize_t off = sym_addr - (grub_addr_t) place; diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c index a1927e786..c5fb336e9 100644 --- a/util/grub-mkimagexx.c +++ b/util/grub-mkimagexx.c @@ -1294,6 +1294,7 @@ SUFFIX (relocate_addrs) (Elf_Ehdr *e, struct section_metadata *smd, } break; case R_RISCV_CALL: + case R_RISCV_CALL_PLT: { grub_uint32_t hi20, lo12; @@ -1726,6 +1727,7 @@ translate_relocation_pe (struct translate_context *ctx, case R_RISCV_BRANCH: case R_RISCV_JAL: case R_RISCV_CALL: + case R_RISCV_CALL_PLT: case R_RISCV_PCREL_HI20: case R_RISCV_PCREL_LO12_I: case R_RISCV_PCREL_LO12_S: