Use official ELF machine number for moxie

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

diff --git a/bfd/elf32-fr30.c b/bfd/elf32-fr30.c
index 73b2d91541830d1a89b19456b38e352bca9f687a..620a43fd46c285b5f914c54b5b0bdde08e3e8095 100644 (file)
--- a/bfd/elf32-fr30.c
+++ b/bfd/elf32-fr30.c
@@ -1,5 +1,5 @@
 /* FR30-specific support for 32-bit ELF.
-   Copyright (C) 1998-2014 Free Software Foundation, Inc.
+   Copyright (C) 1998-2015 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -375,7 +375,11 @@ fr30_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED,
   unsigned int r_type;
 
   r_type = ELF32_R_TYPE (dst->r_info);
-  BFD_ASSERT (r_type < (unsigned int) R_FR30_max);
+  if (r_type >= (unsigned int) R_FR30_max)
+    {
+      _bfd_error_handler (_("%A: invalid FR30 reloc number: %d"), abfd, r_type);
+      r_type = 0;
+    }
   cache_ptr->howto = & fr30_elf_howto_table [r_type];
 }
 \f
@@ -703,7 +707,7 @@ fr30_elf_check_relocs (bfd *abfd,
 #define ELF_MACHINE_ALT1       EM_CYGNUS_FR30
 #define ELF_MAXPAGESIZE                0x1000
 
-#define TARGET_BIG_SYM          bfd_elf32_fr30_vec
+#define TARGET_BIG_SYM          fr30_elf32_vec
 #define TARGET_BIG_NAME                "elf32-fr30"
 
 #define elf_info_to_howto_rel                  NULL