From owner-svn-src-projects@FreeBSD.ORG  Wed Nov  3 16:46:05 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8AD13106566B;
	Wed,  3 Nov 2010 16:46:05 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 79E988FC13;
	Wed,  3 Nov 2010 16:46:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oA3Gk5mK027269;
	Wed, 3 Nov 2010 16:46:05 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oA3Gk5Wr027267;
	Wed, 3 Nov 2010 16:46:05 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201011031646.oA3Gk5Wr027267@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 3 Nov 2010 16:46:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r214751 - projects/binutils-2.17/contrib/binutils/bfd
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Nov 2010 16:46:05 -0000

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;