S/390: Add support for z15 as CPU name.

So far z15 was identified as arch13. After the machine has been
announced we can now add the real name.

gas/ChangeLog:

2019-10-08  Andreas Krebbel  <krebbel@linux.ibm.com>

	* config/tc-s390.c (s390_parse_cpu): Add z15 as alternate CPU
	name.
	* doc/as.texi: Add z15 to CPU string list.
	* doc/c-s390.texi: Likewise.

opcodes/ChangeLog:

2019-10-08  Andreas Krebbel  <krebbel@linux.ibm.com>

	* s390-mkopc.c (main): Enable z15 as CPU string in the opcode
	table.

diff --git a/gas/config/tc-s390.c b/gas/config/tc-s390.c
index a4dae4fb16d67501fc57977875ea2a66b9ef95ff..35b4a5b397b65fdb374a36db7ae9565247a1fcc5 100644 (file)
--- a/gas/config/tc-s390.c
+++ b/gas/config/tc-s390.c
@@ -291,7 +291,7 @@ s390_parse_cpu (const char *         arg,
       S390_INSTR_FLAG_HTM | S390_INSTR_FLAG_VX },
     { STRING_COMMA_LEN ("z14"), STRING_COMMA_LEN ("arch12"),
       S390_INSTR_FLAG_HTM | S390_INSTR_FLAG_VX },
       S390_INSTR_FLAG_HTM | S390_INSTR_FLAG_VX },
     { STRING_COMMA_LEN ("z14"), STRING_COMMA_LEN ("arch12"),
       S390_INSTR_FLAG_HTM | S390_INSTR_FLAG_VX },

-    { STRING_COMMA_LEN (""), STRING_COMMA_LEN ("arch13"),
+    { STRING_COMMA_LEN ("z15"), STRING_COMMA_LEN ("arch13"),

       S390_INSTR_FLAG_HTM | S390_INSTR_FLAG_VX }
   };
   static struct
       S390_INSTR_FLAG_HTM | S390_INSTR_FLAG_VX }
   };
   static struct

diff --git a/gas/doc/as.texi b/gas/doc/as.texi
index 93e80f9a4301df860fe5225b8726ff5cc9aa168c..b54ab1eeccc2ee9e6d03b23af5ab8a4754bfea11 100644 (file)
--- a/gas/doc/as.texi
+++ b/gas/doc/as.texi
@@ -1843,7 +1843,8 @@ Specify which s390 processor variant is the target, @samp{g5} (or
 @samp{arch3}), @samp{g6}, @samp{z900} (or @samp{arch5}), @samp{z990} (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{arch3}), @samp{g6}, @samp{z900} (or @samp{arch5}), @samp{z990} (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}), or @samp{z14} (or @samp{arch12}).
+@samp{z13} (or @samp{arch11}), @samp{z14} (or @samp{arch12}), or @samp{z15}
+(or @samp{arch13}).

 @item -mregnames
 @itemx -mno-regnames
 Allow or disallow symbolic names for registers.
 @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 27fa3170571efc30f04e134e9c4afcf3815931b1..8cb6d6c07d26471acc80ec331ad7c30f75187cf8 100644 (file)
--- a/gas/doc/c-s390.texi
+++ b/gas/doc/c-s390.texi
@@ -18,7 +18,7 @@ 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
 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), and arch13.
+(or arch11), z14 (or arch12), and z15 (or arch13).

 
 @menu
 * s390 Options::                Command-line Options.
 
 @menu
 * s390 Options::                Command-line Options.


@@ -71,7 +71,7 @@ are recognized:
 @code{zEC12} (or @code{arch10}),
 @code{z13} (or @code{arch11}),
 @code{z14} (or @code{arch12}), and
 @code{zEC12} (or @code{arch10}),
 @code{z13} (or @code{arch11}),
 @code{z14} (or @code{arch12}), and

-@code{arch13}).
+@code{z15} (or @code{arch13}).

 
 Assembling an instruction that is not supported on the target
 processor results in an error message.
 
 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 0d0767838e5e0b9c2d1c608af00307d712b85234..fe21ea1b7bae83d7301618844076328b3623df57 100644 (file)
--- a/opcodes/s390-mkopc.c
+++ b/opcodes/s390-mkopc.c
@@ -377,7 +377,8 @@ main (void)
       else if (strcmp (cpu_string, "z14") == 0
               || strcmp (cpu_string, "arch12") == 0)
        min_cpu = S390_OPCODE_ARCH12;
       else if (strcmp (cpu_string, "z14") == 0
               || strcmp (cpu_string, "arch12") == 0)
        min_cpu = S390_OPCODE_ARCH12;

-      else if (strcmp (cpu_string, "arch13") == 0)
+      else if (strcmp (cpu_string, "z15") == 0
+              || strcmp (cpu_string, "arch13") == 0)

        min_cpu = S390_OPCODE_ARCH13;
       else {
        fprintf (stderr, "Couldn't parse cpu string %s\n", cpu_string);
        min_cpu = S390_OPCODE_ARCH13;
       else {
        fprintf (stderr, "Couldn't parse cpu string %s\n", cpu_string);