assorted target messages

[binutils-gdb.git] / bfd / elf32-i960.c

diff --git a/bfd/elf32-i960.c b/bfd/elf32-i960.c
index 10e6e55aa872f1dccdc02bd2996e45deb80fb3c8..dbfb1bb0f8b463499a8079463ff6f5e3f0dfc495 100644 (file)
--- a/bfd/elf32-i960.c
+++ b/bfd/elf32-i960.c
@@ -1,12 +1,11 @@
 /* Intel 960 specific support for 32-bit ELF
-   Copyright 1999, 2000, 2001, 2002, 2003, 2005, 2007
-   Free Software Foundation, Inc.
+   Copyright (C) 1999-2018 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -47,7 +46,7 @@ static bfd_reloc_status_type
 elf32_i960_relocate (bfd *abfd ATTRIBUTE_UNUSED,
                     arelent *reloc_entry,
                     asymbol *symbol,
-                    PTR data ATTRIBUTE_UNUSED,
+                    void * data ATTRIBUTE_UNUSED,
                     asection *input_section,
                     bfd *output_bfd,
                     char **error_message ATTRIBUTE_UNUSED)
@@ -84,7 +83,7 @@ elf32_i960_relocate (bfd *abfd ATTRIBUTE_UNUSED,
 
 static reloc_howto_type elf_howto_table[]=
 {
-  HOWTO (R_960_NONE, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+  HOWTO (R_960_NONE, 0, 3, 0, FALSE, 0, complain_overflow_dont,
         elf32_i960_relocate, "R_960_NONE", TRUE,
         0x00000000, 0x00000000, FALSE),
   EMPTY_HOWTO (1),
@@ -118,8 +117,8 @@ elf32_i960_bfd_to_reloc_type (bfd_reloc_code_real_type code)
 }
 
 static void
-elf32_i960_info_to_howto (bfd *               abfd ATTRIBUTE_UNUSED,
-                         arelent *           cache_ptr ATTRIBUTE_UNUSED,
+elf32_i960_info_to_howto (bfd *                      abfd ATTRIBUTE_UNUSED,
+                         arelent *           cache_ptr ATTRIBUTE_UNUSED,
                          Elf_Internal_Rela * dst ATTRIBUTE_UNUSED)
 {
   abort ();
@@ -133,7 +132,15 @@ elf32_i960_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED,
   enum elf_i960_reloc_type type;
 
   type = (enum elf_i960_reloc_type) ELF32_R_TYPE (dst->r_info);
-  BFD_ASSERT (type < R_960_max);
+
+  /* PR 17521: file: 9609b8d6.  */
+  if (type >= R_960_max)
+    {
+      /* xgettext:c-format */
+      _bfd_error_handler (_("%pB: unsupported relocation type %#x"),
+                         abfd, type);
+      type = 0;
+    }
 
   cache_ptr->howto = &elf_howto_table[(int) type];
 }
@@ -159,10 +166,10 @@ elf32_i960_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
   return NULL;
 }
 
-#define TARGET_LITTLE_SYM      bfd_elf32_i960_vec
+#define TARGET_LITTLE_SYM      i960_elf32_vec
 #define TARGET_LITTLE_NAME     "elf32-i960"
 #define ELF_ARCH               bfd_arch_i960
 #define ELF_MACHINE_CODE       EM_960
-#define ELF_MAXPAGESIZE        1 /* FIXME: This number is wrong,  It should be the page size in bytes.  */
+#define ELF_MAXPAGESIZE                1 /* FIXME: This number is wrong,  It should be the page size in bytes.  */
 
 #include "elf32-target.h"