[rpms/gdb] gdb-17.2-rebase-f44: Remove gdb-6.5-missed-trap-on-step-test.patch

[rpms/gdb] gdb-17.2-rebase-f44: Remove gdb-6.5-missed-trap-on-step-test.patch

[Kevin Buettner]

A new commit has been pushed.

Repo   : rpms/gdb
Branch : gdb-17.2-rebase-f44
Commit : a27201b2a0cfb6214160d04f2873a2f8e0b416b2
Author : Kevin Buettner <kevinb@redhat.com>
Date   : 2023-12-04T14:55:15-07:00
Stats  : +43/-139 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/gdb/c/a27201b2a0cfb6214160d04f2873a2f8e0b416b2?branch=gdb-17.2-rebase-f44

Log:
Remove gdb-6.5-missed-trap-on-step-test.patch

---
diff --git a/_gdb.spec.Patch.include b/_gdb.spec.Patch.include
index fe6b4d1..416050e 100644
--- a/_gdb.spec.Patch.include
+++ b/_gdb.spec.Patch.include
@@ -55,107 +55,103 @@ Patch013: gdb-6.6-buildid-locate-rpm.patch
 #=fedoratest
 Patch014: gdb-6.7-ppc-clobbered-registers-O2-test.patch
 
-# Test hiding unexpected breakpoints on intentional step commands.
-#=fedoratest
-Patch015: gdb-6.5-missed-trap-on-step-test.patch
-
 # Test gcore memory and time requirements for large inferiors.
 #=fedoratest
-Patch016: gdb-6.5-gcore-buffer-limit-test.patch
+Patch015: gdb-6.5-gcore-buffer-limit-test.patch
 
 # Test GCORE for shmid 0 shared memory mappings.
 #=fedoratest: But it is broken anyway, sometimes the case being tested is not reproducible.
-Patch017: gdb-6.3-mapping-zero-inode-test.patch
+Patch016: gdb-6.3-mapping-zero-inode-test.patch
 
 # Test a crash on libraries missing the .text section.
 #=fedoratest
-Patch018: gdb-6.5-section-num-fixup-test.patch
+Patch017: gdb-6.5-section-num-fixup-test.patch
 
 # Fix resolving of variables at locations lists in prelinked libs (BZ 466901).
 #=fedoratest
-Patch019: gdb-6.8-bz466901-backtrace-full-prelinked.patch
+Patch018: gdb-6.8-bz466901-backtrace-full-prelinked.patch
 
 # New test for step-resume breakpoint placed in multiple threads at once.
 #=fedoratest
-Patch020: gdb-simultaneous-step-resume-breakpoint-test.patch
+Patch019: gdb-simultaneous-step-resume-breakpoint-test.patch
 
 # Fix GNU/Linux core open: Can't read pathname for load map: Input/output error.
 # Fix regression of undisplayed missing shared libraries caused by a fix for.
 #=fedoratest: It should be in glibc: libc-alpha: <20091004161706.GA27450@.*>
-Patch021: gdb-core-open-vdso-warning.patch
+Patch020: gdb-core-open-vdso-warning.patch
 
 # Fix follow-exec for C++ programs (bugreported by Martin Stransky).
 #=fedoratest
-Patch022: gdb-archer-next-over-throw-cxx-exec.patch
+Patch021: gdb-archer-next-over-throw-cxx-exec.patch
 
 # Workaround librpm BZ 643031 due to its unexpected exit() calls (BZ 642879).
 #=push+jan
-Patch023: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
+Patch022: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
 
 # [delayed-symfile] Test a backtrace regression on CFIs without DIE (BZ 614604).
 #=fedoratest
-Patch024: gdb-test-bt-cfi-without-die.patch
+Patch023: gdb-test-bt-cfi-without-die.patch
 
 # Verify GDB Python built-in function gdb.solib_address exists (BZ # 634108).
 #=fedoratest
-Patch025: gdb-bz634108-solib_address.patch
+Patch024: gdb-bz634108-solib_address.patch
 
 # [archer-tromey-delayed-symfile] New test gdb.dwarf2/dw2-aranges.exp.
 #=fedoratest
-Patch026: gdb-test-dw2-aranges.patch
+Patch025: gdb-test-dw2-aranges.patch
 
 # Workaround PR libc/14166 for inferior calls of strstr.
 #=fedoratest: Compatibility with RHELs (unchecked which ones).
-Patch027: gdb-glibc-strstr-workaround.patch
+Patch026: gdb-glibc-strstr-workaround.patch
 
 # Testcase for `Setting solib-absolute-prefix breaks vDSO' (BZ 818343).
 #=fedoratest
-Patch028: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
+Patch027: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
 
 # Import regression test for `gdb/findvar.c:417: internal-error:
 # read_var_value: Assertion `frame' failed.' (RH BZ 947564) from RHEL 6.5.
 #=fedoratest
-Patch029: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
+Patch028: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
 
 # Fix 'memory leak in infpy_read_memory()' (RH BZ 1007614)
 #=fedoratest
-Patch030: gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
+Patch029: gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
 
 # Fix 'gdb gives highly misleading error when debuginfo pkg is present,
 # but not corresponding binary pkg' (RH BZ 981154).
 #=push+jan
-Patch031: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
+Patch030: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
 
 # Testcase for '[SAP] Recursive dlopen causes SAP HANA installer to
 # crash.' (RH BZ 1156192).
 #=fedoratest
-Patch032: gdb-rhbz1156192-recursive-dlopen-test.patch
+Patch031: gdb-rhbz1156192-recursive-dlopen-test.patch
 
 # Fix '`catch syscall' doesn't work for parent after `fork' is called'
 # (Philippe Waroquiers, RH BZ 1149205).
 #=fedoratest
-Patch033: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
+Patch032: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
 
 # Fix '[ppc64] and [s390x] wrong prologue skip on -O2 -g code' (Jan
 # Kratochvil, RH BZ 1084404).
 #=fedoratest
-Patch034: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
+Patch033: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
 
 # Force libncursesw over libncurses to match the includes (RH BZ 1270534).
 #=push+jan
-Patch035: gdb-fedora-libncursesw.patch
+Patch034: gdb-fedora-libncursesw.patch
 
 # [aarch64] Fix hardware watchpoints (RH BZ 1261564).
 #=fedoratest
-Patch036: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
+Patch035: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
 
 # Add messages suggesting more recent RHEL gdbserver (RH BZ 1321114).
 #=fedora
-Patch037: gdb-container-rh-pkg.patch
+Patch036: gdb-container-rh-pkg.patch
 
 # [dts+el7] [x86*] Bundle linux_perf.h for libipt (RH BZ 1256513).
 #=fedora
-Patch038: gdb-linux_perf-bundle.patch
+Patch037: gdb-linux_perf-bundle.patch
 
 # Update gdb-add-index.sh such that, when the GDB environment
 # variable is not set, the script is smarter than just looking for
@@ -169,61 +165,61 @@ Patch038: gdb-linux_perf-bundle.patch
 #   https://fedoraproject.org/wiki/Changes/Minimal_GDB_in_buildroot
 #
 #=fedora
-Patch039: gdb-add-index.patch
+Patch038: gdb-add-index.patch
 
 # Backport "Fix a potential illegal memory access in the BFD library..."
 # (Nick Clifton, binutils/29988)
-Patch040: gdb-binutils29988-read_indexed_address.patch
+Patch039: gdb-binutils29988-read_indexed_address.patch
 
 # Backport upstream patch fixing a "dangling pointer" build problem
 # first seen when building with GCC 13.1.1 20230426 (Red Hat ;; 13.1.1-1).
-Patch041: gdb-rhbz2192105-ftbs-dangling-pointer
+Patch040: gdb-rhbz2192105-ftbs-dangling-pointer
 
 # Backport two commits, 0ad504dd464 and ea70f941f9b, from Lancelot SIX
 # which prevent repeated warnings from being printed while loading a
 # core file. (RH BZ 2160211)
-Patch042: gdb-rhbz2160211-excessive-core-file-warnings.patch
+Patch041: gdb-rhbz2160211-excessive-core-file-warnings.patch
 
 # Backport upstream commit f3eee5861743d635 to fix a crash triggered
 # when debuginfod makes use of particular openssl settings.
-Patch043: gdb-bz2196395-debuginfod-legacy-openssl-crash.patch
+Patch042: gdb-bz2196395-debuginfod-legacy-openssl-crash.patch
 
 # Backport upstream commit f96328accde1e63 to fix a potential double
 # free issue in the debuginfod code.
-Patch044: gdb-bz2237515-debuginfod-double-free.patch
+Patch043: gdb-bz2237515-debuginfod-double-free.patch
 
 # Backport upstream commit 54392c4df604f20 to fix an incorrect
 # obstack allocation that wold lead to memory corruption.
-Patch045: gdb-bz2237392-dwarf-obstack-allocation.patch
+Patch044: gdb-bz2237392-dwarf-obstack-allocation.patch
 
 # Backport PR29922, SHT_NOBITS section
 # avoids section size sanity check.
-Patch046: gdb-rhbz2233961-CVE-2022-4806.patch
+Patch045: gdb-rhbz2233961-CVE-2022-4806.patch
 
 # Backport PR29925, Memory leak in find_abstract_instance
-Patch047: gdb-rhbz2233965-memory-leak.patch
+Patch046: gdb-rhbz2233965-memory-leak.patch
 
 # Backport upstream patch which prevents internal error when
 # generating a gdb-index file (RH BZ 1773651).
-Patch048: gdb-rhbz1773651-gdb-index-internal-error.patch
+Patch047: gdb-rhbz1773651-gdb-index-internal-error.patch
 
 # Back-port upstream commit 1f0fab7ff86 as part of a fix for
 # non-deterministic gdb-index generation (RH BZ 2232086).
-Patch049: gdb-rhbz2232086-refactor-selftest-support.patch
+Patch048: gdb-rhbz2232086-refactor-selftest-support.patch
 
 # Back-port upstream commit aa19bc1d259 as part of a fix for
 # non-deterministic gdb-index generation (RH BZ 2232086).
-Patch050: gdb-rhbz-2232086-reduce-size-of-gdb-index.patch
+Patch049: gdb-rhbz-2232086-reduce-size-of-gdb-index.patch
 
 # Back-port upstream commit acc117b57f7 as part of a fix for
 # non-deterministic gdb-index generation (RH BZ 2232086).
-Patch051: gdb-rhbz-2232086-cpp-ify-mapped-symtab.patch
+Patch050: gdb-rhbz-2232086-cpp-ify-mapped-symtab.patch
 
 # Back-port upstream commit aff250145af as part of a fix for
 # non-deterministic gdb-index generation (RH BZ 2232086).
-Patch052: gdb-rhbz-2232086-generate-gdb-index-consistently.patch
+Patch051: gdb-rhbz-2232086-generate-gdb-index-consistently.patch
 
 # Back-port upstream commit 3644f41dc80 as part of a fix for
 # non-deterministic gdb-index generation (RH BZ 2232086).
-Patch053: gdb-rhbz-2232086-generate-dwarf-5-index-consistently.patch
+Patch052: gdb-rhbz-2232086-generate-dwarf-5-index-consistently.patch
 

diff --git a/_gdb.spec.patch.include b/_gdb.spec.patch.include
index 8ec13e9..d954063 100644
--- a/_gdb.spec.patch.include
+++ b/_gdb.spec.patch.include
@@ -50,4 +50,3 @@
 %patch -p1 -P050
 %patch -p1 -P051
 %patch -p1 -P052
-%patch -p1 -P053

diff --git a/_patch_order b/_patch_order
index 713f850..34b1a45 100644
--- a/_patch_order
+++ b/_patch_order
@@ -12,7 +12,6 @@ gdb-6.6-buildid-locate.patch
 gdb-6.6-buildid-locate-solib-missing-ids.patch
 gdb-6.6-buildid-locate-rpm.patch
 gdb-6.7-ppc-clobbered-registers-O2-test.patch
-gdb-6.5-missed-trap-on-step-test.patch
 gdb-6.5-gcore-buffer-limit-test.patch
 gdb-6.3-mapping-zero-inode-test.patch
 gdb-6.5-section-num-fixup-test.patch

diff --git a/gdb-6.5-missed-trap-on-step-test.patch b/gdb-6.5-missed-trap-on-step-test.patch
deleted file mode 100644
index 0ad8ad1..0000000
--- a/gdb-6.5-missed-trap-on-step-test.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Fedora GDB patches <invalid@email.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-6.5-missed-trap-on-step-test.patch
-
-;; Test hiding unexpected breakpoints on intentional step commands.
-;;=fedoratest
-
-Fix has been committed to:
-	gdb-6.6-scheduler_locking-step-sw-watchpoints2.patch
-
-diff --git a/gdb/testsuite/gdb.base/watchpoint-during-step.c b/gdb/testsuite/gdb.base/watchpoint-during-step.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/watchpoint-during-step.c
-@@ -0,0 +1,30 @@
-+/* This testcase is part of GDB, the GNU debugger.
-+
-+   Copyright 2007 Free Software Foundation, Inc.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+
-+   Please email any bugs, comments, and/or additions to this file to:
-+   bug-gdb@prep.ai.mit.edu  */
-+
-+static int var;
-+
-+int main()
-+{
-+  var = 1;
-+  var = 2;
-+  var = 3;
-+  return 0;
-+}
-diff --git a/gdb/testsuite/gdb.base/watchpoint-during-step.exp b/gdb/testsuite/gdb.base/watchpoint-during-step.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/watchpoint-during-step.exp
-@@ -0,0 +1,44 @@
-+# Copyright 2007 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+
-+set testfile watchpoint-during-step
-+set srcfile ${testfile}.c
-+set binfile [standard_output_file ${testfile}]
-+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-+    untested "Couldn't compile test program"
-+    return -1
-+}
-+
-+# Get things started.
-+
-+gdb_exit
-+gdb_start
-+gdb_reinitialize_dir $srcdir/$subdir
-+gdb_load ${binfile}
-+
-+runto_main
-+
-+gdb_breakpoint [gdb_get_line_number "var = 2"]
-+gdb_continue_to_breakpoint "Find the first var set"
-+
-+gdb_test "step" ".*var = 3;" "Step to the next var set"
-+
-+gdb_test "watch var" "atchpoint .*: var" "Set the watchpoint"
-+
-+# Here is the target point.  Be careful to not have breakpoint set on the line
-+# we step from as in this case it is a valid upstream KFAIL gdb/38
-+
-+gdb_test "step" ".*Old value = 2.*New value = 3.*" "Catch the watchpoint"

diff --git a/gdb.spec b/gdb.spec
index 8a5bd6e..3dc5633 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -1252,6 +1252,11 @@ fi
 %endif
 
 %changelog
+* Mon Dec 4 2023 Kevin Buettner <kevinb@redhat.com>
+- Remove gdb-6.5-missed-trap-on-step-test.patch.  Testing what happens
+  when stepping over/through a statement which triggers a watchpoint
+  is being added, upstream, to gdb.base/watchpoint.exp.
+
 * Tue Nov 28 2023 Andrew Burgess <aburgess@redhat.com>
 - Backport upstream commits 1f0fab7ff86, aa19bc1d259, acc117b57f7,
   aff250145af, and 3644f41dc80.  These commits reduce the size of the