PR linker/5099

[deliverable/binutils-gdb.git] / bfd / elf64-x86-64.c

diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index 34eae58768a0a371061152ad5e08a6f68eeebf4a..2953bac29e838027ace84757923f081ffc12d07d 100644 (file)
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -952,7 +952,7 @@ elf64_x86_64_tls_transition (struct bfd_link_info *info, bfd *abfd,
                                              symtab_hdr, sym_hashes,
                                              from_type, rel, relend))
     {
-      const reloc_howto_type *from, *to;
+      reloc_howto_type *from, *to;
 
       from = elf64_x86_64_rtype_to_howto (abfd, from_type);
       to = elf64_x86_64_rtype_to_howto (abfd, to_type);
@@ -1130,7 +1130,7 @@ elf64_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info,
                else
                  {
                    (*_bfd_error_handler)
-                     (_("%B: %s' accessed both as normal and thread local symbol"),
+                     (_("%B: '%s' accessed both as normal and thread local symbol"),
                       abfd, h ? h->root.root.string : "<local>");
                    return FALSE;
                  }
@@ -1378,7 +1378,9 @@ elf64_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info,
          /* This relocation describes which C++ vtable entries are actually
             used.  Record for later use during GC.  */
        case R_X86_64_GNU_VTENTRY:
-         if (!bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+         BFD_ASSERT (h != NULL);
+         if (h != NULL
+             && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
            return FALSE;
          break;
 
@@ -2761,7 +2763,7 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
                                             symtab_hdr, sym_hashes,
                                             &r_type, tls_type, rel,
                                             relend, h))
-             return FALSE;
+           return FALSE;
 
          if (r_type == R_X86_64_TPOFF32)
            {