Use official ELF machine number for moxie

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index d59075a6f36fdb5600a90b20fc20653f3440aba9..1bc66e419a74ed729e64a202b023059641cb7d64 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-09  Anthony Green  <green@moxielogic.com>
+
+       * elf32-moxie.c (ELF_MACHINE_ALT1): Define.
+
 2015-01-08  Nick Clifton  <nickc@redhat.com>
 
        * elf32-msp430.c (msp430_elf_relax_section): Add relaxation of

diff --git a/bfd/elf32-moxie.c b/bfd/elf32-moxie.c
index d9fc24fc35137a7bb717d66887de20ae0e1cc404..51b0cfcb489bfe0388b5476b70332291763c3abe 100644 (file)
--- a/bfd/elf32-moxie.c
+++ b/bfd/elf32-moxie.c
@@ -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

diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index 7cd53049901d095d15134899de00f7bc2ccb7d76..6eb7b8f23bf7ef14299c5a41af3aff1634ae15ff 100644 (file)
--- a/include/elf/ChangeLog
+++ b/include/elf/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-09  Anthony Green  <green@moxielogic.com>
+
+       * common.h (EM_MOXIE): Redefine to official number.
+       (EM_MOXIE_OLD): Define (from old number).
+
 2015-01-01  Alan Modra  <amodra@gmail.com>
 
        Update year range in copyright notice of all files.

diff --git a/include/elf/common.h b/include/elf/common.h
index a564cae8de7399a888cc9f0d3c0c427f518d4d3c..f584e34f7a1c121ca0dd661817c0cc5648854627 100644 (file)
--- a/include/elf/common.h
+++ b/include/elf/common.h
@@ -302,6 +302,7 @@
 #define EM_INTEL208    208     /* Reserved by Intel */
 #define EM_INTEL209    209     /* Reserved by Intel */
 #define EM_VISIUM      221     /* Controls and Data Services VISIUMcore processor */
+#define EM_MOXIE        223     /* Moxie processor family */
 
 /* If it is necessary to assign new unofficial EM_* values, please pick large
    random numbers (0x8523, 0xa7f2, etc.) to minimize the chances of collision
@@ -394,7 +395,8 @@
 
 #define EM_CYGNUS_MEP          0xF00D  /* Toshiba MeP */
 
-#define EM_MOXIE                0xFEED  /* Moxie */
+/* Old, unofficial value for Moxie.  */
+#define EM_MOXIE_OLD            0xFEED
 
 /* Old Sunplus S+core7 backend magic number. Written in the absence of an ABI.  */
 #define EM_SCORE_OLD            95