From 4a28a7ba36b327f01e765b98dce5440cc565ade51a1c7e19ea87934bd489ccfc Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Thu, 10 Feb 2022 14:48:00 +0000 Subject: [PATCH] - Patches added (jsc#SLE-22287): * ibm-z-add-another-arch14-instruction.patch * ibm-z-remove-lpswey-parameter.patch - Fedora fixup patch added: * fixup-gdb-6.5-bz243845-stale-testing-zombie-test.patch OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gdb?expand=0&rev=316 --- ...5-bz243845-stale-testing-zombie-test.patch | 35 +++++++++++++ gdb.changes | 9 ++++ gdb.spec | 6 +++ ibm-z-add-another-arch14-instruction.patch | 27 ++++++++++ ibm-z-remove-lpswey-parameter.patch | 52 +++++++++++++++++++ 5 files changed, 129 insertions(+) create mode 100644 fixup-gdb-6.5-bz243845-stale-testing-zombie-test.patch create mode 100644 ibm-z-add-another-arch14-instruction.patch create mode 100644 ibm-z-remove-lpswey-parameter.patch diff --git a/fixup-gdb-6.5-bz243845-stale-testing-zombie-test.patch b/fixup-gdb-6.5-bz243845-stale-testing-zombie-test.patch new file mode 100644 index 0000000..d15ce01 --- /dev/null +++ b/fixup-gdb-6.5-bz243845-stale-testing-zombie-test.patch @@ -0,0 +1,35 @@ +Fixup gdb.base/tracefork-zombie.exp + +Fix ERROR: +... +PASS: gdb.base/tracefork-zombie.exp: attach +ERROR: tcl error sourcing gdb/testsuite/gdb.base/tracefork-zombie.exp. +ERROR: tcl error code POSIX ESRCH {no such process} +ERROR: error reading "file12": no such process + while executing +"read $statusfi" + ("foreach" body line 5) + invoked from within +... + +--- + gdb/testsuite/gdb.base/tracefork-zombie.exp | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/gdb/testsuite/gdb.base/tracefork-zombie.exp b/gdb/testsuite/gdb.base/tracefork-zombie.exp +index 03f790d4c5d..3e2e5517d46 100644 +--- a/gdb/testsuite/gdb.base/tracefork-zombie.exp ++++ b/gdb/testsuite/gdb.base/tracefork-zombie.exp +@@ -58,8 +58,10 @@ foreach procpid [glob -directory /proc -type d {[0-9]*}] { + if {[catch {open $procpid/status} statusfi]} { + continue + } +- set status [read $statusfi] +- close $statusfi ++ if {[catch {read $statusfi} status]} { ++ continue ++ } ++ catch {close $statusfi} + if {1 + && [regexp -line {^Name:\tgdb$} $status] + && [regexp -line {^PPid:\t1$} $status] diff --git a/gdb.changes b/gdb.changes index c92ad3c..43c3bf1 100644 --- a/gdb.changes +++ b/gdb.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Feb 7 15:15:58 UTC 2022 - Tom de Vries + +- Patches added (jsc#SLE-22287): + * ibm-z-add-another-arch14-instruction.patch + * ibm-z-remove-lpswey-parameter.patch +- Fedora fixup patch added: + * fixup-gdb-6.5-bz243845-stale-testing-zombie-test.patch + ------------------------------------------------------------------- Thu Feb 3 12:22:35 UTC 2022 - Andreas Schwab diff --git a/gdb.spec b/gdb.spec index bf16035..a1bdcb5 100644 --- a/gdb.spec +++ b/gdb.spec @@ -257,6 +257,7 @@ Patch502: fixup-2-gdb-6.6-buildid-locate.patch Patch503: fixup-gdb-rhbz1325795-framefilters-test.patch Patch504: fixup-gdb-rhbz1553104-s390x-arch12-test.patch Patch505: fixup-gdb-glibc-strstr-workaround.patch +Patch506: fixup-gdb-6.5-bz243845-stale-testing-zombie-test.patch # openSUSE specific @@ -345,6 +346,8 @@ Patch2032: fix-gdb.base-sigstep.exp-test-for-ppc.patch Patch2033: gdb-testsuite-fix-regexp-in-gdb.base-foll-vfork.exp.patch Patch2034: gdb-testsuite-add-missing-wait-in-gdb.base-signals-state-child.exp.patch Patch2035: gdb-r_version-check.patch +Patch2036: ibm-z-add-another-arch14-instruction.patch +Patch2037: ibm-z-remove-lpswey-parameter.patch # Backports from master, not yet available in next release. @@ -743,6 +746,7 @@ find -name "*.info*"|xargs rm -f %patch503 -p1 %patch504 -p1 %patch505 -p1 +%patch506 -p1 %patch1000 -p1 %patch1001 -p1 @@ -799,6 +803,8 @@ find -name "*.info*"|xargs rm -f %patch2033 -p1 %patch2034 -p1 %patch2035 -p1 +%patch2036 -p1 +%patch2037 -p1 %patch2100 -p1 %patch2101 -p1 diff --git a/ibm-z-add-another-arch14-instruction.patch b/ibm-z-add-another-arch14-instruction.patch new file mode 100644 index 0000000..f8a4bf0 --- /dev/null +++ b/ibm-z-add-another-arch14-instruction.patch @@ -0,0 +1,27 @@ +IBM Z: Add another arch14 instruction + +opcodes/ + + * opcodes/s390-opc.txt: Add qpaci. + +gas/ + + * testsuite/gas/s390/zarch-arch14.d: Add qpaci. + * testsuite/gas/s390/zarch-arch14.s: Add qpaci. + +--- + gas/testsuite/gas/s390/zarch-arch14.d | 1 + + gas/testsuite/gas/s390/zarch-arch14.s | 1 + + opcodes/s390-opc.txt | 2 ++ + 3 files changed, 4 insertions(+) + +diff --git a/opcodes/s390-opc.txt b/opcodes/s390-opc.txt +index aa00b4f3b69..dfd5617f0ae 100644 +--- a/opcodes/s390-opc.txt ++++ b/opcodes/s390-opc.txt +@@ -2044,3 +2044,5 @@ b98B rdp RRF_RURR2 " " arch14 zarch optparm + eb0000000071 lpswey SIY_URD " " arch14 zarch + b200 lbear S_RD " " arch14 zarch + b201 stbear S_RD " " arch14 zarch ++ ++b28f qpaci S_RD " " arch14 zarch diff --git a/ibm-z-remove-lpswey-parameter.patch b/ibm-z-remove-lpswey-parameter.patch new file mode 100644 index 0000000..b5ecc0c --- /dev/null +++ b/ibm-z-remove-lpswey-parameter.patch @@ -0,0 +1,52 @@ +IBM Z: Remove lpswey parameter + +opcodes/ + * s390-opc.c (INSTR_SIY_RD): New instruction format. + (MASK_SIY_RD): New instruction mask. + * s390-opc.txt: Change instruction format of lpswey to SIY_RD. + +gas/ + * testsuite/gas/s390/zarch-arch14.d: Remove last operand of + lpswey. + * testsuite/gas/s390/zarch-arch14.s: Likewise. + +--- + gas/testsuite/gas/s390/zarch-arch14.d | 2 +- + gas/testsuite/gas/s390/zarch-arch14.s | 2 +- + opcodes/s390-opc.c | 2 ++ + opcodes/s390-opc.txt | 2 +- + 4 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/opcodes/s390-opc.c b/opcodes/s390-opc.c +index 5545dacffff..64453d945f8 100644 +--- a/opcodes/s390-opc.c ++++ b/opcodes/s390-opc.c +@@ -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 --git a/opcodes/s390-opc.txt b/opcodes/s390-opc.txt +index dfd5617f0ae..ad4b6aebc2b 100644 +--- a/opcodes/s390-opc.txt ++++ b/opcodes/s390-opc.txt +@@ -2041,7 +2041,7 @@ e60000000055 vcnf VRR_VV0UU2 " " arch14 zarch + + 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 +