From 8a6489818b5d30524092b3b9524aabbfc172a882 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 23 Feb 2023 13:15:08 -0800 Subject: [PATCH] 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 --- grub-core/kern/riscv/dl.c | 1 + util/grub-mkimagexx.c | 2 ++ 2 files changed, 3 insertions(+) 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 8ac9248d1..19cec945a 100644 --- a/util/grub-mkimagexx.c +++ b/util/grub-mkimagexx.c @@ -1331,6 +1331,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; @@ -1763,6 +1764,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: -- 2.39.2