svn commit: r214751 - projects/binutils-2.17/contrib/binutils/bfd

[Dimitry Andric]

Author: dim
Date: Wed Nov  3 16:46:05 2010
New Revision: 214751
URL: http://svn.freebsd.org/changeset/base/214751

Log:
  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).

Modified:
  projects/binutils-2.17/contrib/binutils/bfd/elf32-arm.c

Modified: projects/binutils-2.17/contrib/binutils/bfd/elf32-arm.c
==============================================================================
--- projects/binutils-2.17/contrib/binutils/bfd/elf32-arm.c	Wed Nov  3 16:39:55 2010	(r214750)
+++ projects/binutils-2.17/contrib/binutils/bfd/elf32-arm.c	Wed Nov  3 16:46:05 2010	(r214751)
@@ -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;