]> git.ipfire.org Git - thirdparty/ipxe.git/commitdiff
[efi] Accept (and ignore) R_ARM_V4BX relocations
authorHeinrich Schuchardt <xypron.glpk@gmx.de>
Sun, 10 Sep 2017 15:12:16 +0000 (17:12 +0200)
committerMichael Brown <mcb30@ipxe.org>
Sun, 24 Sep 2017 17:03:10 +0000 (18:03 +0100)
Relocation type R_ARM_V4BX requires no computation.  It marks the
location of an ARMv4 branch exchange instruction.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Modified-by: Michael Brown <mcb30@ipxe.org>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
src/util/elf2efi.c

index 27f37d98a6d6a3119272611bf0b1c7db29a11add..84122032c63261b1ee5c0df1e6f0eb952da5576f 100644 (file)
@@ -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 ) :