From owner-svn-src-all@FreeBSD.ORG  Tue May  5 10:35:30 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2610231C;
 Tue,  5 May 2015 10:35:30 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1481E1DCE;
 Tue,  5 May 2015 10:35:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t45AZTLb099363;
 Tue, 5 May 2015 10:35:29 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t45AZTok099362;
 Tue, 5 May 2015 10:35:29 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201505051035.t45AZTok099362@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Tue, 5 May 2015 10:35:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r282471 - head/contrib/binutils/bfd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 May 2015 10:35:30 -0000

Author: andrew
Date: Tue May  5 10:35:29 2015
New Revision: 282471
URL: https://svnweb.freebsd.org/changeset/base/282471

Log:
  Copy new attribute types when linking. bfd will copy attributes as needed,
  however it will fail to output them if the type is not set correctly. This
  can happen when it finds an attribute it hasn't seen before, for example
  when building shared objects it will use the attributes from crti.o, hwever
  this file has no attributes set.
  
  Differential Revision:	https://reviews.freebsd.org/D2413
  Reviewed by:	imp

Modified:
  head/contrib/binutils/bfd/elf32-arm.c

Modified: head/contrib/binutils/bfd/elf32-arm.c
==============================================================================
--- head/contrib/binutils/bfd/elf32-arm.c	Tue May  5 10:32:59 2015	(r282470)
+++ head/contrib/binutils/bfd/elf32-arm.c	Tue May  5 10:35:29 2015	(r282471)
@@ -6816,6 +6816,9 @@ elf32_arm_merge_eabi_attributes (bfd *ib
 
   for (i = 4; i < NUM_KNOWN_OBJ_ATTRIBUTES; i++)
     {
+      if (out_attr[i].type == 0)
+        out_attr[i].type = in_attr[i].type;
+
       /* Merge this attribute with existing attributes.  */
       switch (i)
 	{