]>
Commit | Line | Data |
---|---|---|
64d0f1a0 AF |
1 | From 64be669638e198bc0c7c1a344547265dfacd2470 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | |
3 | Date: Mon, 23 Jan 2023 15:29:02 -0800 | |
4 | Subject: [PATCH] risc-v: Handle R_RISCV_CALL_PLT reloc | |
5 | ||
6 | GNU assembler starting 2.40 release always generates R_RISCV_CALL_PLT | |
7 | reloc for call in assembler [1], similarly llvm does not make | |
8 | distinction between R_RISCV_CALL_PLT and R_RISCV_CALL [2] | |
9 | ||
10 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/grub-devel/2023-02/msg00143.html] | |
11 | ||
12 | [1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=70f35d72ef04cd23771875c1661c9975044a749c | |
13 | [2] https://reviews.llvm.org/D132530 | |
14 | ||
15 | Upstream-Status: Pending | |
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | |
17 | --- | |
18 | grub-core/kern/riscv/dl.c | 1 + | |
19 | 1 file changed, 1 insertion(+) | |
20 | ||
21 | --- a/grub-core/kern/riscv/dl.c | |
22 | +++ b/grub-core/kern/riscv/dl.c | |
23 | @@ -188,6 +188,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t | |
24 | break; | |
25 | ||
26 | case R_RISCV_CALL: | |
27 | + case R_RISCV_CALL_PLT: | |
28 | { | |
29 | grub_uint32_t *abs_place = place; | |
30 | grub_ssize_t off = sym_addr - (grub_addr_t) place; | |
31 | --- a/util/grub-mkimagexx.c | |
32 | +++ b/util/grub-mkimagexx.c | |
33 | @@ -1294,6 +1294,7 @@ SUFFIX (relocate_addrs) (Elf_Ehdr *e, st | |
34 | } | |
35 | break; | |
36 | case R_RISCV_CALL: | |
37 | + case R_RISCV_CALL_PLT: | |
38 | { | |
39 | grub_uint32_t hi20, lo12; | |
40 | ||
41 | @@ -1725,6 +1726,7 @@ translate_relocation_pe (struct translat | |
42 | case R_RISCV_BRANCH: | |
43 | case R_RISCV_JAL: | |
44 | case R_RISCV_CALL: | |
45 | + case R_RISCV_CALL_PLT: | |
46 | case R_RISCV_PCREL_HI20: | |
47 | case R_RISCV_PCREL_LO12_I: | |
48 | case R_RISCV_PCREL_LO12_S: |