Fix overload resolution involving rvalue references and cv qualifiers.

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

diff --git a/bfd/elf64-ia64-vms.c b/bfd/elf64-ia64-vms.c
index 6f6d5e3c7bfd52cf26ab87b065b8dc8f99c7fd6a..5dd83a3ccaf426e5fcdd1bb1dabad8be96d331fd 100644 (file)
--- a/bfd/elf64-ia64-vms.c
+++ b/bfd/elf64-ia64-vms.c
@@ -1,5 +1,5 @@
 /* IA-64 support for OpenVMS
-   Copyright (C) 1998-2016 Free Software Foundation, Inc.
+   Copyright (C) 1998-2017 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -583,8 +583,10 @@ elf64_ia64_relax_section (bfd *abfd, asection *sec,
              || strcmp (sec->output_section->name, ".fini") == 0)
            {
              _bfd_error_handler
-               (_("%B: Can't relax br at 0x%lx in section `%A'. Please use brl or indirect branch."),
-                sec->owner, sec, (unsigned long) roff);
+               /* xgettext:c-format */
+               (_("%B: Can't relax br at 0x%lx in section `%A'."
+                  " Please use brl or indirect branch."),
+                sec->owner, (unsigned long) roff, sec);
              bfd_set_error (bfd_error_bad_value);
              goto error_return;
            }
@@ -3276,9 +3278,9 @@ elf64_ia64_choose_gp (bfd *abfd, struct bfd_link_info *info, bfd_boolean final)
        {
 overflow:
          _bfd_error_handler
-           (_("%s: short data segment overflowed (0x%lx >= 0x400000)"),
-            bfd_get_filename (abfd),
-            (unsigned long) (max_short_vma - min_short_vma));
+           /* xgettext:c-format */
+           (_("%B: short data segment overflowed (0x%lx >= 0x400000)"),
+            abfd, (unsigned long) (max_short_vma - min_short_vma));
          return FALSE;
        }
       else if ((gp_val > min_short_vma
@@ -3287,8 +3289,7 @@ overflow:
                   && max_short_vma - gp_val >= 0x200000))
        {
          _bfd_error_handler
-           (_("%s: __gp does not cover short data segment"),
-            bfd_get_filename (abfd));
+           (_("%B: __gp does not cover short data segment"), abfd);
          return FALSE;
        }
     }
@@ -3426,6 +3427,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,7 +3554,9 @@ elf64_ia64_relocate_section (bfd *output_bfd,
                  /* ??? People shouldn't be doing non-pic code in
                     shared libraries nor dynamic executables.  */
                  _bfd_error_handler
-                   (_("%B: non-pic code with imm relocation against dynamic symbol `%s'"),
+                   /* xgettext:c-format */
+                   (_("%B: non-pic code with imm relocation against"
+                      " dynamic symbol `%s'"),
                     input_bfd,
                     h ? h->root.root.string
                       : bfd_elf_sym_name (input_bfd, symtab_hdr, sym,
@@ -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,9 +3946,11 @@ elf64_ia64_relocate_section (bfd *output_bfd,
              case R_IA64_LTOFF_DTPMOD22:
              case R_IA64_LTOFF_DTPREL22:
                _bfd_error_handler
-                 (_("%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);
+                 /* xgettext:c-format */
+                 (_("%B: missing TLS section for relocation %s against `%s'"
+                    " at 0x%lx in section `%A'."),
+                  input_bfd, howto->name, name,
+                  rel->r_offset, input_section);
                break;
 
              case R_IA64_PCREL21B:
@@ -3953,11 +3963,14 @@ elf64_ia64_relocate_section (bfd *output_bfd,
                       Overflow failures for those relocations mean
                       that the section is too big to relax.  */
                    _bfd_error_handler
-                     (_("%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);
+                     /* xgettext:c-format */
+                     (_("%B: Can't relax br (%s) to `%s' at 0x%lx in section"
+                        " `%A' with size 0x%lx (> 0x1000000)."),
+                      input_bfd, howto->name, name, rel->r_offset,
+                      input_section, input_section->size);
                    break;
                  }
+               /* Fall through.  */
              default:
                (*info->callbacks->reloc_overflow) (info,
                                                    &h->root,
@@ -4201,8 +4214,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;
@@ -5120,16 +5134,18 @@ 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);
+                      1 << common_align, name, common_bfd,
+                      1 << normal_align, h->root.u.def.section);
                  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,
-                      1 << normal_align, name, 1 << common_align);
+                      1 << normal_align, name, normal_bfd,
+                      1 << common_align, common_bfd);
                }
            }
 
@@ -5141,11 +5157,11 @@ 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,
-                  name, (unsigned long) h->size,
-                  (unsigned long) isym->st_size);
+                  name, (unsigned long) h->size, old_bfd,
+                  (unsigned long) isym->st_size, abfd);
 
              h->size = isym->st_size;
            }
@@ -5168,9 +5184,10 @@ 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);
+                      name, h->type, type, abfd);
 
                  h->type = type;
                }