d1152b
diff -rup binutils.orig/gas/config/tc-s390.c binutils-2.35.1/gas/config/tc-s390.c
d1152b
--- binutils.orig/gas/config/tc-s390.c	2021-02-19 11:44:24.240877612 +0000
d1152b
+++ binutils-2.35.1/gas/config/tc-s390.c	2021-02-19 11:46:05.222554434 +0000
d1152b
@@ -292,6 +292,8 @@ s390_parse_cpu (const char *         arg
d1152b
     { STRING_COMMA_LEN ("z14"), STRING_COMMA_LEN ("arch12"),
d1152b
       S390_INSTR_FLAG_HTM | S390_INSTR_FLAG_VX },
d1152b
     { STRING_COMMA_LEN ("z15"), STRING_COMMA_LEN ("arch13"),
d1152b
+      S390_INSTR_FLAG_HTM | S390_INSTR_FLAG_VX },
d1152b
+    { STRING_COMMA_LEN (""), STRING_COMMA_LEN ("arch14"),
d1152b
       S390_INSTR_FLAG_HTM | S390_INSTR_FLAG_VX }
d1152b
   };
d1152b
   static struct
d1152b
diff -rup binutils.orig/gas/doc/c-s390.texi binutils-2.35.1/gas/doc/c-s390.texi
d1152b
--- binutils.orig/gas/doc/c-s390.texi	2021-02-19 11:44:24.236877625 +0000
d1152b
+++ binutils-2.35.1/gas/doc/c-s390.texi	2021-02-19 11:46:05.223554431 +0000
d1152b
@@ -18,7 +18,7 @@ and eleven chip levels. The architecture
d1152b
 Architecture (ESA) and the newer z/Architecture mode. The chip levels
d1152b
 are g5 (or arch3), g6, z900 (or arch5), z990 (or arch6), z9-109, z9-ec
d1152b
 (or arch7), z10 (or arch8), z196 (or arch9), zEC12 (or arch10), z13
d1152b
-(or arch11), z14 (or arch12), and z15 (or arch13).
d1152b
+(or arch11), z14 (or arch12), z15 (or arch13), or arch14.
d1152b
 
d1152b
 @menu
d1152b
 * s390 Options::                Command-line Options.
d1152b
@@ -70,8 +70,9 @@ are recognized:
d1152b
 @code{z196} (or @code{arch9}),
d1152b
 @code{zEC12} (or @code{arch10}),
d1152b
 @code{z13} (or @code{arch11}),
d1152b
-@code{z14} (or @code{arch12}), and
d1152b
-@code{z15} (or @code{arch13}).
d1152b
+@code{z14} (or @code{arch12}),
d1152b
+@code{z15} (or @code{arch13}), and
d1152b
+@code{arch14}.
d1152b
 
d1152b
 Assembling an instruction that is not supported on the target
d1152b
 processor results in an error message.
d1152b
diff -rup binutils.orig/gas/testsuite/gas/s390/s390.exp binutils-2.35.1/gas/testsuite/gas/s390/s390.exp
d1152b
--- binutils.orig/gas/testsuite/gas/s390/s390.exp	2021-02-19 11:44:24.338877299 +0000
d1152b
+++ binutils-2.35.1/gas/testsuite/gas/s390/s390.exp	2021-02-19 11:46:05.223554431 +0000
d1152b
@@ -31,6 +31,7 @@ if [expr [istarget "s390-*-*"] ||  [ista
d1152b
     run_dump_test "zarch-z13" "{as -m64} {as -march=z13}"
d1152b
     run_dump_test "zarch-arch12" "{as -m64} {as -march=arch12}"
d1152b
     run_dump_test "zarch-arch13" "{as -m64} {as -march=arch13}"
d1152b
+    run_dump_test "zarch-arch14" "{as -m64} {as -march=arch14}"
d1152b
     run_dump_test "zarch-reloc" "{as -m64}"
d1152b
     run_dump_test "zarch-operands" "{as -m64} {as -march=z9-109}"
d1152b
     run_dump_test "zarch-machine" "{as -m64} {as -march=z900}"
d1152b
diff -rup binutils.orig/include/opcode/s390.h binutils-2.35.1/include/opcode/s390.h
d1152b
--- binutils.orig/include/opcode/s390.h	2021-02-19 11:44:23.926878617 +0000
d1152b
+++ binutils-2.35.1/include/opcode/s390.h	2021-02-19 11:46:05.223554431 +0000
d1152b
@@ -44,6 +44,7 @@ enum s390_opcode_cpu_val
d1152b
     S390_OPCODE_Z13,
d1152b
     S390_OPCODE_ARCH12,
d1152b
     S390_OPCODE_ARCH13,
d1152b
+    S390_OPCODE_ARCH14,
d1152b
     S390_OPCODE_MAXCPU
d1152b
   };
d1152b
 
d1152b
diff -rup binutils.orig/opcodes/s390-mkopc.c binutils-2.35.1/opcodes/s390-mkopc.c
d1152b
--- binutils.orig/opcodes/s390-mkopc.c	2021-02-19 11:44:23.947878550 +0000
d1152b
+++ binutils-2.35.1/opcodes/s390-mkopc.c	2021-02-19 11:46:05.223554431 +0000
d1152b
@@ -380,6 +380,8 @@ main (void)
d1152b
       else if (strcmp (cpu_string, "z15") == 0
d1152b
 	       || strcmp (cpu_string, "arch13") == 0)
d1152b
 	min_cpu = S390_OPCODE_ARCH13;
d1152b
+      else if (strcmp (cpu_string, "arch14") == 0)
d1152b
+	min_cpu = S390_OPCODE_ARCH14;
d1152b
       else {
d1152b
 	fprintf (stderr, "Couldn't parse cpu string %s\n", cpu_string);
d1152b
 	exit (1);
d1152b
diff -rup binutils.orig/opcodes/s390-opc.txt binutils-2.35.1/opcodes/s390-opc.txt
d1152b
--- binutils.orig/opcodes/s390-opc.txt	2021-02-19 11:44:23.943878563 +0000
d1152b
+++ binutils-2.35.1/opcodes/s390-opc.txt	2021-02-19 11:46:05.224554428 +0000
d1152b
@@ -2000,3 +2000,31 @@ e60000000052 vcvbg VRR_RV0UU "vector con
d1152b
 # Message Security Assist Extension 9
d1152b
 
d1152b
 b93a kdsa RRE_RR "compute digital signature authentication" arch13 zarch
d1152b
+
d1152b
+
d1152b
+# arch14 instructions
d1152b
+
d1152b
+e60000000074 vschp VRR_VVV0U0U " " arch14 zarch
d1152b
+e60000002074 vschsp VRR_VVV0U0 " " arch14 zarch
d1152b
+e60000003074 vschdp VRR_VVV0U0 " " arch14 zarch
d1152b
+e60000004074 vschxp VRR_VVV0U0 " " arch14 zarch
d1152b
+e6000000007c vscshp VRR_VVV " " arch14 zarch
d1152b
+e6000000007d vcsph VRR_VVV0U0 " " arch14 zarch
d1152b
+e60000000051 vclzdp VRR_VV0U2 " " arch14 zarch
d1152b
+e60000000070 vpkzr VRI_VVV0UU2 " " arch14 zarch
d1152b
+e60000000072 vsrpr VRI_VVV0UU2 " " arch14 zarch
d1152b
+e60000000054 vupkzh VRR_VV0U2 " " arch14 zarch
d1152b
+e6000000005c vupkzl VRR_VV0U2 " " arch14 zarch
d1152b
+
d1152b
+b93b nnpa RRE_00 " " arch14 zarch
d1152b
+e60000000056 vclfnh VRR_VV0UU2 " " arch14 zarch
d1152b
+e6000000005e vclfnl VRR_VV0UU2 " " arch14 zarch
d1152b
+e60000000075 vcrnf VRR_VVV0UU " " arch14 zarch
d1152b
+e6000000005d vcfn VRR_VV0UU2 " " arch14 zarch
d1152b
+e60000000055 vcnf VRR_VV0UU2 " " arch14 zarch
d1152b
+
d1152b
+b98B rdp RRF_RURR2 " " arch14 zarch optparm
d1152b
+
d1152b
+eb0000000071 lpswey SIY_URD " " arch14 zarch
d1152b
+b200 lbear S_RD " " arch14 zarch
d1152b
+b201 stbear S_RD " " arch14 zarch
d1152b
--- /dev/null	2021-06-16 09:27:04.980898674 +0100
d1152b
+++ binutils-2.35.2/gas/testsuite/gas/s390/zarch-arch14.s	2021-06-16 12:05:43.382025025 +0100
d1152b
@@ -0,0 +1,24 @@
d1152b
+.text
d1152b
+foo:
d1152b
+	vschp	%v15,%v17,%v20,13,12
d1152b
+	vschsp	%v15,%v17,%v20,13
d1152b
+	vschdp	%v15,%v17,%v20,13
d1152b
+	vschxp	%v15,%v17,%v20,13
d1152b
+	vscshp	%v15,%v17,%v20
d1152b
+	vcsph	%v15,%v17,%v20,13
d1152b
+	vclzdp	%v15,%v17,13
d1152b
+	vpkzr	%v15,%v17,%v20,253,12
d1152b
+	vsrpr	%v15,%v17,%v20,253,12
d1152b
+	vupkzh	%v15,%v17,13
d1152b
+	vupkzl	%v15,%v17,13
d1152b
+	nnpa
d1152b
+	vclfnh	%v15,%v17,13,12
d1152b
+	vclfnl	%v15,%v17,13,12
d1152b
+	vcrnf	%v15,%v17,%v20,13,12
d1152b
+	vcfn	%v15,%v17,13,12
d1152b
+	vcnf	%v15,%v17,13,12
d1152b
+	rdp	%r6,%r9,%r11
d1152b
+	rdp	%r6,%r9,%r11,13
d1152b
+	lpswey	-10000(%r6),253
d1152b
+	lbear	4000(%r6)
d1152b
+	stbear	4000(%r6)
d1152b
--- /dev/null	2021-06-16 09:27:04.980898674 +0100
d1152b
+++ binutils-2.35.2/gas/testsuite/gas/s390/zarch-arch14.d	2021-06-16 12:05:43.367025112 +0100
d1152b
@@ -0,0 +1,31 @@
d1152b
+#name: s390x opcode
d1152b
+#objdump: -dr
d1152b
+
d1152b
+.*: +file format .*
d1152b
+
d1152b
+Disassembly of section .text:
d1152b
+
d1152b
+.* <foo>:
d1152b
+.*:	e6 f1 40 c0 d6 74 [	 ]*vschp	%v15,%v17,%v20,13,12
d1152b
+.*:	e6 f1 40 d0 26 74 [	 ]*vschsp	%v15,%v17,%v20,13
d1152b
+.*:	e6 f1 40 d0 36 74 [	 ]*vschdp	%v15,%v17,%v20,13
d1152b
+.*:	e6 f1 40 d0 46 74 [	 ]*vschxp	%v15,%v17,%v20,13
d1152b
+.*:	e6 f1 40 00 06 7c [	 ]*vscshp	%v15,%v17,%v20
d1152b
+.*:	e6 f1 40 d0 06 7d [	 ]*vcsph	%v15,%v17,%v20,13
d1152b
+.*:	e6 f1 00 d0 04 51 [	 ]*vclzdp	%v15,%v17,13
d1152b
+.*:	e6 f1 40 cf d6 70 [	 ]*vpkzr	%v15,%v17,%v20,253,12
d1152b
+.*:	e6 f1 40 cf d6 72 [	 ]*vsrpr	%v15,%v17,%v20,253,12
d1152b
+.*:	e6 f1 00 d0 04 54 [	 ]*vupkzh	%v15,%v17,13
d1152b
+.*:	e6 f1 00 d0 04 5c [	 ]*vupkzl	%v15,%v17,13
d1152b
+.*:	b9 3b 00 00 [	 ]*nnpa
d1152b
+.*:	e6 f1 00 0c d4 56 [	 ]*vclfnh	%v15,%v17,13,12
d1152b
+.*:	e6 f1 00 0c d4 5e [	 ]*vclfnl	%v15,%v17,13,12
d1152b
+.*:	e6 f1 40 0c d6 75 [	 ]*vcrnf	%v15,%v17,%v20,13,12
d1152b
+.*:	e6 f1 00 0c d4 5d [	 ]*vcfn	%v15,%v17,13,12
d1152b
+.*:	e6 f1 00 0c d4 55 [	 ]*vcnf	%v15,%v17,13,12
d1152b
+.*:	b9 8b 90 6b [	 ]*rdp	%r6,%r9,%r11
d1152b
+.*:	b9 8b 9d 6b [	 ]*rdp	%r6,%r9,%r11,13
d1152b
+.*:	eb fd 68 f0 fd 71 [	 ]*lpswey	-10000\(%r6\),253
d1152b
+.*:	b2 00 6f a0 [	 ]*lbear	4000\(%r6\)
d1152b
+.*:	b2 01 6f a0 [	 ]*stbear	4000\(%r6\)
d1152b
+.*:	07 07 [	 ]*nopr	%r7
d1152b
diff -rup binutils.orig/gas/testsuite/gas/s390/zarch-arch14.d binutils-2.35.2/gas/testsuite/gas/s390/zarch-arch14.d
d1152b
--- binutils.orig/gas/testsuite/gas/s390/zarch-arch14.d	2021-08-16 13:07:33.637204772 +0100
d1152b
+++ binutils-2.35.2/gas/testsuite/gas/s390/zarch-arch14.d	2021-08-16 14:26:36.576187751 +0100
d1152b
@@ -25,7 +25,8 @@ Disassembly of section .text:
d1152b
 .*:	e6 f1 00 0c d4 55 [	 ]*vcnf	%v15,%v17,13,12
d1152b
 .*:	b9 8b 90 6b [	 ]*rdp	%r6,%r9,%r11
d1152b
 .*:	b9 8b 9d 6b [	 ]*rdp	%r6,%r9,%r11,13
d1152b
-.*:	eb fd 68 f0 fd 71 [	 ]*lpswey	-10000\(%r6\),253
d1152b
+.*:	eb 00 68 f0 fd 71 [	 ]*lpswey	-10000\(%r6\)
d1152b
 .*:	b2 00 6f a0 [	 ]*lbear	4000\(%r6\)
d1152b
 .*:	b2 01 6f a0 [	 ]*stbear	4000\(%r6\)
d1152b
+.*:	b2 8f 5f ff [	 ]*qpaci	4095\(%r5\)
d1152b
 .*:	07 07 [	 ]*nopr	%r7
d1152b
diff -rup binutils.orig/gas/testsuite/gas/s390/zarch-arch14.s binutils-2.35.2/gas/testsuite/gas/s390/zarch-arch14.s
d1152b
--- binutils.orig/gas/testsuite/gas/s390/zarch-arch14.s	2021-08-16 13:07:33.636204779 +0100
d1152b
+++ binutils-2.35.2/gas/testsuite/gas/s390/zarch-arch14.s	2021-08-16 14:26:36.576187751 +0100
d1152b
@@ -19,6 +19,7 @@ foo:
d1152b
 	vcnf	%v15,%v17,13,12
d1152b
 	rdp	%r6,%r9,%r11
d1152b
 	rdp	%r6,%r9,%r11,13
d1152b
-	lpswey	-10000(%r6),253
d1152b
+	lpswey	-10000(%r6)
d1152b
 	lbear	4000(%r6)
d1152b
 	stbear	4000(%r6)
d1152b
+	qpaci	4095(%r5)
d1152b
diff -rup binutils.orig/opcodes/s390-opc.c binutils-2.35.2/opcodes/s390-opc.c
d1152b
--- binutils.orig/opcodes/s390-opc.c	2021-08-16 13:07:33.358206522 +0100
d1152b
+++ binutils-2.35.2/opcodes/s390-opc.c	2021-08-16 14:26:36.600187594 +0100
d1152b
@@ -442,6 +442,7 @@ const struct s390_operand s390_operands[
d1152b
 #define INSTR_RX_URRD      4, { U4_8,D_20,X_12,B_16,0,0 }        /* e.g. bc    */
d1152b
 #define INSTR_SI_RD        4, { D_20,B_16,0,0,0,0 }              /* e.g. lpsw  */
d1152b
 #define INSTR_SI_URD       4, { D_20,B_16,U8_8,0,0,0 }           /* e.g. cli   */
d1152b
+#define INSTR_SIY_RD       6, { D20_20,B_16,0,0,0,0 }            /* e.g. lpswey*/
d1152b
 #define INSTR_SIY_URD      6, { D20_20,B_16,U8_8,0,0,0 }         /* e.g. tmy   */
d1152b
 #define INSTR_SIY_IRD      6, { D20_20,B_16,I8_8,0,0,0 }         /* e.g. asi   */
d1152b
 #define INSTR_SIL_RDI      6, { D_20,B_16,I16_32,0,0,0 }         /* e.g. chhsi */
d1152b
@@ -664,6 +665,7 @@ const struct s390_operand s390_operands[
d1152b
 #define MASK_RX_URRD      { 0xff, 0x00, 0x00, 0x00, 0x00, 0x00 }
d1152b
 #define MASK_SI_RD        { 0xff, 0x00, 0x00, 0x00, 0x00, 0x00 }
d1152b
 #define MASK_SI_URD       { 0xff, 0x00, 0x00, 0x00, 0x00, 0x00 }
d1152b
+#define MASK_SIY_RD       { 0xff, 0xff, 0x00, 0x00, 0x00, 0xff }
d1152b
 #define MASK_SIY_URD      { 0xff, 0x00, 0x00, 0x00, 0x00, 0xff }
d1152b
 #define MASK_SIY_IRD      { 0xff, 0x00, 0x00, 0x00, 0x00, 0xff }
d1152b
 #define MASK_SIL_RDI      { 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }
d1152b
diff -rup binutils.orig/opcodes/s390-opc.txt binutils-2.35.2/opcodes/s390-opc.txt
d1152b
--- binutils.orig/opcodes/s390-opc.txt	2021-08-16 13:07:33.348206585 +0100
d1152b
+++ binutils-2.35.2/opcodes/s390-opc.txt	2021-08-16 14:26:36.600187594 +0100
d1152b
@@ -2041,6 +2041,8 @@ e60000000055 vcnf VRR_VV0UU2 " " arch14
d1152b
 
d1152b
 b98B rdp RRF_RURR2 " " arch14 zarch optparm
d1152b
 
d1152b
-eb0000000071 lpswey SIY_URD " " arch14 zarch
d1152b
+eb0000000071 lpswey SIY_RD " " arch14 zarch
d1152b
 b200 lbear S_RD " " arch14 zarch
d1152b
 b201 stbear S_RD " " arch14 zarch
d1152b
+
d1152b
+b28f qpaci S_RD " " arch14 zarch