From: Heinrich Schuchardt Date: Sun, 10 Sep 2017 15:12:16 +0000 (+0200) Subject: [efi] Accept (and ignore) R_ARM_V4BX relocations X-Git-Tag: v1.20.1~143 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4ce92599da7804268906fad2ba5d3564b1e9b83;p=thirdparty%2Fipxe.git [efi] Accept (and ignore) R_ARM_V4BX relocations Relocation type R_ARM_V4BX requires no computation. It marks the location of an ARMv4 branch exchange instruction. Signed-off-by: Heinrich Schuchardt Modified-by: Michael Brown Signed-off-by: Michael Brown --- diff --git a/src/util/elf2efi.c b/src/util/elf2efi.c index 27f37d98a..84122032c 100644 --- a/src/util/elf2efi.c +++ b/src/util/elf2efi.c @@ -630,6 +630,7 @@ static void process_reloc ( struct elf_file *elf, const Elf_Shdr *shdr, case ELF_MREL ( EM_ARM, R_ARM_CALL ) : case ELF_MREL ( EM_ARM, R_ARM_THM_PC22 ) : 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_AARCH64, R_AARCH64_CALL26 ) : case ELF_MREL ( EM_AARCH64, R_AARCH64_JUMP26 ) :