Fix overload resolution involving rvalue references and cv qualifiers.

[deliverable/binutils-gdb.git] / bfd / elfcode.h

diff --git a/bfd/elfcode.h b/bfd/elfcode.h
index 7223dd3756db9921647f51474ea6b2b004f3ee06..ef097f739cddc7e06c3a0e3a6fb65b348e0a3603 100644 (file)
--- a/bfd/elfcode.h
+++ b/bfd/elfcode.h
@@ -1,5 +1,5 @@
 /* ELF executable support for BFD.
-   Copyright (C) 1991-2016 Free Software Foundation, Inc.
+   Copyright (C) 1991-2017 Free Software Foundation, Inc.
 
    Written by Fred Fish @ Cygnus Support, from information published
    in "UNIX System V Release 4, Programmers Guide: ANSI C and
@@ -756,7 +756,9 @@ elf_object_p (bfd *abfd)
             So we are kind, and reset the string index value to 0
             so that at least some processing can be done.  */
          i_ehdrp->e_shstrndx = SHN_UNDEF;
-         _bfd_error_handler (_("warning: %s has a corrupt string table index - ignoring"), abfd->filename);
+         _bfd_error_handler
+           (_("warning: %B has a corrupt string table index - ignoring"),
+            abfd);
        }
     }
   else if (i_ehdrp->e_shstrndx != SHN_UNDEF)
@@ -973,6 +975,7 @@ elf_write_out_phdrs (bfd *abfd,
   while (count--)
     {
       Elf_External_Phdr extphdr;
+
       elf_swap_phdr_out (abfd, phdr, &extphdr);
       if (bfd_bwrite (&extphdr, sizeof (Elf_External_Phdr), abfd)
          != sizeof (Elf_External_Phdr))
@@ -1185,9 +1188,10 @@ elf_slurp_symbol_table (bfd *abfd, asymbol **symptrs, bfd_boolean dynamic)
       if (verhdr != NULL
          && verhdr->sh_size / sizeof (Elf_External_Versym) != symcount)
        {
-         (*_bfd_error_handler)
-           (_("%s: version count (%ld) does not match symbol count (%ld)"),
-            abfd->filename,
+         _bfd_error_handler
+           /* xgettext:c-format */
+           (_("%B: version count (%ld) does not match symbol count (%ld)"),
+            abfd,
             (long) (verhdr->sh_size / sizeof (Elf_External_Versym)),
             symcount);
 
@@ -1302,6 +1306,7 @@ elf_slurp_symbol_table (bfd *abfd, asymbol **symptrs, bfd_boolean dynamic)
            case STT_COMMON:
              /* FIXME: Do we have to put the size field into the value field
                 as we do with symbols in SHN_COMMON sections (see above) ?  */
+             sym->symbol.flags |= BSF_ELF_COMMON;
              /* Fall through.  */
            case STT_OBJECT:
              sym->symbol.flags |= BSF_OBJECT;
@@ -1438,9 +1443,10 @@ elf_slurp_reloc_table_from_section (bfd *abfd,
        relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
       else if (ELF_R_SYM (rela.r_info) > symcount)
        {
-         (*_bfd_error_handler)
-           (_("%s(%s): relocation %d has invalid symbol index %ld"),
-            abfd->filename, asect->name, i, ELF_R_SYM (rela.r_info));
+         _bfd_error_handler
+           /* xgettext:c-format */
+           (_("%B(%A): relocation %d has invalid symbol index %ld"),
+            abfd, asect, i, ELF_R_SYM (rela.r_info));
          relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
        }
       else