diff -rup binutils-2.35.2/gas/config/tc-s390.c fred/gas/config/tc-s390.c --- binutils-2.35.2/gas/config/tc-s390.c 2022-04-11 08:54:46.529179603 +0100 +++ fred/gas/config/tc-s390.c 2022-04-11 08:51:08.030832065 +0100 @@ -293,7 +293,7 @@ s390_parse_cpu (const char * arg S390_INSTR_FLAG_HTM | S390_INSTR_FLAG_VX }, { STRING_COMMA_LEN ("z15"), STRING_COMMA_LEN ("arch13"), S390_INSTR_FLAG_HTM | S390_INSTR_FLAG_VX }, - { STRING_COMMA_LEN (""), STRING_COMMA_LEN ("arch14"), + { STRING_COMMA_LEN ("z16"), STRING_COMMA_LEN ("arch14"), S390_INSTR_FLAG_HTM | S390_INSTR_FLAG_VX } }; static struct diff -rup binutils-2.35.2/gas/doc/as.texi fred/gas/doc/as.texi --- binutils-2.35.2/gas/doc/as.texi 2022-04-11 08:54:46.099182880 +0100 +++ fred/gas/doc/as.texi 2022-04-11 08:52:33.088196625 +0100 @@ -1872,8 +1872,8 @@ Specify which s390 processor variant is @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}), @samp{z14} (or @samp{arch12}), or @samp{z15} -(or @samp{arch13}). +@samp{z13} (or @samp{arch11}), @samp{z14} (or @samp{arch12}), @samp{z15} +(or @samp{arch13}), or @samp{z16} (or @samp{arch14}). @item -mregnames @itemx -mno-regnames Allow or disallow symbolic names for registers. diff -rup binutils-2.35.2/gas/doc/c-s390.texi fred/gas/doc/c-s390.texi --- binutils-2.35.2/gas/doc/c-s390.texi 2022-04-11 08:54:46.551179435 +0100 +++ fred/gas/doc/c-s390.texi 2022-04-11 08:51:50.623520271 +0100 @@ -18,7 +18,7 @@ and eleven chip levels. The architecture 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), or arch14. +(or arch11), z14 (or arch12), z15 (or arch13), or z16 (or arch14). @menu * s390 Options:: Command-line Options. diff -rup binutils-2.35.2/opcodes/s390-mkopc.c fred/opcodes/s390-mkopc.c --- binutils-2.35.2/opcodes/s390-mkopc.c 2022-04-11 08:54:46.530179595 +0100 +++ fred/opcodes/s390-mkopc.c 2022-04-11 08:53:04.701955680 +0100 @@ -380,7 +380,8 @@ main (void) else if (strcmp (cpu_string, "z15") == 0 || strcmp (cpu_string, "arch13") == 0) min_cpu = S390_OPCODE_ARCH13; - else if (strcmp (cpu_string, "arch14") == 0) + else if (strcmp (cpu_string, "z16") == 0 + || strcmp (cpu_string, "arch14") == 0) min_cpu = S390_OPCODE_ARCH14; else { fprintf (stderr, "Couldn't parse cpu string %s\n", cpu_string);