bfd: fix handling of R_BPF_INSN_{32,64} relocations.

[deliverable/binutils-gdb.git] / bfd / elf32-d10v.c

diff --git a/bfd/elf32-d10v.c b/bfd/elf32-d10v.c
index 0c05106835a9f3d256a9d05f76c6cc3644b98ebd..9f921c907ac993d7f3a2800a9b27dc7bcd03d430 100644 (file)
--- a/bfd/elf32-d10v.c
+++ b/bfd/elf32-d10v.c
@@ -1,5 +1,5 @@
 /* D10V-specific support for 32-bit ELF
-   Copyright (C) 1996-2019 Free Software Foundation, Inc.
+   Copyright (C) 1996-2020 Free Software Foundation, Inc.
    Contributed by Martin Hunt (hunt@cygnus.com).
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -308,9 +308,7 @@ elf32_d10v_check_relocs (bfd *abfd,
        /* This relocation describes which C++ vtable entries are actually
           used.  Record for later use during GC.  */
        case R_D10V_GNU_VTENTRY:
-         BFD_ASSERT (h != NULL);
-         if (h != NULL
-             && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_offset))
+         if (!bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_offset))
            return FALSE;
          break;
        }
@@ -484,7 +482,7 @@ elf32_d10v_relocate_section (bfd *output_bfd,
          name = (bfd_elf_string_from_elf_section
                  (input_bfd, symtab_hdr->sh_link, sym->st_name));
          if (name == NULL || *name == '\0')
-           name = bfd_section_name (input_bfd, sec);
+           name = bfd_section_name (sec);
        }
 
       r = _bfd_final_link_relocate (howto, input_bfd, input_section,
@@ -545,7 +543,6 @@ elf32_d10v_relocate_section (bfd *output_bfd,
 #define elf_info_to_howto                   NULL
 #define elf_info_to_howto_rel               d10v_info_to_howto_rel
 #define elf_backend_object_p                0
-#define elf_backend_final_write_processing   0
 #define elf_backend_gc_mark_hook            elf32_d10v_gc_mark_hook
 #define elf_backend_check_relocs            elf32_d10v_check_relocs
 #define elf_backend_relocate_section        elf32_d10v_relocate_section