X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=opcodes%2Fs390-mkopc.c;h=d8ac6105b9ea7963354e364676750fdbb4b59ba3;hb=9889cbb14ebea4b281408afcfd94ad6646ab370a;hp=08ed56db055762ba90bfe22f3f6f98485eba3801;hpb=6f2750feaf2827ef8a1a0a5b2f90c1e9a6cabbd1;p=deliverable%2Fbinutils-gdb.git

diff --git a/opcodes/s390-mkopc.c b/opcodes/s390-mkopc.c
index 08ed56db05..d8ac6105b9 100644
--- a/opcodes/s390-mkopc.c
+++ b/opcodes/s390-mkopc.c
@@ -334,7 +334,7 @@ main (void)
       char  *str;
 
       if (currentLine[0] == '#' || currentLine[0] == '\n')
-        continue;
+	continue;
       memset (opcode, 0, 8);
       num_matched =
 	sscanf (currentLine, "%15s %15s %15s \"%79[^\"]\" %15s %15s %79[^\n]",
@@ -346,25 +346,33 @@ main (void)
 	  exit (1);
 	}
 
-      if (strcmp (cpu_string, "g5") == 0)
+      if (strcmp (cpu_string, "g5") == 0
+	  || strcmp (cpu_string, "arch3") == 0)
 	min_cpu = S390_OPCODE_G5;
       else if (strcmp (cpu_string, "g6") == 0)
 	min_cpu = S390_OPCODE_G6;
-      else if (strcmp (cpu_string, "z900") == 0)
+      else if (strcmp (cpu_string, "z900") == 0
+	       || strcmp (cpu_string, "arch5") == 0)
 	min_cpu = S390_OPCODE_Z900;
-      else if (strcmp (cpu_string, "z990") == 0)
+      else if (strcmp (cpu_string, "z990") == 0
+	       || strcmp (cpu_string, "arch6") == 0)
 	min_cpu = S390_OPCODE_Z990;
       else if (strcmp (cpu_string, "z9-109") == 0)
 	min_cpu = S390_OPCODE_Z9_109;
-      else if (strcmp (cpu_string, "z9-ec") == 0)
+      else if (strcmp (cpu_string, "z9-ec") == 0
+	       || strcmp (cpu_string, "arch7") == 0)
 	min_cpu = S390_OPCODE_Z9_EC;
-      else if (strcmp (cpu_string, "z10") == 0)
+      else if (strcmp (cpu_string, "z10") == 0
+	       || strcmp (cpu_string, "arch8") == 0)
 	min_cpu = S390_OPCODE_Z10;
-      else if (strcmp (cpu_string, "z196") == 0)
+      else if (strcmp (cpu_string, "z196") == 0
+	       || strcmp (cpu_string, "arch9") == 0)
 	min_cpu = S390_OPCODE_Z196;
-      else if (strcmp (cpu_string, "zEC12") == 0)
+      else if (strcmp (cpu_string, "zEC12") == 0
+	       || strcmp (cpu_string, "arch10") == 0)
 	min_cpu = S390_OPCODE_ZEC12;
-      else if (strcmp (cpu_string, "z13") == 0)
+      else if (strcmp (cpu_string, "z13") == 0
+	       || strcmp (cpu_string, "arch11") == 0)
 	min_cpu = S390_OPCODE_Z13;
       else {
 	fprintf (stderr, "Couldn't parse cpu string %s\n", cpu_string);