summaryrefslogtreecommitdiffstats
path: root/contrib/binutils/bfd
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2010-11-03 16:46:05 +0000
committerdim <dim@FreeBSD.org>2010-11-03 16:46:05 +0000
commit7fe4867679f4bacde210186b70c6e9bc17313e63 (patch)
treed6f66f04e7c6f185deac0568c04643e2319aa000 /contrib/binutils/bfd
parentdd82ae2cb64cf00f92215021d604b2e0c2ada306 (diff)
downloadFreeBSD-src-7fe4867679f4bacde210186b70c6e9bc17313e63.zip
FreeBSD-src-7fe4867679f4bacde210186b70c6e9bc17313e63.tar.gz
Backport a fix for binutils PR7093, which caused segfaults in ld
targeting arm, when attempting to create object files from arbitrary binary file (e.g. firmware blobs).
Diffstat (limited to 'contrib/binutils/bfd')
-rw-r--r--contrib/binutils/bfd/elf32-arm.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/binutils/bfd/elf32-arm.c b/contrib/binutils/bfd/elf32-arm.c
index 8e1caa8..02dd21b 100644
--- a/contrib/binutils/bfd/elf32-arm.c
+++ b/contrib/binutils/bfd/elf32-arm.c
@@ -3280,6 +3280,9 @@ bfd_elf32_arm_init_maps (bfd *abfd)
Elf_Internal_Shdr *hdr;
unsigned int i, localsyms;
+ if (bfd_get_flavour (abfd) != bfd_target_elf_flavour || elf_tdata (abfd) == NULL)
+ return;
+
if ((abfd->flags & DYNAMIC) != 0)
return;
OpenPOWER on IntegriCloud