]>
Commit | Line | Data |
---|---|---|
4987d0ed MT |
1 | From 02702bdfe14d8a04643a45b03715f734ae34dbac Mon Sep 17 00:00:00 2001 |
2 | From: "H.J. Lu" <hjl.tools@gmail.com> | |
3 | Date: Sat, 17 Feb 2018 06:47:28 -0800 | |
4 | Subject: x86-64: Treat R_X86_64_PLT32 as R_X86_64_PC32 | |
5 | ||
6 | Starting from binutils commit bd7ab16b4537788ad53521c45469a1bdae84ad4a: | |
7 | ||
8 | https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=bd7ab16b4537788ad53521c45469a1bdae84ad4a | |
9 | ||
10 | x86-64 assembler generates R_X86_64_PLT32, instead of R_X86_64_PC32, for | |
11 | 32-bit PC-relative branches. Grub2 should treat R_X86_64_PLT32 as | |
12 | R_X86_64_PC32. | |
13 | ||
14 | Signed-off-by: H.J. Lu <hjl.tools@gmail.com> | |
15 | Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> | |
16 | ||
17 | Origin: upstream, https://git.savannah.gnu.org/cgit/grub.git/commit/?id=842c390469e2c2e10b5aa36700324cd3bde25875 | |
18 | Last-Update: 2018-07-30 | |
19 | ||
20 | Patch-Name: R_X86_64_PLT32.patch | |
21 | --- | |
22 | grub-core/efiemu/i386/loadcore64.c | 1 + | |
23 | grub-core/kern/x86_64/dl.c | 1 + | |
24 | util/grub-mkimagexx.c | 1 + | |
25 | util/grub-module-verifier.c | 1 + | |
26 | 4 files changed, 4 insertions(+) | |
27 | ||
28 | diff --git a/grub-core/efiemu/i386/loadcore64.c b/grub-core/efiemu/i386/loadcore64.c | |
29 | index e49d0b6ff..18facf47f 100644 | |
30 | --- a/grub-core/efiemu/i386/loadcore64.c | |
31 | +++ b/grub-core/efiemu/i386/loadcore64.c | |
32 | @@ -98,6 +98,7 @@ grub_arch_efiemu_relocate_symbols64 (grub_efiemu_segment_t segs, | |
33 | break; | |
34 | ||
35 | case R_X86_64_PC32: | |
36 | + case R_X86_64_PLT32: | |
37 | err = grub_efiemu_write_value (addr, | |
38 | *addr32 + rel->r_addend | |
39 | + sym.off | |
40 | diff --git a/grub-core/kern/x86_64/dl.c b/grub-core/kern/x86_64/dl.c | |
41 | index 440690673..3a73e6e6c 100644 | |
42 | --- a/grub-core/kern/x86_64/dl.c | |
43 | +++ b/grub-core/kern/x86_64/dl.c | |
44 | @@ -70,6 +70,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr, | |
45 | break; | |
46 | ||
47 | case R_X86_64_PC32: | |
48 | + case R_X86_64_PLT32: | |
49 | { | |
50 | grub_int64_t value; | |
51 | value = ((grub_int32_t) *addr32) + rel->r_addend + sym->st_value - | |
52 | diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c | |
53 | index e63f148e4..f20255a28 100644 | |
54 | --- a/util/grub-mkimagexx.c | |
55 | +++ b/util/grub-mkimagexx.c | |
56 | @@ -832,6 +832,7 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections, | |
57 | break; | |
58 | ||
59 | case R_X86_64_PC32: | |
60 | + case R_X86_64_PLT32: | |
61 | { | |
62 | grub_uint32_t *t32 = (grub_uint32_t *) target; | |
63 | *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32) | |
64 | diff --git a/util/grub-module-verifier.c b/util/grub-module-verifier.c | |
65 | index 9179285a5..a79271f66 100644 | |
66 | --- a/util/grub-module-verifier.c | |
67 | +++ b/util/grub-module-verifier.c | |
68 | @@ -19,6 +19,7 @@ struct grub_module_verifier_arch archs[] = { | |
69 | -1 | |
70 | }, (int[]){ | |
71 | R_X86_64_PC32, | |
72 | + R_X86_64_PLT32, | |
73 | -1 | |
74 | } | |
75 | }, |