x86-64: Treat R_X86_64_PLT32 as R_X86_64_PC32
PATCH 1/1 x86-64: Treat R_X86_64_PLT32 as R_X86_64_PC32
Starting from binutils commit bd7ab16b4537788ad53521c45469a1bdae84ad4a:
https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=bd7ab16b4537788ad53521c45469a1bdae84ad4a
x86-64 assembler generates R_X86_64_PLT32, instead of R_X86_64_PC32, for 32-bit PC-relative branches. Grub2 should treat R_X86_64_PLT32 as R_X86_64_PC32.
--- grub-core/efiemu/i386/loadcore64.c | 1 + grub-core/kern/x86_64/dl.c | 1 + util/grub-mkimagexx.c | 1 + util/grub-module-verifier.c | 1 + 4 files changed, 4 insertions(+)
grub-core/efiemu/i386/loadcore64.c +1 -0
@@ -98,6 +98,7 @@ grub_arch_efiemu_relocate_symbols64 (grub_efiemu_segment_t segs,break ;case R_X86_64_PC32 : +case R_X86_64_PLT32 : err =grub_efiemu_write_value (addr, *addr32 + rel->r_addend + sym.off
grub-core/kern/x86_64/dl.c +1 -0
@@ -70,6 +70,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,break ;case R_X86_64_PC32 : +case R_X86_64_PLT32 : {grub_int64_t value; value = ((grub_int32_t) *addr32) + rel->r_addend + sym->st_value -
util/grub-mkimagexx.c +1 -0
@@ -841,6 +841,7 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections,break ;case R_X86_64_PC32 : +case R_X86_64_PLT32 : {grub_uint32_t *t32 = (grub_uint32_t *) target; *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32)
util/grub-module-verifier.c +1 -0
@@ -19,6 +19,7 @@ struct grub_module_verifier_arch archs[] = {-1 }, (int[]){R_X86_64_PC32 , +R_X86_64_PLT32 ,-1 } },
Signature · 1 line
2.14.3
Quoted 9 lines · H.J. Lu
Starting from binutils commit
bd7ab16b4537788ad53521c45469a1bdae84ad4a:https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=bd7ab16b4537788ad53521c45469a1bdae84ad4a
x86-64 assembler generates
R_X86_64_PLT32, instead ofR_X86_64_PC32, for 32-bit PC-relative branches. Grub2 should treatR_X86_64_PLT32asR_X86_64_PC32.Signed-off-by H.J. Lu <[email protected]>
Daniel
Daniel Kiper
AppliedQuoted 5 lines · Daniel Kiper
Quoted 4 lines · H.J. Lu
Starting from binutils commit
bd7ab16b4537788ad53521c45469a1bdae84ad4a:https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=bd7ab16b4537788ad53521c45469a1bdae84ad4a
Quoted 7 lines
Quoted 5 lines
x86-64 assembler generates
R_X86_64_PLT32, instead ofR_X86_64_PC32, for 32-bit PC-relative branches. Grub2 should treatR_X86_64_PLT32asR_X86_64_PC32.Signed-off-by H.J. Lu <[email protected]>Reviewed-by Daniel Kiper <[email protected]>
Applied!
FYI, this is last time when I sent commit confirmation. If I send one in the future then this will be rather exception than rule. So, if you receive my reviewed-by and patch is not committed in a week or two then it means that it fallen into abyss and you have to ping me.
Have a nice weekend,
Daniel