Use official ELF machine number for moxie

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

diff --git a/bfd/elf32-moxie.c b/bfd/elf32-moxie.c
index 5a4fd85fad768436bc116d1f0936699a514ad810..51b0cfcb489bfe0388b5476b70332291763c3abe 100644 (file)
--- a/bfd/elf32-moxie.c
+++ b/bfd/elf32-moxie.c
@@ -1,8 +1,8 @@
 /* moxie-specific support for 32-bit ELF.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 Free Software Foundation, Inc.
 
    Copied from elf32-fr30.c which is..
-   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.
 
@@ -131,7 +131,11 @@ moxie_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_MOXIE_max);
+  if (r_type >= (unsigned int) R_MOXIE_max)
+    {
+      _bfd_error_handler (_("%A: invalid Moxie reloc number: %d"), abfd, r_type);
+      r_type = 0;
+    }
   cache_ptr->howto = & moxie_elf_howto_table [r_type];
 }
 \f
@@ -367,11 +371,12 @@ moxie_elf_check_relocs (bfd *abfd,
 \f
 #define ELF_ARCH               bfd_arch_moxie
 #define ELF_MACHINE_CODE       EM_MOXIE
+#define ELF_MACHINE_ALT1        EM_MOXIE_OLD
 #define ELF_MAXPAGESIZE                0x1
 
-#define TARGET_BIG_SYM          bfd_elf32_bigmoxie_vec
+#define TARGET_BIG_SYM          moxie_elf32_be_vec
 #define TARGET_BIG_NAME                "elf32-bigmoxie"
-#define TARGET_LITTLE_SYM       bfd_elf32_littlemoxie_vec
+#define TARGET_LITTLE_SYM       moxie_elf32_le_vec
 #define TARGET_LITTLE_NAME     "elf32-littlemoxie"
 
 #define elf_info_to_howto_rel                  NULL