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 9a031b498f6efe29e3795de73b12f8fde34e6364..51b0cfcb489bfe0388b5476b70332291763c3abe 100644 (file)
--- a/bfd/elf32-moxie.c
+++ b/bfd/elf32-moxie.c
@@ -1,9 +1,8 @@
 /* moxie-specific support for 32-bit ELF.
-   Copyright 2009, 2010, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 Free Software Foundation, Inc.
 
    Copied from elf32-fr30.c which is..
-   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-   Free Software Foundation, Inc.
+   Copyright (C) 1998-2015 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -132,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
@@ -240,12 +243,12 @@ moxie_elf_relocate_section (bfd *output_bfd,
        }
       else
        {
-         bfd_boolean unresolved_reloc, warned;
+         bfd_boolean unresolved_reloc, warned, ignored;
 
          RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
                                   r_symndx, symtab_hdr, sym_hashes,
                                   h, sec, relocation,
-                                  unresolved_reloc, warned);
+                                  unresolved_reloc, warned, ignored);
 
          name = h->root.root.string;
        }
@@ -356,6 +359,10 @@ moxie_elf_check_relocs (bfd *abfd,
          while (h->root.type == bfd_link_hash_indirect
                 || h->root.type == bfd_link_hash_warning)
            h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+         /* PR15323, ref flags aren't set for references in the same
+            object.  */
+         h->root.non_ir_ref = 1;
        }
     }
 
@@ -364,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