From f321ea7845c92a46d32075c3712199b786bdabac Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 3 May 2015 22:51:29 +0000
Subject: [PATCH] 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
---
 contrib/binutils/bfd/elf32-arm.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/contrib/binutils/bfd/elf32-arm.c b/contrib/binutils/bfd/elf32-arm.c
index 4d7b4866c9e6..31cf5267e32b 100644
--- a/contrib/binutils/bfd/elf32-arm.c
+++ b/contrib/binutils/bfd/elf32-arm.c
@@ -6794,9 +6794,22 @@ elf32_arm_merge_eabi_attributes (bfd *ibfd, bfd *obfd)
 	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;
 	}
     }