Reinstate readelf decoding of i860 and i960 machine names

Decoding of EM_* ought to continue.

	* readelf.c (get_machine_name): Revert 2018-04-11 change.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 88e4b569acabd516677a524607f62e7de9e4848a..4ce690d67809dc77f978d3b0b59d78b6953adaf7 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2018-04-14  Alan Modra  <amodra@gmail.com>
+
+       * readelf.c (get_machine_name): Revert 2018-04-11 change.
+
 2018-04-12  Nick Clifton  <nickc@redhat.com>
 
        PR 23050

diff --git a/binutils/readelf.c b/binutils/readelf.c
index 4b6f9fc8ac610408223530c8649bcfaab7e08ecd..cfd35d2cd67e5a197e708cb2694f479456a6ef6a 100644 (file)
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -2252,6 +2252,7 @@ get_machine_name (unsigned e_machine)
     case EM_68K:               return "MC68000";
     case EM_88K:               return "MC88000";
     case EM_IAMCU:             return "Intel MCU";
+    case EM_860:               return "Intel 80860";
     case EM_MIPS:              return "MIPS R3000";
     case EM_S370:              return "IBM System/370";
       /* 10 */
@@ -2260,6 +2261,7 @@ get_machine_name (unsigned e_machine)
     case EM_PARISC:            return "HPPA";
     case EM_VPP550:            return "Fujitsu VPP500";
     case EM_SPARC32PLUS:       return "Sparc v8+" ;
+    case EM_960:               return "Intel 90860";
     case EM_PPC:               return "PowerPC";
       /* 20 */
     case EM_PPC64:             return "PowerPC64";