]> git.ipfire.org Git - thirdparty/ipxe.git/commitdiff
[build] Handle R_X86_64_PLT32 from binutils 2.31
authorChristian Hesse <mail@eworm.de>
Sat, 25 Aug 2018 11:53:08 +0000 (13:53 +0200)
committerMichael Brown <mcb30@ipxe.org>
Mon, 17 Sep 2018 11:24:18 +0000 (12:24 +0100)
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 <jjolly@suse.com>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
src/util/elf2efi.c

index 6718df777ffc866adab2f1d3a05e412d74fd6471..2c5b9df8aae853bfce4d5d3bae89dfea1ac5dec1 100644 (file)
@@ -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 ) :