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

[deliverable/binutils-gdb.git] / bfd / elf64-ia64-vms.c

diff --git a/bfd/elf64-ia64-vms.c b/bfd/elf64-ia64-vms.c
index a64e8db8fae2432fd23852d6e9bcac51e7452405..e7b82ced5cf7f0b602504a817baebd43a7f19284 100644 (file)
--- a/bfd/elf64-ia64-vms.c
+++ b/bfd/elf64-ia64-vms.c
@@ -583,6 +583,7 @@ elf64_ia64_relax_section (bfd *abfd, asection *sec,
              || strcmp (sec->output_section->name, ".fini") == 0)
            {
              _bfd_error_handler
+               /* xgettext:c-format */
                (_("%B: Can't relax br at 0x%lx in section `%A'. Please use brl or indirect branch."),
                 sec->owner, sec, (unsigned long) roff);
              bfd_set_error (bfd_error_bad_value);
@@ -3276,6 +3277,7 @@ elf64_ia64_choose_gp (bfd *abfd, struct bfd_link_info *info, bfd_boolean final)
        {
 overflow:
          _bfd_error_handler
+           /* xgettext:c-format */
            (_("%s: short data segment overflowed (0x%lx >= 0x400000)"),
             bfd_get_filename (abfd),
             (unsigned long) (max_short_vma - min_short_vma));
@@ -3426,6 +3428,7 @@ elf64_ia64_relocate_section (bfd *output_bfd,
       if (r_type > R_IA64_MAX_RELOC_CODE)
        {
          _bfd_error_handler
+           /* xgettext:c-format */
            (_("%B: unknown relocation type %d"),
             input_bfd, (int) r_type);
          bfd_set_error (bfd_error_bad_value);
@@ -3552,6 +3555,7 @@ elf64_ia64_relocate_section (bfd *output_bfd,
                  /* ??? People shouldn't be doing non-pic code in
                     shared libraries nor dynamic executables.  */
                  _bfd_error_handler
+                   /* xgettext:c-format */
                    (_("%B: non-pic code with imm relocation against dynamic symbol `%s'"),
                     input_bfd,
                     h ? h->root.root.string
@@ -3614,6 +3618,7 @@ elf64_ia64_relocate_section (bfd *output_bfd,
          if (dynamic_symbol_p)
            {
              _bfd_error_handler
+               /* xgettext:c-format */
                (_("%B: @gprel relocation against dynamic symbol %s"),
                 input_bfd,
                 h ? h->root.root.string
@@ -3774,10 +3779,13 @@ elf64_ia64_relocate_section (bfd *output_bfd,
              const char *msg;
 
              if (r_type == R_IA64_PCREL21BI)
+               /* xgettext:c-format */
                msg = _("%B: @internal branch to dynamic symbol %s");
              else if (r_type == R_IA64_PCREL21F || r_type == R_IA64_PCREL21M)
+               /* xgettext:c-format */
                msg = _("%B: speculation fixup to dynamic symbol %s");
              else
+               /* xgettext:c-format */
                msg = _("%B: @pcrel relocation against dynamic symbol %s");
              _bfd_error_handler (msg, input_bfd,
                                  h ? h->root.root.string
@@ -3938,6 +3946,7 @@ elf64_ia64_relocate_section (bfd *output_bfd,
              case R_IA64_LTOFF_DTPMOD22:
              case R_IA64_LTOFF_DTPREL22:
                _bfd_error_handler
+                 /* xgettext:c-format */
                  (_("%B: missing TLS section for relocation %s against `%s' at 0x%lx in section `%A'."),
                   input_bfd, input_section, howto->name, name,
                   rel->r_offset);
@@ -3953,6 +3962,7 @@ elf64_ia64_relocate_section (bfd *output_bfd,
                       Overflow failures for those relocations mean
                       that the section is too big to relax.  */
                    _bfd_error_handler
+                     /* xgettext:c-format */
                      (_("%B: Can't relax br (%s) to `%s' at 0x%lx in section `%A' with size 0x%lx (> 0x1000000)."),
                       input_bfd, input_section, howto->name, name,
                       rel->r_offset, input_section->size);
@@ -4202,8 +4212,9 @@ elf64_ia64_set_private_flags (bfd *abfd, flagword flags)
 /* Merge backend specific data from an object file to the output
    object file when linking.  */
 static bfd_boolean
-elf64_ia64_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+elf64_ia64_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
 {
+  bfd *obfd = info->output_bfd;
   flagword out_flags;
   flagword in_flags;
   bfd_boolean ok = TRUE;
@@ -5121,12 +5132,14 @@ error_free_dyn:
                  /* PR binutils/2735 */
                  if (normal_bfd == NULL)
                    _bfd_error_handler
+                     /* xgettext:c-format */
                      (_("Warning: alignment %u of common symbol `%s' in %B"
                         " is greater than the alignment (%u) of its section %A"),
                       common_bfd, h->root.u.def.section,
                       1 << common_align, name, 1 << normal_align);
                  else
                    _bfd_error_handler
+                     /* xgettext:c-format */
                      (_("Warning: alignment %u of symbol `%s' in %B"
                         " is smaller than %u in %B"),
                       normal_bfd, common_bfd,
@@ -5142,6 +5155,7 @@ error_free_dyn:
                  && h->size != isym->st_size
                  && ! size_change_ok)
                _bfd_error_handler
+                 /* xgettext:c-format */
                  (_("Warning: size of symbol `%s' changed"
                     " from %lu in %B to %lu in %B"),
                   old_bfd, abfd,
@@ -5169,6 +5183,7 @@ error_free_dyn:
                {
                  if (h->type != STT_NOTYPE && ! type_change_ok)
                    _bfd_error_handler
+                     /* xgettext:c-format */
                      (_("Warning: type of symbol `%s' changed"
                         " from %d to %d in %B"),
                       abfd, name, h->type, type);