More fixes related to NONE relocs

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

diff --git a/bfd/elf32-moxie.c b/bfd/elf32-moxie.c
index 56c054b66bfb13ea639d82223f36cc34a349e688..7123ac10411182d6710fec2551e5c9731718120d 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.
 
@@ -34,11 +34,11 @@ static reloc_howto_type moxie_elf_howto_table [] =
   /* This reloc does nothing.  */
   HOWTO (R_MOXIE_NONE,         /* type */
         0,                     /* rightshift */
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */
-        32,                    /* bitsize */
+        3,                     /* size (0 = byte, 1 = short, 2 = long) */
+        0,                     /* bitsize */
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
-        complain_overflow_bitfield, /* complain_on_overflow */
+        complain_overflow_dont, /* complain_on_overflow */
         bfd_elf_generic_reloc, /* special_function */
         "R_MOXIE_NONE",                /* name */
         FALSE,                 /* partial_inplace */
@@ -99,7 +99,7 @@ moxie_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
   unsigned int i;
 
   for (i = sizeof (moxie_reloc_map) / sizeof (moxie_reloc_map[0]);
-       --i;)
+       i--;)
     if (moxie_reloc_map [i].bfd_reloc_val == code)
       return & moxie_elf_howto_table [moxie_reloc_map[i].moxie_reloc_val];
 
@@ -371,6 +371,7 @@ 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          moxie_elf32_be_vec