e184e98
diff -rup binutils.orig/gas/config/tc-s390.c binutils-2.35.1/gas/config/tc-s390.c
e184e98
--- binutils.orig/gas/config/tc-s390.c	2021-02-19 11:44:24.240877612 +0000
e184e98
+++ binutils-2.35.1/gas/config/tc-s390.c	2021-02-19 11:46:05.222554434 +0000
e184e98
@@ -292,6 +292,8 @@ s390_parse_cpu (const char *         arg
e184e98
     { STRING_COMMA_LEN ("z14"), STRING_COMMA_LEN ("arch12"),
e184e98
       S390_INSTR_FLAG_HTM | S390_INSTR_FLAG_VX },
e184e98
     { STRING_COMMA_LEN ("z15"), STRING_COMMA_LEN ("arch13"),
e184e98
+      S390_INSTR_FLAG_HTM | S390_INSTR_FLAG_VX },
e184e98
+    { STRING_COMMA_LEN (""), STRING_COMMA_LEN ("arch14"),
e184e98
       S390_INSTR_FLAG_HTM | S390_INSTR_FLAG_VX }
e184e98
   };
e184e98
   static struct
e184e98
diff -rup binutils.orig/gas/doc/c-s390.texi binutils-2.35.1/gas/doc/c-s390.texi
e184e98
--- binutils.orig/gas/doc/c-s390.texi	2021-02-19 11:44:24.236877625 +0000
e184e98
+++ binutils-2.35.1/gas/doc/c-s390.texi	2021-02-19 11:46:05.223554431 +0000
e184e98
@@ -18,7 +18,7 @@ and eleven chip levels. The architecture
e184e98
 Architecture (ESA) and the newer z/Architecture mode. The chip levels
e184e98
 are g5 (or arch3), g6, z900 (or arch5), z990 (or arch6), z9-109, z9-ec
e184e98
 (or arch7), z10 (or arch8), z196 (or arch9), zEC12 (or arch10), z13
e184e98
-(or arch11), z14 (or arch12), and z15 (or arch13).
e184e98
+(or arch11), z14 (or arch12), z15 (or arch13), or arch14.
e184e98
 
e184e98
 @menu
e184e98
 * s390 Options::                Command-line Options.
e184e98
@@ -70,8 +70,9 @@ are recognized:
e184e98
 @code{z196} (or @code{arch9}),
e184e98
 @code{zEC12} (or @code{arch10}),
e184e98
 @code{z13} (or @code{arch11}),
e184e98
-@code{z14} (or @code{arch12}), and
e184e98
-@code{z15} (or @code{arch13}).
e184e98
+@code{z14} (or @code{arch12}),
e184e98
+@code{z15} (or @code{arch13}), and
e184e98
+@code{arch14}.
e184e98
 
e184e98
 Assembling an instruction that is not supported on the target
e184e98
 processor results in an error message.
e184e98
diff -rup binutils.orig/gas/testsuite/gas/s390/s390.exp binutils-2.35.1/gas/testsuite/gas/s390/s390.exp
e184e98
--- binutils.orig/gas/testsuite/gas/s390/s390.exp	2021-02-19 11:44:24.338877299 +0000
e184e98
+++ binutils-2.35.1/gas/testsuite/gas/s390/s390.exp	2021-02-19 11:46:05.223554431 +0000
e184e98
@@ -31,6 +31,7 @@ if [expr [istarget "s390-*-*"] ||  [ista
e184e98
     run_dump_test "zarch-z13" "{as -m64} {as -march=z13}"
e184e98
     run_dump_test "zarch-arch12" "{as -m64} {as -march=arch12}"
e184e98
     run_dump_test "zarch-arch13" "{as -m64} {as -march=arch13}"
e184e98
+    run_dump_test "zarch-arch14" "{as -m64} {as -march=arch14}"
e184e98
     run_dump_test "zarch-reloc" "{as -m64}"
e184e98
     run_dump_test "zarch-operands" "{as -m64} {as -march=z9-109}"
e184e98
     run_dump_test "zarch-machine" "{as -m64} {as -march=z900}"
e184e98
Only in binutils-2.35.1/gas/testsuite/gas/s390: zarch-arch14.d
e184e98
Only in binutils-2.35.1/gas/testsuite/gas/s390: zarch-arch14.s
e184e98
diff -rup binutils.orig/include/opcode/s390.h binutils-2.35.1/include/opcode/s390.h
e184e98
--- binutils.orig/include/opcode/s390.h	2021-02-19 11:44:23.926878617 +0000
e184e98
+++ binutils-2.35.1/include/opcode/s390.h	2021-02-19 11:46:05.223554431 +0000
e184e98
@@ -44,6 +44,7 @@ enum s390_opcode_cpu_val
e184e98
     S390_OPCODE_Z13,
e184e98
     S390_OPCODE_ARCH12,
e184e98
     S390_OPCODE_ARCH13,
e184e98
+    S390_OPCODE_ARCH14,
e184e98
     S390_OPCODE_MAXCPU
e184e98
   };
e184e98
 
e184e98
diff -rup binutils.orig/opcodes/s390-mkopc.c binutils-2.35.1/opcodes/s390-mkopc.c
e184e98
--- binutils.orig/opcodes/s390-mkopc.c	2021-02-19 11:44:23.947878550 +0000
e184e98
+++ binutils-2.35.1/opcodes/s390-mkopc.c	2021-02-19 11:46:05.223554431 +0000
e184e98
@@ -380,6 +380,8 @@ main (void)
e184e98
       else if (strcmp (cpu_string, "z15") == 0
e184e98
 	       || strcmp (cpu_string, "arch13") == 0)
e184e98
 	min_cpu = S390_OPCODE_ARCH13;
e184e98
+      else if (strcmp (cpu_string, "arch14") == 0)
e184e98
+	min_cpu = S390_OPCODE_ARCH14;
e184e98
       else {
e184e98
 	fprintf (stderr, "Couldn't parse cpu string %s\n", cpu_string);
e184e98
 	exit (1);
e184e98
Only in binutils-2.35.1/opcodes: s390-mkopc.c.orig
e184e98
diff -rup binutils.orig/opcodes/s390-opc.txt binutils-2.35.1/opcodes/s390-opc.txt
e184e98
--- binutils.orig/opcodes/s390-opc.txt	2021-02-19 11:44:23.943878563 +0000
e184e98
+++ binutils-2.35.1/opcodes/s390-opc.txt	2021-02-19 11:46:05.224554428 +0000
e184e98
@@ -2000,3 +2000,31 @@ e60000000052 vcvbg VRR_RV0UU "vector con
e184e98
 # Message Security Assist Extension 9
e184e98
 
e184e98
 b93a kdsa RRE_RR "compute digital signature authentication" arch13 zarch
e184e98
+
e184e98
+
e184e98
+# arch14 instructions
e184e98
+
e184e98
+e60000000074 vschp VRR_VVV0U0U " " arch14 zarch
e184e98
+e60000002074 vschsp VRR_VVV0U0 " " arch14 zarch
e184e98
+e60000003074 vschdp VRR_VVV0U0 " " arch14 zarch
e184e98
+e60000004074 vschxp VRR_VVV0U0 " " arch14 zarch
e184e98
+e6000000007c vscshp VRR_VVV " " arch14 zarch
e184e98
+e6000000007d vcsph VRR_VVV0U0 " " arch14 zarch
e184e98
+e60000000051 vclzdp VRR_VV0U2 " " arch14 zarch
e184e98
+e60000000070 vpkzr VRI_VVV0UU2 " " arch14 zarch
e184e98
+e60000000072 vsrpr VRI_VVV0UU2 " " arch14 zarch
e184e98
+e60000000054 vupkzh VRR_VV0U2 " " arch14 zarch
e184e98
+e6000000005c vupkzl VRR_VV0U2 " " arch14 zarch
e184e98
+
e184e98
+b93b nnpa RRE_00 " " arch14 zarch
e184e98
+e60000000056 vclfnh VRR_VV0UU2 " " arch14 zarch
e184e98
+e6000000005e vclfnl VRR_VV0UU2 " " arch14 zarch
e184e98
+e60000000075 vcrnf VRR_VVV0UU " " arch14 zarch
e184e98
+e6000000005d vcfn VRR_VV0UU2 " " arch14 zarch
e184e98
+e60000000055 vcnf VRR_VV0UU2 " " arch14 zarch
e184e98
+
e184e98
+b98B rdp RRF_RURR2 " " arch14 zarch optparm
e184e98
+
e184e98
+eb0000000071 lpswey SIY_URD " " arch14 zarch
e184e98
+b200 lbear S_RD " " arch14 zarch
e184e98
+b201 stbear S_RD " " arch14 zarch
e184e98
Only in binutils-2.35.1/opcodes: s390-opc.txt.orig