From: Christian Hesse Date: Sat, 25 Aug 2018 11:53:08 +0000 (+0200) Subject: [build] Handle R_X86_64_PLT32 from binutils 2.31 X-Git-Tag: v1.20.1~63 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=133f4c47baef6002b2ccb4904a035cda2303c6e5;p=thirdparty%2Fipxe.git [build] Handle R_X86_64_PLT32 from binutils 2.31 Starting from binutils 2.31.0 (commit bd7ab16b) x86-64 assembler generates R_X86_64_PLT32 instead of R_X86_64_PC32. Acked-by: John Jolly Signed-off-by: Michael Brown --- diff --git a/src/util/elf2efi.c b/src/util/elf2efi.c index 6718df777..2c5b9df8a 100644 --- a/src/util/elf2efi.c +++ b/src/util/elf2efi.c @@ -636,6 +636,7 @@ static void process_reloc ( struct elf_file *elf, const Elf_Shdr *shdr, case ELF_MREL ( EM_ARM, R_ARM_THM_JUMP24 ) : case ELF_MREL ( EM_ARM, R_ARM_V4BX ): case ELF_MREL ( EM_X86_64, R_X86_64_PC32 ) : + case ELF_MREL ( EM_X86_64, R_X86_64_PLT32 ) : case ELF_MREL ( EM_AARCH64, R_AARCH64_CALL26 ) : case ELF_MREL ( EM_AARCH64, R_AARCH64_JUMP26 ) : case ELF_MREL ( EM_AARCH64, R_AARCH64_ADR_PREL_LO21 ) :