diff --git a/binutils-s390-arch14-insns.patch b/binutils-s390-arch14-insns.patch index 6010444..682a1ea 100644 --- a/binutils-s390-arch14-insns.patch +++ b/binutils-s390-arch14-insns.patch @@ -45,8 +45,6 @@ diff -rup binutils.orig/gas/testsuite/gas/s390/s390.exp binutils-2.35.1/gas/test run_dump_test "zarch-reloc" "{as -m64}" run_dump_test "zarch-operands" "{as -m64} {as -march=z9-109}" run_dump_test "zarch-machine" "{as -m64} {as -march=z900}" -Only in binutils-2.35.1/gas/testsuite/gas/s390: zarch-arch14.d -Only in binutils-2.35.1/gas/testsuite/gas/s390: zarch-arch14.s diff -rup binutils.orig/include/opcode/s390.h binutils-2.35.1/include/opcode/s390.h --- binutils.orig/include/opcode/s390.h 2021-02-19 11:44:23.926878617 +0000 +++ binutils-2.35.1/include/opcode/s390.h 2021-02-19 11:46:05.223554431 +0000 @@ -70,7 +68,6 @@ diff -rup binutils.orig/opcodes/s390-mkopc.c binutils-2.35.1/opcodes/s390-mkopc. else { fprintf (stderr, "Couldn't parse cpu string %s\n", cpu_string); exit (1); -Only in binutils-2.35.1/opcodes: s390-mkopc.c.orig diff -rup binutils.orig/opcodes/s390-opc.txt binutils-2.35.1/opcodes/s390-opc.txt --- binutils.orig/opcodes/s390-opc.txt 2021-02-19 11:44:23.943878563 +0000 +++ binutils-2.35.1/opcodes/s390-opc.txt 2021-02-19 11:46:05.224554428 +0000 @@ -106,7 +103,6 @@ diff -rup binutils.orig/opcodes/s390-opc.txt binutils-2.35.1/opcodes/s390-opc.tx +eb0000000071 lpswey SIY_URD " " arch14 zarch +b200 lbear S_RD " " arch14 zarch +b201 stbear S_RD " " arch14 zarch -Only in binutils-2.35.1/opcodes: s390-opc.txt.orig --- /dev/null 2021-06-16 09:27:04.980898674 +0100 +++ binutils-2.35.2/gas/testsuite/gas/s390/zarch-arch14.s 2021-06-16 12:05:43.382025025 +0100 @@ -0,0 +1,24 @@ @@ -168,3 +164,60 @@ Only in binutils-2.35.1/opcodes: s390-opc.txt.orig +.*: b2 00 6f a0 [ ]*lbear 4000\(%r6\) +.*: b2 01 6f a0 [ ]*stbear 4000\(%r6\) +.*: 07 07 [ ]*nopr %r7 +diff -rup binutils.orig/gas/testsuite/gas/s390/zarch-arch14.d binutils-2.35.2/gas/testsuite/gas/s390/zarch-arch14.d +--- binutils.orig/gas/testsuite/gas/s390/zarch-arch14.d 2021-08-16 13:07:33.637204772 +0100 ++++ binutils-2.35.2/gas/testsuite/gas/s390/zarch-arch14.d 2021-08-16 14:26:36.576187751 +0100 +@@ -25,7 +25,8 @@ Disassembly of section .text: + .*: e6 f1 00 0c d4 55 [ ]*vcnf %v15,%v17,13,12 + .*: b9 8b 90 6b [ ]*rdp %r6,%r9,%r11 + .*: b9 8b 9d 6b [ ]*rdp %r6,%r9,%r11,13 +-.*: eb fd 68 f0 fd 71 [ ]*lpswey -10000\(%r6\),253 ++.*: eb 00 68 f0 fd 71 [ ]*lpswey -10000\(%r6\) + .*: b2 00 6f a0 [ ]*lbear 4000\(%r6\) + .*: b2 01 6f a0 [ ]*stbear 4000\(%r6\) ++.*: b2 8f 5f ff [ ]*qpaci 4095\(%r5\) + .*: 07 07 [ ]*nopr %r7 +diff -rup binutils.orig/gas/testsuite/gas/s390/zarch-arch14.s binutils-2.35.2/gas/testsuite/gas/s390/zarch-arch14.s +--- binutils.orig/gas/testsuite/gas/s390/zarch-arch14.s 2021-08-16 13:07:33.636204779 +0100 ++++ binutils-2.35.2/gas/testsuite/gas/s390/zarch-arch14.s 2021-08-16 14:26:36.576187751 +0100 +@@ -19,6 +19,7 @@ foo: + vcnf %v15,%v17,13,12 + rdp %r6,%r9,%r11 + rdp %r6,%r9,%r11,13 +- lpswey -10000(%r6),253 ++ lpswey -10000(%r6) + lbear 4000(%r6) + stbear 4000(%r6) ++ qpaci 4095(%r5) +diff -rup binutils.orig/opcodes/s390-opc.c binutils-2.35.2/opcodes/s390-opc.c +--- binutils.orig/opcodes/s390-opc.c 2021-08-16 13:07:33.358206522 +0100 ++++ binutils-2.35.2/opcodes/s390-opc.c 2021-08-16 14:26:36.600187594 +0100 +@@ -442,6 +442,7 @@ const struct s390_operand s390_operands[ + #define INSTR_RX_URRD 4, { U4_8,D_20,X_12,B_16,0,0 } /* e.g. bc */ + #define INSTR_SI_RD 4, { D_20,B_16,0,0,0,0 } /* e.g. lpsw */ + #define INSTR_SI_URD 4, { D_20,B_16,U8_8,0,0,0 } /* e.g. cli */ ++#define INSTR_SIY_RD 6, { D20_20,B_16,0,0,0,0 } /* e.g. lpswey*/ + #define INSTR_SIY_URD 6, { D20_20,B_16,U8_8,0,0,0 } /* e.g. tmy */ + #define INSTR_SIY_IRD 6, { D20_20,B_16,I8_8,0,0,0 } /* e.g. asi */ + #define INSTR_SIL_RDI 6, { D_20,B_16,I16_32,0,0,0 } /* e.g. chhsi */ +@@ -664,6 +665,7 @@ const struct s390_operand s390_operands[ + #define MASK_RX_URRD { 0xff, 0x00, 0x00, 0x00, 0x00, 0x00 } + #define MASK_SI_RD { 0xff, 0x00, 0x00, 0x00, 0x00, 0x00 } + #define MASK_SI_URD { 0xff, 0x00, 0x00, 0x00, 0x00, 0x00 } ++#define MASK_SIY_RD { 0xff, 0xff, 0x00, 0x00, 0x00, 0xff } + #define MASK_SIY_URD { 0xff, 0x00, 0x00, 0x00, 0x00, 0xff } + #define MASK_SIY_IRD { 0xff, 0x00, 0x00, 0x00, 0x00, 0xff } + #define MASK_SIL_RDI { 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 } +diff -rup binutils.orig/opcodes/s390-opc.txt binutils-2.35.2/opcodes/s390-opc.txt +--- binutils.orig/opcodes/s390-opc.txt 2021-08-16 13:07:33.348206585 +0100 ++++ binutils-2.35.2/opcodes/s390-opc.txt 2021-08-16 14:26:36.600187594 +0100 +@@ -2041,6 +2041,8 @@ e60000000055 vcnf VRR_VV0UU2 " " arch14 + + b98B rdp RRF_RURR2 " " arch14 zarch optparm + +-eb0000000071 lpswey SIY_URD " " arch14 zarch ++eb0000000071 lpswey SIY_RD " " arch14 zarch + b200 lbear S_RD " " arch14 zarch + b201 stbear S_RD " " arch14 zarch ++ ++b28f qpaci S_RD " " arch14 zarch diff --git a/binutils.spec b/binutils.spec index a3264c3..29abdd0 100644 --- a/binutils.spec +++ b/binutils.spec @@ -39,7 +39,7 @@ Summary: A GNU collection of binary utilities Name: binutils%{?name_cross}%{?_with_debug:-debug} Version: 2.35.2 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv3+ URL: https://sourceware.org/binutils @@ -971,6 +971,9 @@ exit 0 #---------------------------------------------------------------------------- %changelog +* Mon Aug 16 2021 Nick Clifton - 2.32.2-9 +- Add another s390x arch 14 instruction. (#1898533) + * Mon Aug 16 2021 Nick Clifton - 2.32.2-8 - Ensure that dir[0] contains pwd in gas generated DWARF-5 directory tables. (#1986018)