summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeinrich Schuchardt2017-09-10 17:12:16 +0200
committerMichael Brown2017-09-24 19:03:10 +0200
commitc4ce92599da7804268906fad2ba5d3564b1e9b83 (patch)
tree9242799eba88d16544cfd4496e2f75b06373d41c
parent[crypto] Fail fast if cross-certificate source is empty (diff)
downloadipxe-c4ce92599da7804268906fad2ba5d3564b1e9b83.tar.gz
ipxe-c4ce92599da7804268906fad2ba5d3564b1e9b83.tar.xz
ipxe-c4ce92599da7804268906fad2ba5d3564b1e9b83.zip
[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 <xypron.glpk@gmx.de> Modified-by: Michael Brown <mcb30@ipxe.org> Signed-off-by: Michael Brown <mcb30@ipxe.org>
-rw-r--r--src/util/elf2efi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/util/elf2efi.c b/src/util/elf2efi.c
index 27f37d98..84122032 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 ) :