From deddc40bec6db30c02fa73f1e83619bc62c87196 Mon Sep 17 00:00:00 2001
From: Nathan Sidwell <nathan@codesourcery.com>
Date: Mon, 8 Feb 2010 07:09:39 +0000
Subject: bfd/ 	* elf32-ppc.c (ppc_elf_begin_write_processing): Allow empty 
 apuinfo sections, only scan input sections once and reuse the 	buffer.
 ld/testsuite/ 	* ld-powerpc/apuinfo-nul.s: New. 	*
 ld-powerpc/apuinfo.rd: Add it. 	* ld-powerpc/powerpc.exp: Likewise.

---
 bfd/elf32-arm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'bfd/elf32-arm.c')

diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index 470e495..8f8d32c 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -9831,7 +9831,8 @@ elf32_arm_merge_eabi_attributes (bfd *ibfd, bfd *obfd)
 	{
 	  _bfd_error_handler
 	    (_("error: %B uses VFP register arguments, %B does not"),
-	     ibfd, obfd);
+	     in_attr[Tag_ABI_VFP_args].i ? ibfd : obfd,
+	     in_attr[Tag_ABI_VFP_args].i ? obfd : ibfd);
 	  result = FALSE;
 	}
     }
-- 
cgit v1.1