From: Alan Modra <amodra@gmail.com>
Date: Tue, 11 Jul 2017 09:48:47 +0000 (+0930)
Subject: ppc32 use of %x in einfo format
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2c4d9cbe519e4050d067069e2d8910c42dab0157;p=binutils-gdb.git

ppc32 use of %x in einfo format

einfo doesn't support %x.

	* elf32-ppc.c (ppc_elf_relocate_section): Emit "unexpected
	instruction" error using _bfd_error_handler, not einfo.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 111afcb9a9a..b60bda14208 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2017-07-11  Alan Modra  <amodra@gmail.com>
+
+	* elf32-ppc.c (ppc_elf_relocate_section): Emit "unexpected
+	instruction" error using _bfd_error_handler, not einfo.
+
 2017-07-10  Nick Clifton  <nickc@redhat.com>
 
 	* coffcode.h (coff_slurp_symbol_table): Do not include an entry
diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c
index 0e992728eaf..1adca7e4815 100644
--- a/bfd/elf32-ppc.c
+++ b/bfd/elf32-ppc.c
@@ -8284,9 +8284,9 @@ ppc_elf_relocate_section (bfd *output_bfd,
 		  r_type = R_PPC_GOT16_LO;
 		}
 	      else
-		info->callbacks->einfo
+		_bfd_error_handler
 		  /* xgettext:c-format */
-		  (_("%H: error: %s with unexpected instruction %x\n"),
+		  (_("%B(%A+#Lx): error: %s with unexpected instruction %#x"),
 		   input_bfd, input_section, rel->r_offset,
 		   "R_PPC_ADDR16_HA", insn);
 	    }
@@ -8319,9 +8319,9 @@ ppc_elf_relocate_section (bfd *output_bfd,
 		  rel->r_info = ELF32_R_INFO (0, r_type);
 		}
 	      else
-		info->callbacks->einfo
+		_bfd_error_handler
 		  /* xgettext:c-format */
-		  (_("%H: error: %s with unexpected instruction %x\n"),
+		  (_("%B(%A+#Lx): error: %s with unexpected instruction %#x"),
 		   input_bfd, input_section, rel->r_offset,
 		   "R_PPC_ADDR16_LO", insn);
 	    }