Define EM_ALTERA_NIOS2 and EM_NIOS32.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 353af28c652f4def65b5f98e7e99a0f475501e99..3c2b56a0f7e6fd539d51b669241b737464d694b3 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-09  Mike Frysinger  <vapier@gentoo.org>:
+
+       * readelf.c (guess_is_rela): Add case for Nios/Nios II.
+       (get_machine_name): Likewise.
+
 2005-12-30  Jie Zhang  <jie.zhang@analog.com>
 
        * readelf.c (get_machine_name): Add case for Blackfin.

diff --git a/binutils/readelf.c b/binutils/readelf.c
index ff243b95dc10f734e4cbe552151140b07c215928..b432b0bc8312f8643f21d4c60da908571489b78c 100644 (file)
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -1,5 +1,5 @@
 /* readelf.c -- display contents of an ELF format file
-   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
 
    Originally developed by Eric Youngdale <eric@andante.jic.com>
@@ -611,6 +611,8 @@ guess_is_rela (unsigned long e_machine)
     case EM_M32C:
     case EM_MT:
     case EM_BLACKFIN:
+    case EM_NIOS32:
+    case EM_ALTERA_NIOS2:
       return TRUE;
 
     case EM_MMA:
@@ -1689,6 +1691,8 @@ get_machine_name (unsigned e_machine)
     case EM_M32C:              return "Renesas M32c";
     case EM_MT:                 return "Morpho Techologies MT processor";
     case EM_BLACKFIN:          return "Analog Devices Blackfin";
+    case EM_NIOS32:            return "Altera Nios";
+    case EM_ALTERA_NIOS2:      return "Altera Nios II";
     default:
       snprintf (buff, sizeof (buff), _("<unknown>: %x"), e_machine);
       return buff;

diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index 55621dc6d13bfa1e186247dc37d2a58779c943df..372bef5588bf9d523a597465f64557c04168b5ce 100644 (file)
--- a/include/elf/ChangeLog
+++ b/include/elf/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-09  Mike Frysinger  <vapier@gentoo.org>:
+
+       * common.h (EM_ALTERA_NIOS2, EM_NIOS32) Define.
+
 2005-12-16  Nathan Sidwell  <nathan@codesourcery.com>
 
        Second part of ms1 to mt renaming.

diff --git a/include/elf/common.h b/include/elf/common.h
index faed7314c5b2bb0088725ae82ebf650e1c87d388..0108c4f7ad63f59e0fd51f0541553dd815bfe33f 100644 (file)
--- a/include/elf/common.h
+++ b/include/elf/common.h
@@ -183,6 +183,7 @@
 #define EM_CR          103     /* National Semiconductor CompactRISC */
 #define EM_MSP430      105     /* TI msp430 micro controller */
 #define EM_BLACKFIN    106     /* ADI Blackfin */
+#define EM_ALTERA_NIOS2        113     /* Altera Nios II soft-core processor */
 #define EM_CRX         114     /* National Semiconductor CRX */
 
 /* If it is necessary to assign new unofficial EM_* values, please pick large
@@ -267,11 +268,14 @@
       Written in the absense everything.  */
 #define EM_MSP430_OLD          0x1059
 
+/* Old, unofficial value for Xtensa.  */
+#define EM_XTENSA_OLD          0xabc7
+
 /* Vitesse IQ2000.  */
 #define EM_IQ2000              0xFEBA
 
-/* Old, unofficial value for Xtensa.  */
-#define EM_XTENSA_OLD          0xabc7
+/* NIOS magic number - no EABI available.  */
+#define EM_NIOS32              0xFEBB
 
 /* See the above comment before you add a new EM_* value here.  */