Automatic date update in version.in

[thirdparty/binutils-gdb.git] / bfd / elf32-m68hc1x.c

diff --git a/bfd/elf32-m68hc1x.c b/bfd/elf32-m68hc1x.c
index 794663a9e194a1434c1cec75b67d9e586769dda4..6a996789b5bbf0fb9f030fe6605b09a9c0d6653e 100644 (file)
--- a/bfd/elf32-m68hc1x.c
+++ b/bfd/elf32-m68hc1x.c
@@ -1,5 +1,5 @@
 /* Motorola 68HC11/HC12-specific support for 32-bit ELF
-   Copyright (C) 1999-2018 Free Software Foundation, Inc.
+   Copyright (C) 1999-2019 Free Software Foundation, Inc.
    Contributed by Stephane Carrez (stcarrez@nerim.fr)
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -890,9 +890,7 @@ elf32_m68hc11_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_M68HC11_GNU_VTENTRY:
-         BFD_ASSERT (h != NULL);
-         if (h != NULL
-             && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+         if (!bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
            return FALSE;
          break;
        }
@@ -963,7 +961,8 @@ elf32_m68hc11_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
          || r_type == R_M68HC11_GNU_VTINHERIT)
        continue;
 
-      (*ebd->elf_info_to_howto_rel) (input_bfd, &arel, rel);
+      if (! (*ebd->elf_info_to_howto_rel) (input_bfd, &arel, rel))
+       continue;
       howto = arel.howto;
 
       h = NULL;
@@ -1455,6 +1454,8 @@ elf32_m68hc11_post_process_headers (bfd *abfd, struct bfd_link_info *link_info)
   struct m68hc11_scan_param param;
   struct m68hc11_elf_link_hash_table *htab;
 
+  _bfd_elf_post_process_headers (abfd, link_info);
+
   if (link_info == NULL)
     return;