Automatic date update in version.in

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

diff --git a/bfd/elf32-visium.c b/bfd/elf32-visium.c
index 637d72bc2f2d17a9edcfbc15287caae3e2915322..db854a068e33c6d56b1ef79b7a7013dc67082394 100644 (file)
--- a/bfd/elf32-visium.c
+++ b/bfd/elf32-visium.c
@@ -1,6 +1,6 @@
 /* Visium-specific support for 32-bit ELF.
 
-   Copyright (C) 2003-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2016 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -276,32 +276,6 @@ static reloc_howto_type visium_elf_vtentry_howto =
         0,                        /* dst_mask */
         FALSE);                   /* pcrel_offset */
 
-/* Map BFD reloc types to VISIUM ELF reloc types.  */
-struct visium_reloc_map
-{
-  bfd_reloc_code_real_type bfd_reloc_val;
-  unsigned int visium_reloc_val;
-};
-
-static const struct visium_reloc_map visium_reloc_map[] = {
-  {BFD_RELOC_NONE,             R_VISIUM_NONE},
-  {BFD_RELOC_8,                R_VISIUM_8},
-  {BFD_RELOC_16,               R_VISIUM_16},
-  {BFD_RELOC_32,               R_VISIUM_32},
-  {BFD_RELOC_8_PCREL,          R_VISIUM_8_PCREL},
-  {BFD_RELOC_16_PCREL,         R_VISIUM_16_PCREL},
-  {BFD_RELOC_32_PCREL,         R_VISIUM_32_PCREL},
-  {BFD_RELOC_VISIUM_REL16,     R_VISIUM_PC16},
-  {BFD_RELOC_VISIUM_HI16,      R_VISIUM_HI16},
-  {BFD_RELOC_VISIUM_LO16,      R_VISIUM_LO16},
-  {BFD_RELOC_VISIUM_IM16,      R_VISIUM_IM16},
-  {BFD_RELOC_VISIUM_HI16_PCREL,        R_VISIUM_HI16_PCREL},
-  {BFD_RELOC_VISIUM_LO16_PCREL,        R_VISIUM_LO16_PCREL},
-  {BFD_RELOC_VISIUM_IM16_PCREL,        R_VISIUM_IM16_PCREL},
-  {BFD_RELOC_VTABLE_INHERIT,   R_VISIUM_GNU_VTINHERIT},
-  {BFD_RELOC_VTABLE_ENTRY,     R_VISIUM_GNU_VTENTRY},
-};
-
 /* Return the parity bit for INSN shifted to its final position.  */
 
 static bfd_vma
@@ -688,13 +662,13 @@ visium_elf_relocate_section (bfd *output_bfd,
          switch (r)
            {
            case bfd_reloc_overflow:
-             r = info->callbacks->reloc_overflow
+             (*info->callbacks->reloc_overflow)
                (info, (h ? &h->root : NULL), name, howto->name, (bfd_vma) 0,
                 input_bfd, input_section, rel->r_offset);
              break;
 
            case bfd_reloc_undefined:
-             r = info->callbacks->undefined_symbol
+             (*info->callbacks->undefined_symbol)
                (info, name, input_bfd, input_section, rel->r_offset, TRUE);
              break;
 
@@ -716,11 +690,8 @@ visium_elf_relocate_section (bfd *output_bfd,
            }
 
          if (msg)
-           r = info->callbacks->warning
-             (info, msg, name, input_bfd, input_section, rel->r_offset);
-
-         if (!r)
-           return FALSE;
+           (*info->callbacks->warning) (info, msg, name, input_bfd,
+                                        input_section, rel->r_offset);
        }
     }