s390: Add support for z17 as CPU name

So far IBM z17 was identified as arch15.  Add the real name, as it has
been announced. [1]

[1]: IBM z17 announcement letter, AD25-0015,
     https://www.ibm.com/docs/en/announcements/z17-makes-more-possible

gas/
	* config/tc-s390.c (s390_parse_cpu): Add z17 as alternate CPU
	name for arch15.
	* doc/c-s390.texi: Likewise.
	* doc/as.texi: Likewise.

opcodes/
	* s390-mkopc.c (main): Add z17 as alternate CPU name for arch15.

Signed-off-by: Jens Remus <jremus@linux.ibm.com>
(cherry picked from commit 981fe5fd80faf511aa265e841a380c9b46be30e6)

diff --git a/gas/config/tc-s390.c b/gas/config/tc-s390.c
index 2e34d2afc4b25618e1f1e6eab6a3355357851fd6..4fb459061cd17581b543a854b01a7bbe9417dbb7 100644 (file)
--- a/gas/config/tc-s390.c
+++ b/gas/config/tc-s390.c
@@ -295,7 +295,7 @@ s390_parse_cpu (const char *arg,
       S390_INSTR_FLAG_HTM | S390_INSTR_FLAG_VX },
     { STRING_COMMA_LEN ("z16"), STRING_COMMA_LEN ("arch14"),
       S390_INSTR_FLAG_HTM | S390_INSTR_FLAG_VX },
-    { STRING_COMMA_LEN (""), STRING_COMMA_LEN ("arch15"),
+    { STRING_COMMA_LEN ("z17"), STRING_COMMA_LEN ("arch15"),
       S390_INSTR_FLAG_HTM | S390_INSTR_FLAG_VX }
   };
   static struct

diff --git a/gas/doc/as.texi b/gas/doc/as.texi
index c178fe31d239aed8a6f7097a6f3b8079ab05624b..600ce8f5f5de8c0d0e60788e18d69abf183a75d8 100644 (file)
--- a/gas/doc/as.texi
+++ b/gas/doc/as.texi
@@ -1938,7 +1938,8 @@ Specify which s390 processor variant is the target, @samp{g5} (or
 @samp{arch6}), @samp{z9-109}, @samp{z9-ec} (or @samp{arch7}), @samp{z10} (or
 @samp{arch8}), @samp{z196} (or @samp{arch9}), @samp{zEC12} (or @samp{arch10}),
 @samp{z13} (or @samp{arch11}), @samp{z14} (or @samp{arch12}), @samp{z15}
-(or @samp{arch13}), @samp{z16} (or @samp{arch14}), or @samp{arch15}.
+(or @samp{arch13}), @samp{z16} (or @samp{arch14}), or @samp{z17} (or
+@samp{arch15}).
 @item -mregnames
 @itemx -mno-regnames
 Allow or disallow symbolic names for registers.

diff --git a/gas/doc/c-s390.texi b/gas/doc/c-s390.texi
index 1ebc9ad84e081c9642efbe08f302eabbba388417..745042dcbfdcc816b11978dc46c34f1dbf7c39d1 100644 (file)
--- a/gas/doc/c-s390.texi
+++ b/gas/doc/c-s390.texi
@@ -18,7 +18,8 @@ and eleven chip levels. The architecture modes are the Enterprise System
 Architecture (ESA) and the newer z/Architecture mode. The chip levels
 are g5 (or arch3), g6, z900 (or arch5), z990 (or arch6), z9-109, z9-ec
 (or arch7), z10 (or arch8), z196 (or arch9), zEC12 (or arch10), z13
-(or arch11), z14 (or arch12), z15 (or arch13), z16 (or arch14), or arch15.
+(or arch11), z14 (or arch12), z15 (or arch13), z16 (or arch14), or
+z17 (arch15).
 
 @menu
 * s390 Options::                Command-line Options.
@@ -73,7 +74,7 @@ are recognized:
 @code{z14} (or @code{arch12}),
 @code{z15} (or @code{arch13}),
 @code{z16} (or @code{arch14}), and
-@code{arch15}.
+@code{z17} (or @code{arch15}).
 
 Assembling an instruction that is not supported on the target
 processor results in an error message.

diff --git a/opcodes/s390-mkopc.c b/opcodes/s390-mkopc.c
index a955a0d8a7c3714e30f816979a2b742b2bc72880..f1e2e20ea2e13a607a82770df5b71762f7aa8950 100644 (file)
--- a/opcodes/s390-mkopc.c
+++ b/opcodes/s390-mkopc.c
@@ -384,7 +384,8 @@ main (void)
       else if (strcmp (cpu_string, "z16") == 0
               || strcmp (cpu_string, "arch14") == 0)
        min_cpu = S390_OPCODE_ARCH14;
-      else if (strcmp (cpu_string, "arch15") == 0)
+      else if (strcmp (cpu_string, "z17") == 0
+              || strcmp (cpu_string, "arch15") == 0)
        min_cpu = S390_OPCODE_ARCH15;
       else {
        fprintf (stderr, "Couldn't parse cpu string %s\n", cpu_string);