grub-lakitu: FROMGIT: 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. Signed-off-by: H.J. Lu <hjl.tools@gmail.com> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> (cherry picked from commit 842c390469e2c2e10b5aa36700324cd3bde25875 https://git.savannah.gnu.org/git/grub.git master) Signed-off-by: Robert Kolchmeyer <rkolchmeyer@google.com> BUG=b/162782466 TEST=shielded_vm_test Change-Id: Idb3bbdf6be15f2f0317b42a6e22e79de66f6103e
diff --git a/grub-lakitu/grub-core/efiemu/i386/loadcore64.c b/grub-lakitu/grub-core/efiemu/i386/loadcore64.c index e49d0b6..18facf4 100644 --- a/grub-lakitu/grub-core/efiemu/i386/loadcore64.c +++ b/grub-lakitu/grub-core/efiemu/i386/loadcore64.c
@@ -98,6 +98,7 @@ break; case R_X86_64_PC32: + case R_X86_64_PLT32: err = grub_efiemu_write_value (addr, *addr32 + rel->r_addend + sym.off
diff --git a/grub-lakitu/grub-core/kern/x86_64/dl.c b/grub-lakitu/grub-core/kern/x86_64/dl.c index 4406906..3a73e6e 100644 --- a/grub-lakitu/grub-core/kern/x86_64/dl.c +++ b/grub-lakitu/grub-core/kern/x86_64/dl.c
@@ -70,6 +70,7 @@ 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 -
diff --git a/grub-lakitu/util/grub-mkimagexx.c b/grub-lakitu/util/grub-mkimagexx.c index f47e17c..c3462f3 100644 --- a/grub-lakitu/util/grub-mkimagexx.c +++ b/grub-lakitu/util/grub-mkimagexx.c
@@ -841,6 +841,7 @@ 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)
diff --git a/grub-lakitu/util/grub-module-verifier.c b/grub-lakitu/util/grub-module-verifier.c index 9179285..a79271f 100644 --- a/grub-lakitu/util/grub-module-verifier.c +++ b/grub-lakitu/util/grub-module-verifier.c
@@ -19,6 +19,7 @@ -1 }, (int[]){ R_X86_64_PC32, + R_X86_64_PLT32, -1 } },