From owner-svn-src-all@FreeBSD.ORG  Sun May  3 22:51: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 [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C28F23C1;
 Sun,  3 May 2015 22:51: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 B13E0160E;
 Sun,  3 May 2015 22:51: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 t43MpUOA071792;
 Sun, 3 May 2015 22:51:30 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t43MpUlE071791;
 Sun, 3 May 2015 22:51:30 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201505032251.t43MpUlE071791@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 3 May 2015 22:51:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r282379 - 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: Sun, 03 May 2015 22:51:30 -0000

Author: imp
Date: Sun May  3 22:51:29 2015
New Revision: 282379
URL: https://svnweb.freebsd.org/changeset/base/282379

Log:
  When merging the floating point type attribute, and reporting an error
  when things don't match, report which file has them and which one
  doesn't correctly.
  
  Differential Revision: https://reviews.freebsd.org/D2400

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

Modified: head/contrib/binutils/bfd/elf32-arm.c
==============================================================================
--- head/contrib/binutils/bfd/elf32-arm.c	Sun May  3 22:49:47 2015	(r282378)
+++ head/contrib/binutils/bfd/elf32-arm.c	Sun May  3 22:51:29 2015	(r282379)
@@ -6794,9 +6794,22 @@ elf32_arm_merge_eabi_attributes (bfd *ib
 	out_attr[Tag_ABI_VFP_args].i = in_attr[Tag_ABI_VFP_args].i;
       else if (in_attr[Tag_ABI_FP_number_model].i != 0)
 	{
+	  bfd *hasbfd, *hasnotbfd;
+	  
+	  if (in_attr[Tag_ABI_VFP_args].i)
+	    {
+	      hasbfd = ibfd;
+	      hasnotbfd = obfd;
+	    }
+	  else
+	    {
+	      hasbfd = obfd;
+	      hasnotbfd = ibfd;
+	    }
+
 	  _bfd_error_handler
 	    (_("ERROR: %B uses VFP register arguments, %B does not"),
-	     ibfd, obfd);
+		hasbfd, hasnotbfd);
 	  return FALSE;
 	}
     }