Add c-format tags to translatable strings with more than one argument-using formatting token.

	* aout-adobe.c: Add missing c-format tags for translatable strings.
	* aout-cris.c: Likewise.
	* aoutx.h: Likewise.
	* bfd.c: Likewise.
	* binary.c: Likewise.
	* cache.c: Likewise.
	* coff-alpha.c: Likewise.
	* coff-arm.c: Likewise.
	* coff-i860.c: Likewise.
	* coff-mcore.c: Likewise.
	* coff-ppc.c: Likewise.
	* coff-rs6000.c: Likewise.
	* coff-sh.c: Likewise.
	* coff-tic4x.c: Likewise.
	* coff-tic54x.c: Likewise.
	* coff-tic80.c: Likewise.
	* coff64-rs6000.c: Likewise.
	* coffcode.h: Likewise.
	* coffgen.c: Likewise.
	* cofflink.c: Likewise.
	* coffswap.h: Likewise.
	* cpu-arm.c: Likewise.
	* dwarf2.c: Likewise.
	* ecoff.c: Likewise.
	* elf-attrs.c: Likewise.
	* elf-eh-frame.c: Likewise.
	* elf-ifunc.c: Likewise.
	* elf-m10300.c: Likewise.
	* elf-s390-common.c: Likewise.
	* elf.c: Likewise.
	* elf32-arc.c: Likewise.
	* elf32-arm.c: Likewise.
	* elf32-avr.c: Likewise.
	* elf32-bfin.c: Likewise.
	* elf32-cr16.c: Likewise.
	* elf32-cr16c.c: Likewise.
	* elf32-cris.c: Likewise.
	* elf32-crx.c: Likewise.
	* elf32-d10v.c: Likewise.
	* elf32-d30v.c: Likewise.
	* elf32-epiphany.c: Likewise.
	* elf32-fr30.c: Likewise.
	* elf32-frv.c: Likewise.
	* elf32-gen.c: Likewise.
	* elf32-hppa.c: Likewise.
	* elf32-i370.c: Likewise.
	* elf32-i386.c: Likewise.
	* elf32-i960.c: Likewise.
	* elf32-ip2k.c: Likewise.
	* elf32-iq2000.c: Likewise.
	* elf32-lm32.c: Likewise.
	* elf32-m32c.c: Likewise.
	* elf32-m32r.c: Likewise.
	* elf32-m68hc11.c: Likewise.
	* elf32-m68hc12.c: Likewise.
	* elf32-m68hc1x.c: Likewise.
	* elf32-m68k.c: Likewise.
	* elf32-mcore.c: Likewise.
	* elf32-mep.c: Likewise.
	* elf32-metag.c: Likewise.
	* elf32-microblaze.c: Likewise.
	* elf32-moxie.c: Likewise.
	* elf32-msp430.c: Likewise.
	* elf32-mt.c: Likewise.
	* elf32-nds32.c: Likewise.
	* elf32-nios2.c: Likewise.
	* elf32-or1k.c: Likewise.
	* elf32-pj.c: Likewise.
	* elf32-ppc.c: Likewise.
	* elf32-rl78.c: Likewise.
	* elf32-rx.c: Likewise.
	* elf32-s390.c: Likewise.
	* elf32-score.c: Likewise.
	* elf32-score7.c: Likewise.
	* elf32-sh-symbian.c: Likewise.
	* elf32-sh.c: Likewise.
	* elf32-sh64.c: Likewise.
	* elf32-spu.c: Likewise.
	* elf32-tic6x.c: Likewise.
	* elf32-tilepro.c: Likewise.
	* elf32-v850.c: Likewise.
	* elf32-vax.c: Likewise.
	* elf32-visium.c: Likewise.
	* elf32-xgate.c: Likewise.
	* elf32-xtensa.c: Likewise.
	* elf64-alpha.c: Likewise.
	* elf64-gen.c: Likewise.
	* elf64-hppa.c: Likewise.
	* elf64-ia64-vms.c: Likewise.
	* elf64-mmix.c: Likewise.
	* elf64-ppc.c: Likewise.
	* elf64-s390.c: Likewise.
	* elf64-sh64.c: Likewise.
	* elf64-sparc.c: Likewise.
	* elf64-x86-64.c: Likewise.
	* elfcode.h: Likewise.
	* elfcore.h: Likewise.
	* elflink.c: Likewise.
	* elfnn-aarch64.c: Likewise.
	* elfnn-ia64.c: Likewise.
	* elfxx-mips.c: Likewise.
	* elfxx-sparc.c: Likewise.
	* elfxx-tilegx.c: Likewise.
	* ieee.c: Likewise.
	* ihex.c: Likewise.
	* libbfd.c: Likewise.
	* linker.c: Likewise.
	* m68klinux.c: Likewise.
	* mach-o.c: Likewise.
	* merge.c: Likewise.
	* mmo.c: Likewise.
	* oasys.c: Likewise.
	* pdp11.c: Likewise.
	* pe-mips.c: Likewise.
	* peXXigen.c: Likewise.
	* pei-x86_64.c: Likewise.
	* peicode.h: Likewise.
	* ppcboot.c: Likewise.
	* reloc.c: Likewise.
	* sparclinux.c: Likewise.
	* srec.c: Likewise.
	* stabs.c: Likewise.
	* vms-alpha.c: Likewise.
	* vms-lib.c: Likewise.
	* xcofflink.c: Likewise.

1 files changed, 36 insertions, 7 deletions

diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c
index 753a736e246..c0a3368cc88 100644
--- a/bfd/elf32-sh.c
+++ b/bfd/elf32-sh.c
@@ -487,6 +487,7 @@ sh_elf_info_to_howto (bfd *abfd, arelent *cache_ptr, Elf_Internal_Rela *dst)
       || (r >= R_SH_FIRST_INVALID_RELOC_5 && r <= R_SH_LAST_INVALID_RELOC_5)
       || (r >= R_SH_FIRST_INVALID_RELOC_6 && r <= R_SH_LAST_INVALID_RELOC_6))
     {
+      /* xgettext:c-format */
       _bfd_error_handler (_("%B: unrecognised SH reloc number: %d"),
 			  abfd, r);
       bfd_set_error (bfd_error_bad_value);
@@ -575,6 +576,7 @@ sh_elf_relax_section (bfd *abfd, asection *sec,
       laddr = irel->r_offset + 4 + irel->r_addend;
       if (laddr >= sec->size)
 	{
+	  /* xgettext:c-format */
 	  _bfd_error_handler (_("%B: 0x%lx: warning: bad R_SH_USES offset"),
 			      abfd, (unsigned long) irel->r_offset);
 	  continue;
@@ -586,6 +588,7 @@ sh_elf_relax_section (bfd *abfd, asection *sec,
       if ((insn & 0xf000) != 0xd000)
 	{
 	  _bfd_error_handler
+	    /* xgettext:c-format */
 	    (_("%B: 0x%lx: warning: R_SH_USES points to unrecognized insn 0x%x"),
 	     abfd, (unsigned long) irel->r_offset, insn);
 	  continue;
@@ -603,6 +606,7 @@ sh_elf_relax_section (bfd *abfd, asection *sec,
       if (paddr >= sec->size)
 	{
 	  _bfd_error_handler
+	    /* xgettext:c-format */
 	    (_("%B: 0x%lx: warning: bad R_SH_USES load offset"),
 	     abfd, (unsigned long) irel->r_offset);
 	  continue;
@@ -618,6 +622,7 @@ sh_elf_relax_section (bfd *abfd, asection *sec,
       if (irelfn >= irelend)
 	{
 	  _bfd_error_handler
+	    /* xgettext:c-format */
 	    (_("%B: 0x%lx: warning: could not find expected reloc"),
 	     abfd, (unsigned long) paddr);
 	  continue;
@@ -646,6 +651,7 @@ sh_elf_relax_section (bfd *abfd, asection *sec,
 	      != (unsigned int) _bfd_elf_section_from_bfd_section (abfd, sec))
 	    {
 	      _bfd_error_handler
+		/* xgettext:c-format */
 		(_("%B: 0x%lx: warning: symbol in unexpected section"),
 		 abfd, (unsigned long) paddr);
 	      continue;
@@ -775,6 +781,7 @@ sh_elf_relax_section (bfd *abfd, asection *sec,
       if (irelcount >= irelend)
 	{
 	  _bfd_error_handler
+	    /* xgettext:c-format */
 	    (_("%B: 0x%lx: warning: could not find expected COUNT reloc"),
 	     abfd, (unsigned long) paddr);
 	  continue;
@@ -784,6 +791,7 @@ sh_elf_relax_section (bfd *abfd, asection *sec,
 	 just deleted one.  */
       if (irelcount->r_addend == 0)
 	{
+	  /* xgettext:c-format */
 	  _bfd_error_handler (_("%B: 0x%lx: warning: bad count"),
 			      abfd, (unsigned long) paddr);
 	  continue;
@@ -1187,6 +1195,7 @@ sh_elf_relax_delete_bytes (bfd *abfd, asection *sec, bfd_vma addr,
 	  if (overflow)
 	    {
 	      _bfd_error_handler
+		/* xgettext:c-format */
 		(_("%B: 0x%lx: fatal: reloc overflow while relaxing"),
 		 abfd, (unsigned long) irel->r_offset);
 	      bfd_set_error (bfd_error_bad_value);
@@ -1557,6 +1566,7 @@ sh_elf_swap_insns (bfd *abfd, asection *sec, void *relocs,
 	  if (overflow)
 	    {
 	      _bfd_error_handler
+		/* xgettext:c-format */
 		(_("%B: 0x%lx: fatal: reloc overflow while relaxing"),
 		 abfd, (unsigned long) irel->r_offset);
 	      bfd_set_error (bfd_error_bad_value);
@@ -4007,6 +4017,7 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 	      if (howto->rightshift || howto->src_mask != 0xffffffff)
 		{
 		  _bfd_error_handler
+		    /* xgettext:c-format */
 		    (_("%B(%A+0x%lx): %s relocation against SEC_MERGE section"),
 		     input_bfd, input_section,
 		     (long) rel->r_offset, howto->name);
@@ -4124,6 +4135,7 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 			   != (bfd_vma) -1))
 		{
 		  _bfd_error_handler
+		    /* xgettext:c-format */
 		    (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
 		     input_bfd,
 		     input_section,
@@ -4202,6 +4214,7 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 	      if (disp & mask)
 		{
 		  _bfd_error_handler
+		    /* xgettext:c-format */
 		    (_("%B: 0x%lx: fatal: unaligned branch target for relax-support relocation"),
 		     input_section->owner,
 		     (unsigned long) rel->r_offset);
@@ -4235,6 +4248,7 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 	  if (relocation & 3)
 	    {
 	      _bfd_error_handler
+		/* xgettext:c-format */
 		(_("%B: 0x%lx: fatal: unaligned %s relocation 0x%lx"),
 		 input_section->owner,
 		 (unsigned long) rel->r_offset, howto->name,
@@ -4250,6 +4264,7 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 	  if (relocation & 1)
 	    {
 	      _bfd_error_handler
+		/* xgettext:c-format */
 		(_("%B: 0x%lx: fatal: unaligned %s relocation 0x%lx"),
 		 input_section->owner,
 		 (unsigned long) rel->r_offset, howto->name,
@@ -4264,6 +4279,7 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 	      || (signed int)relocation > 32)
 	    {
 	      _bfd_error_handler
+		/* xgettext:c-format */
 		(_("%B: 0x%lx: fatal: R_SH_PSHA relocation %d not in range -32..32"),
 		 input_section->owner,
 		 (unsigned long) rel->r_offset,
@@ -4278,6 +4294,7 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 	      || (signed int)relocation > 16)
 	    {
 	      _bfd_error_handler
+		/* xgettext:c-format */
 		(_("%B: 0x%lx: fatal: R_SH_PSHL relocation %d not in range -32..32"),
 		 input_section->owner,
 		 (unsigned long) rel->r_offset,
@@ -4422,6 +4439,7 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 					    input_section->output_section))
 		  {
 		    _bfd_error_handler
+		      /* xgettext:c-format */
 		      (_("%B(%A+0x%lx): cannot emit fixup to `%s' in read-only section"),
 		       input_bfd,
 		       input_section,
@@ -4900,6 +4918,7 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 					    reloc_section->output_section))
 		  {
 		    _bfd_error_handler
+		      /* xgettext:c-format */
 		      (_("%B(%A+0x%lx): cannot emit fixup to `%s' in read-only section"),
 		       input_bfd,
 		       input_section,
@@ -5007,6 +5026,7 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 		    || !SYMBOL_FUNCDESC_LOCAL (info, h)))
 	    {
 	      _bfd_error_handler
+		/* xgettext:c-format */
 		(_("%B(%A+0x%lx): %s relocation against external symbol \"%s\""),
 		 input_bfd, input_section, (long) rel->r_offset, howto->name,
 		 h->root.root.string);
@@ -5480,12 +5500,14 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 	      if (bfd_link_pic (info))
 		{
 		  info->callbacks->einfo
+		    /* xgettext:c-format */
 		    (_("%X%C: relocation to \"%s\" references a different segment\n"),
 		     input_bfd, input_section, rel->r_offset, symname);
 		  return FALSE;
 		}
 	      else
 		info->callbacks->einfo
+		  /* xgettext:c-format */
 		  (_("%C: warning: relocation to \"%s\" references a different segment\n"),
 		   input_bfd, input_section, rel->r_offset, symname);
 	    }
@@ -6053,15 +6075,18 @@ sh_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
 		  if ((old_got_type == GOT_FUNCDESC || got_type == GOT_FUNCDESC)
 		      && (old_got_type == GOT_NORMAL || got_type == GOT_NORMAL))
 		    _bfd_error_handler
+		      /* xgettext:c-format */
 		      (_("%B: `%s' accessed both as normal and FDPIC symbol"),
 		       abfd, h->root.root.string);
 		  else if (old_got_type == GOT_FUNCDESC
 			   || got_type == GOT_FUNCDESC)
 		    _bfd_error_handler
+		      /* xgettext:c-format */
 		      (_("%B: `%s' accessed both as FDPIC and thread local symbol"),
 		       abfd, h->root.root.string);
 		  else
 		    _bfd_error_handler
+		      /* xgettext:c-format */
 		      (_("%B: `%s' accessed both as normal and thread local symbol"),
 		       abfd, h->root.root.string);
 		  return FALSE;
@@ -6136,10 +6161,12 @@ sh_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
 		{
 		  if (old_got_type == GOT_NORMAL)
 		    _bfd_error_handler
+		      /* xgettext:c-format */
 		      (_("%B: `%s' accessed both as normal and FDPIC symbol"),
 		       abfd, h->root.root.string);
 		  else
 		    _bfd_error_handler
+		      /* xgettext:c-format */
 		      (_("%B: `%s' accessed both as FDPIC and thread local symbol"),
 		       abfd, h->root.root.string);
 		}
@@ -6438,8 +6465,9 @@ sh_merge_bfd_arch (bfd *ibfd, struct bfd_link_info *info)
   if (!SH_VALID_CO_ARCH_SET (merged_arch))
     {
       _bfd_error_handler
-	("%B: uses %s instructions while previous modules "
-	 "use %s instructions",
+	/* xgettext:c-format */
+	(_("%B: uses %s instructions while previous modules "
+	   "use %s instructions"),
 	 ibfd,
 	 SH_ARCH_SET_HAS_DSP (new_arch) ? "dsp" : "floating point",
 	 SH_ARCH_SET_HAS_DSP (new_arch) ? "floating point" : "dsp");
@@ -6449,8 +6477,9 @@ sh_merge_bfd_arch (bfd *ibfd, struct bfd_link_info *info)
   else if (!SH_VALID_ARCH_SET (merged_arch))
     {
       _bfd_error_handler
-	("internal error: merge of architecture '%s' with "
-	 "architecture '%s' produced unknown architecture",
+	/* xgettext:c-format */
+	(_("internal error: merge of architecture '%s' with "
+	   "architecture '%s' produced unknown architecture"),
 	 bfd_printable_name (obfd),
 	 bfd_printable_name (ibfd));
       bfd_set_error (bfd_error_bad_value);
@@ -6486,8 +6515,8 @@ sh_elf_merge_private_data (bfd *ibfd, struct bfd_link_info *info)
 
   if (! sh_merge_bfd_arch (ibfd, info))
     {
-      _bfd_error_handler ("%B: uses instructions which are incompatible "
-			  "with instructions used in previous modules",
+      _bfd_error_handler (_("%B: uses instructions which are incompatible "
+			    "with instructions used in previous modules"),
 			  ibfd);
       bfd_set_error (bfd_error_bad_value);
       return FALSE;
@@ -6499,7 +6528,7 @@ sh_elf_merge_private_data (bfd *ibfd, struct bfd_link_info *info)
 
   if (fdpic_object_p (ibfd) != fdpic_object_p (obfd))
     {
-      _bfd_error_handler ("%B: attempt to mix FDPIC and non-FDPIC objects",
+      _bfd_error_handler (_("%B: attempt to mix FDPIC and non-FDPIC objects"),
 			  ibfd);
       bfd_set_error (bfd_error_bad_value);
       return FALSE;