[rpms/gdb] gdb-17.2-rebase-f44: Remove gdb-6.3-threaded-watchpoints2-20050225.patch

[Kevin Buettner <kevinb@redhat.com>]

            A new commit has been pushed.

            Repo   : rpms/gdb
            Branch : gdb-17.2-rebase-f44
            Commit : 7ca61ebe91cd6bcb3d10d464162125cd26cf8a73
            Author : Kevin Buettner <kevinb@redhat.com>
            Date   : 2022-12-01T19:20:12-07:00
            Stats  : +76/-330 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/gdb/c/7ca61ebe91cd6bcb3d10d464162125cd26cf8a73?branch=gdb-17.2-rebase-f44

            Log:
            Remove gdb-6.3-threaded-watchpoints2-20050225.patch

The test added by this patch from 2005 is a tweaked verion of the upstream
test gdb.threads/watchthreads.exp from 2004.  (The current version of
gdb.threads/watchthreads.exp has changed somewhat since 2004.)

The tweaks added to the circa 2004 upstream test consist of setting
a breakpoint on thread_function and then continuing to it.  At
that point, initial / runtime values of args[2] and args[3] are
fetched and saved in some TCL variables (which are renamed versions
of args_0 and args_1 in watchthreads.exp).  The rest of the changes
to the tweaked script are mostly related to the renaming related to
args_0 and args_1.  The other major difference is that watchthreads.exp
places hardware watchpoints on args[0] and args[1] whereas the
tweaked test instead watches args[2] and args[3].  However, all
of these initialized to 0.  In the tweaked test, fetching the
initial values when the thread function is first hit should result
in zero values being fetched for args[2] and args[3].

So, in conclusion, the tweaked version of the test doesn't actually
test anything new.  I took a look at old posts / threads from the
gdb-patches mailing list, but I couldn't find a post where Jeff
Johnston included this patch (and an explanation of what it does over
the other patch.)

Since this test doesn't offer anything new/better over what's already
upstream, I'm deleting it.

---
diff --git a/_gdb.spec.Patch.include b/_gdb.spec.Patch.include
index bccb519..03b4a63 100644
--- a/_gdb.spec.Patch.include
+++ b/_gdb.spec.Patch.include
@@ -7,275 +7,271 @@ Patch001: gdb-6.3-rh-testversion-20041202.patch
 #=push
 Patch002: gdb-6.3-gstack-20050411.patch
 
-# Test sibling threads to set threaded watchpoints for x86 and x86-64
-#=fedoratest
-Patch003: gdb-6.3-threaded-watchpoints2-20050225.patch
-
 # Support TLS symbols (+`errno' suggestion if no pthread is found) (BZ 185337).
 #=push+jan: It should be replaced by Infinity project.
-Patch004: gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
+Patch003: gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
 
 # Fix TLS symbols resolving for shared libraries with a relative pathname.
 # The testsuite needs `gdb-6.5-tls-of-separate-debuginfo.patch'.
 #=fedoratest: One should recheck if it is really fixed upstream.
-Patch005: gdb-6.5-sharedlibrary-path.patch
+Patch004: gdb-6.5-sharedlibrary-path.patch
 
 # Improved testsuite results by the testsuite provided by the courtesy of BEA.
 #=fedoratest: For upstream it should be rewritten as a dejagnu test, the test of no "??" was useful.
-Patch006: gdb-6.5-BEA-testsuite.patch
+Patch005: gdb-6.5-BEA-testsuite.patch
 
 # Testcase for deadlocking on last address space byte; for corrupted backtraces.
 #=fedoratest
-Patch007: gdb-6.5-last-address-space-byte-test.patch
+Patch006: gdb-6.5-last-address-space-byte-test.patch
 
 # Fix readline segfault on excessively long hand-typed lines.
 #=fedoratest
-Patch008: gdb-6.5-readline-long-line-crash-test.patch
+Patch007: gdb-6.5-readline-long-line-crash-test.patch
 
 # Test sideeffects of skipping ppc .so libs trampolines (BZ 218379).
 #=fedoratest
-Patch009: gdb-6.5-bz218379-ppc-solib-trampoline-test.patch
+Patch008: gdb-6.5-bz218379-ppc-solib-trampoline-test.patch
 
 # Find symbols properly at their original (included) file (BZ 109921).
 #=fedoratest
-Patch010: gdb-6.5-bz109921-DW_AT_decl_file-test.patch
+Patch009: gdb-6.5-bz109921-DW_AT_decl_file-test.patch
 
 # Update PPC unwinding patches to their upstream variants (BZ 140532).
 #=fedoratest
-Patch011: gdb-6.3-bz140532-ppc-unwinding-test.patch
+Patch010: gdb-6.3-bz140532-ppc-unwinding-test.patch
 
 # Testcase for exec() from threaded program (BZ 202689).
 #=fedoratest
-Patch012: gdb-6.3-bz202689-exec-from-pthread-test.patch
+Patch011: gdb-6.3-bz202689-exec-from-pthread-test.patch
 
 # Testcase for PPC Power6/DFP instructions disassembly (BZ 230000).
 #=fedoratest
-Patch013: gdb-6.6-bz230000-power6-disassembly-test.patch
+Patch012: gdb-6.6-bz230000-power6-disassembly-test.patch
 
 # Allow running `/usr/bin/gcore' with provided but inaccessible tty (BZ 229517).
 #=fedoratest
-Patch014: gdb-6.6-bz229517-gcore-without-terminal.patch
+Patch013: gdb-6.6-bz229517-gcore-without-terminal.patch
 
 # Avoid too long timeouts on failing cases of "annota1.exp annota3.exp".
 #=fedoratest
-Patch015: gdb-6.6-testsuite-timeouts.patch
+Patch014: gdb-6.6-testsuite-timeouts.patch
 
 # Support for stepping over PPC atomic instruction sequences (BZ 237572).
 #=fedoratest
-Patch016: gdb-6.6-bz237572-ppc-atomic-sequence-test.patch
+Patch015: gdb-6.6-bz237572-ppc-atomic-sequence-test.patch
 
 # Test kernel VDSO decoding while attaching to an i386 process.
 #=fedoratest
-Patch017: gdb-6.3-attach-see-vdso-test.patch
+Patch016: gdb-6.3-attach-see-vdso-test.patch
 
 # Test leftover zombie process (BZ 243845).
 #=fedoratest
-Patch018: gdb-6.5-bz243845-stale-testing-zombie-test.patch
+Patch017: gdb-6.5-bz243845-stale-testing-zombie-test.patch
 
 # New locating of the matching binaries from the pure core file (build-id).
 #=push+jan
-Patch019: gdb-6.6-buildid-locate.patch
+Patch018: gdb-6.6-buildid-locate.patch
 
 # Fix loading of core files without build-ids but with build-ids in executables.
 # Load strictly build-id-checked core files only if no executable is specified
 # (Jan Kratochvil, RH BZ 1339862).
 #=push+jan
-Patch020: gdb-6.6-buildid-locate-solib-missing-ids.patch
+Patch019: gdb-6.6-buildid-locate-solib-missing-ids.patch
 
 #=push+jan
-Patch021: gdb-6.6-buildid-locate-rpm.patch
+Patch020: gdb-6.6-buildid-locate-rpm.patch
 
 # Fix displaying of numeric char arrays as strings (BZ 224128).
 #=fedoratest: But it is failing anyway, one should check the behavior more.
-Patch022: gdb-6.7-charsign-test.patch
+Patch021: gdb-6.7-charsign-test.patch
 
 # Test PPC hiding of call-volatile parameter register.
 #=fedoratest
-Patch023: gdb-6.7-ppc-clobbered-registers-O2-test.patch
+Patch022: gdb-6.7-ppc-clobbered-registers-O2-test.patch
 
 # Testsuite fixes for more stable/comparable results.
 #=fedoratest
-Patch024: gdb-6.7-testsuite-stable-results.patch
+Patch023: gdb-6.7-testsuite-stable-results.patch
 
 # Test ia64 memory leaks of the code using libunwind.
 #=fedoratest
-Patch025: gdb-6.5-ia64-libunwind-leak-test.patch
+Patch024: gdb-6.5-ia64-libunwind-leak-test.patch
 
 # Test hiding unexpected breakpoints on intentional step commands.
 #=fedoratest
-Patch026: gdb-6.5-missed-trap-on-step-test.patch
+Patch025: gdb-6.5-missed-trap-on-step-test.patch
 
 # Test gcore memory and time requirements for large inferiors.
 #=fedoratest
-Patch027: gdb-6.5-gcore-buffer-limit-test.patch
+Patch026: 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.
-Patch028: gdb-6.3-mapping-zero-inode-test.patch
+Patch027: gdb-6.3-mapping-zero-inode-test.patch
 
 # Test a crash on `focus cmd', `focus prev' commands.
 #=fedoratest
-Patch029: gdb-6.3-focus-cmd-prev-test.patch
+Patch028: gdb-6.3-focus-cmd-prev-test.patch
 
 # Test various forms of threads tracking across exec() (BZ 442765).
 #=fedoratest
-Patch030: gdb-6.8-bz442765-threaded-exec-test.patch
+Patch029: gdb-6.8-bz442765-threaded-exec-test.patch
 
 # Test a crash on libraries missing the .text section.
 #=fedoratest
-Patch031: gdb-6.5-section-num-fixup-test.patch
+Patch030: gdb-6.5-section-num-fixup-test.patch
 
 # Fix resolving of variables at locations lists in prelinked libs (BZ 466901).
 #=fedoratest
-Patch032: gdb-6.8-bz466901-backtrace-full-prelinked.patch
+Patch031: gdb-6.8-bz466901-backtrace-full-prelinked.patch
 
 # New test for step-resume breakpoint placed in multiple threads at once.
 #=fedoratest
-Patch033: gdb-simultaneous-step-resume-breakpoint-test.patch
+Patch032: 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@.*>
-Patch034: gdb-core-open-vdso-warning.patch
+Patch033: gdb-core-open-vdso-warning.patch
 
 # Workaround ccache making lineno non-zero for command-line definitions.
 #=fedoratest: ccache is rarely used and it is even fixed now.
-Patch035: gdb-ccache-workaround.patch
+Patch034: gdb-ccache-workaround.patch
 
 # Testcase for "Do not make up line information" fix by Daniel Jacobowitz.
 #=fedoratest
-Patch036: gdb-lineno-makeup-test.patch
+Patch035: gdb-lineno-makeup-test.patch
 
 # Test power7 ppc disassembly.
 #=fedoratest
-Patch037: gdb-ppc-power7-test.patch
+Patch036: gdb-ppc-power7-test.patch
 
 # Fix follow-exec for C++ programs (bugreported by Martin Stransky).
 #=fedoratest
-Patch038: gdb-archer-next-over-throw-cxx-exec.patch
+Patch037: gdb-archer-next-over-throw-cxx-exec.patch
 
 # Backport DWARF-4 support (BZ 601887, Tom Tromey).
 #=fedoratest
-Patch039: gdb-bz601887-dwarf4-rh-test.patch
+Patch038: gdb-bz601887-dwarf4-rh-test.patch
 
 # Workaround librpm BZ 643031 due to its unexpected exit() calls (BZ 642879).
 #=push+jan
-Patch040: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
+Patch039: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
 
 # [delayed-symfile] Test a backtrace regression on CFIs without DIE (BZ 614604).
 #=fedoratest
-Patch041: gdb-test-bt-cfi-without-die.patch
+Patch040: gdb-test-bt-cfi-without-die.patch
 
 # Verify GDB Python built-in function gdb.solib_address exists (BZ # 634108).
 #=fedoratest
-Patch042: gdb-bz634108-solib_address.patch
+Patch041: gdb-bz634108-solib_address.patch
 
 # New test gdb.arch/x86_64-pid0-core.exp for kernel PID 0 cores (BZ 611435).
 #=fedoratest
-Patch043: gdb-test-pid0-core.patch
+Patch042: gdb-test-pid0-core.patch
 
 # [archer-tromey-delayed-symfile] New test gdb.dwarf2/dw2-aranges.exp.
 #=fedoratest
-Patch044: gdb-test-dw2-aranges.patch
+Patch043: gdb-test-dw2-aranges.patch
 
 # [archer-keiths-expr-cumulative+upstream] Import C++ testcases.
 #=fedoratest
-Patch045: gdb-test-expr-cumulative-archer.patch
+Patch044: gdb-test-expr-cumulative-archer.patch
 
 # Fix regressions on C++ names resolving (PR 11734, PR 12273, Keith Seitz).
 #=fedoratest
-Patch046: gdb-physname-pr11734-test.patch
+Patch045: gdb-physname-pr11734-test.patch
 
 # Fix regressions on C++ names resolving (PR 11734, PR 12273, Keith Seitz).
 #=fedoratest
-Patch047: gdb-physname-pr12273-test.patch
+Patch046: gdb-physname-pr12273-test.patch
 
 # Test GDB opcodes/ disassembly of Intel Ivy Bridge instructions (BZ 696890).
 #=fedoratest
-Patch048: gdb-test-ivy-bridge.patch
+Patch047: gdb-test-ivy-bridge.patch
 
 # Hack for proper PIE run of the testsuite.
 #=fedoratest
-Patch049: gdb-runtest-pie-override.patch
+Patch048: gdb-runtest-pie-override.patch
 
 # Workaround PR libc/14166 for inferior calls of strstr.
 #=fedoratest: Compatibility with RHELs (unchecked which ones).
-Patch050: gdb-glibc-strstr-workaround.patch
+Patch049: gdb-glibc-strstr-workaround.patch
 
 # Include testcase for `Unable to see a variable inside a module (XLF)' (BZ 823789).
 #=fedoratest
-Patch051: gdb-rhel5.9-testcase-xlf-var-inside-mod.patch
+Patch050: gdb-rhel5.9-testcase-xlf-var-inside-mod.patch
 
 # Testcase for `Setting solib-absolute-prefix breaks vDSO' (BZ 818343).
 #=fedoratest
-Patch052: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
+Patch051: 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
-Patch053: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
+Patch052: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
 
 # Fix 'memory leak in infpy_read_memory()' (RH BZ 1007614)
 #=fedoratest
-Patch054: gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
+Patch053: 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
-Patch055: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
+Patch054: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
 
 # Display Fortran strings in backtraces.
 #=fedoratest
-Patch056: gdb-fortran-frame-string.patch
+Patch055: gdb-fortran-frame-string.patch
 
 # Testcase for '[SAP] Recursive dlopen causes SAP HANA installer to
 # crash.' (RH BZ 1156192).
 #=fedoratest
-Patch057: gdb-rhbz1156192-recursive-dlopen-test.patch
+Patch056: gdb-rhbz1156192-recursive-dlopen-test.patch
 
 # Fix '`catch syscall' doesn't work for parent after `fork' is called'
 # (Philippe Waroquiers, RH BZ 1149205).
 #=fedoratest
-Patch058: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
+Patch057: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
 
 # Fix 'backport GDB 7.4 fix to RHEL 6.6 GDB' [Original Sourceware bug
 # description: 'C++ (and objc): Internal error on unqualified name
 # re-set', PR 11657] (RH BZ 1186476).
 #=fedoratest
-Patch059: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
+Patch058: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
 
 # Test 'info type-printers' Python error (RH BZ 1350436).
 #=fedoratest
-Patch060: gdb-rhbz1350436-type-printers-error.patch
+Patch059: gdb-rhbz1350436-type-printers-error.patch
 
 # Fix '[ppc64] and [s390x] wrong prologue skip on -O2 -g code' (Jan
 # Kratochvil, RH BZ 1084404).
 #=fedoratest
-Patch061: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
+Patch060: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
 
 # Force libncursesw over libncurses to match the includes (RH BZ 1270534).
 #=push+jan
-Patch062: gdb-fedora-libncursesw.patch
+Patch061: gdb-fedora-libncursesw.patch
 
 # Test clflushopt instruction decode (for RH BZ 1262471).
 #=fedoratest
-Patch063: gdb-opcodes-clflushopt-test.patch
+Patch062: gdb-opcodes-clflushopt-test.patch
 
 # [SCL] Skip deprecated .gdb_index warning for Red Hat built files (BZ 953585).
 #=push+jan
-Patch064: gdb-6.6-buildid-locate-rpm-scl.patch
+Patch063: gdb-6.6-buildid-locate-rpm-scl.patch
 
 # [aarch64] Fix hardware watchpoints (RH BZ 1261564).
 #=fedoratest
-Patch065: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
+Patch064: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
 
 # Add messages suggesting more recent RHEL gdbserver (RH BZ 1321114).
 #=fedora
-Patch066: gdb-container-rh-pkg.patch
+Patch065: gdb-container-rh-pkg.patch
 
 # [dts+el7] [x86*] Bundle linux_perf.h for libipt (RH BZ 1256513).
 #=fedora
-Patch067: gdb-linux_perf-bundle.patch
+Patch066: gdb-linux_perf-bundle.patch
 
 # Fix gdb-headless /usr/bin/ executables (BZ 1390251).
 #
@@ -284,28 +280,28 @@ Patch067: gdb-linux_perf-bundle.patch
 #
 #   https://fedoraproject.org/wiki/Changes/Minimal_GDB_in_buildroot
 #=fedora
-Patch068: gdb-libexec-add-index.patch
+Patch067: gdb-libexec-add-index.patch
 
 # New testcase for: Fix <tab>-completion crash (Gary Benson, RH BZ 1398387).
 #=fedoratest
-Patch069: gdb-rhbz1398387-tab-crash-test.patch
+Patch068: gdb-rhbz1398387-tab-crash-test.patch
 
 # [s390x] Backport arch12 instructions decoding (RH BZ 1553104).
 # =fedoratest
-Patch070: gdb-rhbz1553104-s390x-arch12-test.patch
+Patch069: gdb-rhbz1553104-s390x-arch12-test.patch
 
 
-Patch071: gdb-backport-readline_support.patch
+Patch070: gdb-backport-readline_support.patch
 
 # [gdb/testsuite] Use prototype to call libc functions
 # (Tom de Vries)
-Patch072: gdb-backport-fix-break-main-file-remove-fail.patch
+Patch071: gdb-backport-fix-break-main-file-remove-fail.patch
 
 # Constify target_desc to fix PPC ODR violations.
 # (Keith Seitz, build/22395)
-Patch073: gdb-sw22395-constify-target_desc.patch
+Patch072: gdb-sw22395-constify-target_desc.patch
 
 # libiberty: Fix C89-isms in configure tests
 # (Florian Weimer, RHBZ 2143992)
-Patch074: gdb-rhbz2143992-libiberty-fix-c89isms-in-configure.patch
+Patch073: gdb-rhbz2143992-libiberty-fix-c89isms-in-configure.patch
 

diff --git a/_gdb.spec.patch.include b/_gdb.spec.patch.include
index affe771..9601239 100644
--- a/_gdb.spec.patch.include
+++ b/_gdb.spec.patch.include
@@ -71,4 +71,3 @@
 %patch071 -p1
 %patch072 -p1
 %patch073 -p1
-%patch074 -p1

diff --git a/_patch_order b/_patch_order
index 0347997..2a8c121 100644
--- a/_patch_order
+++ b/_patch_order
@@ -1,6 +1,5 @@
 gdb-6.3-rh-testversion-20041202.patch
 gdb-6.3-gstack-20050411.patch
-gdb-6.3-threaded-watchpoints2-20050225.patch
 gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
 gdb-6.5-sharedlibrary-path.patch
 gdb-6.5-BEA-testsuite.patch

diff --git a/gdb-6.3-threaded-watchpoints2-20050225.patch b/gdb-6.3-threaded-watchpoints2-20050225.patch
deleted file mode 100644
index 42b5260..0000000
--- a/gdb-6.3-threaded-watchpoints2-20050225.patch
+++ /dev/null
@@ -1,253 +0,0 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Jeff Johnston <jjohnstn@redhat.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-6.3-threaded-watchpoints2-20050225.patch
-
-;; Test sibling threads to set threaded watchpoints for x86 and x86-64
-;;=fedoratest
-
-2005-02-28  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* config/i386/nm-linux.h: Change dr register routines to
-	accept a ptid_t first argument.  Change all calling macros
-	to default the inferior_ptid for the first argument.
-	(i386_linux_insert_watchpoint): New prototype.
-	(i386_linux_remove_watchpoint, i386_linux_insert_hw_breakpoint): Ditto.
-	(i386_linux_remove_hw_breakpoint): Ditto.
-	(target_insert_watchpoint, target_remove_watchpoint): Undef and
-	override.
-	(target_insert_hw_breakpoint, target_remove_hw_breakpoint): Ditto.
-	* config/i386/nm-linux64.h: Ditto except add amd64 versions of
-	the watchpoint/hw-breakpoint insert/remove routines.
-	* i386-nat.c: Include "inferior.h" to define inferior_ptid.
-	* i386-linux-nat.c: Change all dr get/set routines to accept
-	ptid_t as first argument and to use this argument to determine
-	the tid for PTRACE.
-	(i386_linux_set_debug_regs_for_thread): New function.
-	(i386_linux_sync_debug_registers_callback): Ditto.
-	(i386_linux_sync_debug_registers_across_threads): Ditto.
-	(i386_linux_insert_watchpoint, i386_linux_remove_watchpoint): Ditto.
-	(i386_linux_hw_breakpoint, i386_linux_remove_hw_breakpoint): Ditto.
-	(i386_linux_new_thread): Ditto.
-	(_initialize_i386_linux_nat): Ditto.
-	* amd64-linux-nat.c: Change all dr get/set routines to accept
-	ptid_t as first argument and to use this argument to determine
-	the tid for PTRACE.
-	(amd64_linux_set_debug_regs_for_thread): New function.
-	(amd64_linux_sync_debug_registers_callback): Ditto.
-	(amd64_linux_sync_debug_registers_across_threads): Ditto.
-	(amd64_linux_insert_watchpoint, amd64_linux_remove_watchpoint): Ditto.
-	(amd64_linux_hw_breakpoint, amd64_linux_remove_hw_breakpoint): Ditto.
-	(amd64_linux_new_thread): Ditto.
-	(_initialize_amd64_linux_nat): Register linux new thread observer.
-	* testsuite/gdb.threads/watchthreads-threaded.c: New test case.
-	* testsuite/gdb.threads/watchthreads-threaded.exp: Ditto.
-
-[ With recent upstream GDB (6.8) reduced only to the testcase.  ]
-
-[ It was called watchthreads2.{exp,c} before but it conflicted with FSF GDB new
-  testcase of the same name.  ]
-
-FIXME: The testcase does not expects multiple watchpoints hits per one stop.
-
-diff --git a/gdb/testsuite/gdb.threads/watchthreads-threaded.c b/gdb/testsuite/gdb.threads/watchthreads-threaded.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.threads/watchthreads-threaded.c
-@@ -0,0 +1,65 @@
-+/* This testcase is part of GDB, the GNU debugger.
-+
-+   Copyright 2002, 2003, 2004, 2005 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.
-+
-+   This file is copied from schedlock.c.  */
-+
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <stdlib.h>
-+#include <pthread.h>
-+
-+void *thread_function(void *arg); /* Pointer to function executed by each thread */
-+
-+#define NUM 5
-+
-+unsigned int args[NUM+1];
-+
-+int main() {
-+    int res;
-+    pthread_t threads[NUM];
-+    void *thread_result;
-+    long i;
-+
-+    for (i = 0; i < NUM; i++)
-+      {
-+	args[i] = 1; /* Init value.  */
-+	res = pthread_create(&threads[i],
-+		             NULL,
-+			     thread_function,
-+			     (void *) i);
-+      }
-+
-+    args[i] = 1;
-+    thread_function ((void *) i);
-+
-+    exit(EXIT_SUCCESS);
-+}
-+
-+void *thread_function(void *arg) {
-+    int my_number =  (long) arg;
-+    int *myp = (int *) &args[my_number];
-+
-+    /* Don't run forever.  Run just short of it :)  */
-+    while (*myp > 0)
-+      {
-+	(*myp) ++; usleep (1); /* Loop increment.  */
-+      }
-+
-+    pthread_exit(NULL);
-+}
-diff --git a/gdb/testsuite/gdb.threads/watchthreads-threaded.exp b/gdb/testsuite/gdb.threads/watchthreads-threaded.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.threads/watchthreads-threaded.exp
-@@ -0,0 +1,126 @@
-+# This testcase is part of GDB, the GNU debugger.
-+
-+# Copyright 2005 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.
-+
-+# Check that GDB can support multiple watchpoints across threads.
-+
-+# This test verifies that a watchpoint is detected in the proper thread
-+# so the test is only meaningful on a system with hardware watchpoints.
-+if [target_info exists gdb,no_hardware_watchpoints] {
-+    return 0;
-+}
-+
-+set testfile "watchthreads-threaded"
-+set srcfile ${testfile}.c
-+set binfile [standard_output_file ${testfile}]
-+if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "incdir=${objdir}"]] != "" } {
-+    return -1
-+}
-+
-+gdb_exit
-+gdb_start
-+gdb_reinitialize_dir $srcdir/$subdir
-+gdb_load ${binfile}
-+
-+gdb_test "set can-use-hw-watchpoints 1" "" ""
-+
-+#
-+# Run to `main' where we begin our tests.
-+#
-+
-+if ![runto_main] then {
-+    gdb_suppress_tests
-+}
-+
-+set args_2 0
-+set args_3 0
-+
-+gdb_breakpoint "thread_function"
-+gdb_continue_to_breakpoint "thread_function"
-+gdb_test "disable 2" ""
-+
-+gdb_test_multiple "p args\[2\]" "get initial args2" {
-+  -re "\\\$\[0-9\]* = (.*)$gdb_prompt $" {
-+    set init_args_2 $expect_out(1,string)
-+    pass "get initial args2"
-+  }
-+}
-+
-+gdb_test_multiple "p args\[3\]" "get initial args3" {
-+  -re "\\\$\[0-9\]* = (.*)$gdb_prompt $" {
-+    set init_args_3 $expect_out(1,string)
-+    pass "get initial args3"
-+  }
-+}
-+
-+set args_2 $init_args_2
-+set args_3 $init_args_3
-+
-+# Watch values that will be modified by distinct threads.
-+gdb_test "watch args\[2\]" "Hardware watchpoint 3: args\\\[2\\\]"
-+gdb_test "watch args\[3\]" "Hardware watchpoint 4: args\\\[3\\\]"
-+
-+set init_line [expr [gdb_get_line_number "Init value"]+1]
-+set inc_line [gdb_get_line_number "Loop increment"]
-+
-+# Loop and continue to allow both watchpoints to be triggered.
-+for {set i 0} {$i < 30} {incr i} {
-+  set test_flag 0
-+  gdb_test_multiple "continue" "threaded watch loop" {
-+    -re "Hardware watchpoint 3: args\\\[2\\\].*Old value = 0.*New value = 1.*main \\\(\\\) at .*watchthreads-threaded.c:$init_line.*$gdb_prompt $"
-+       { set args_2 1; set test_flag 1 }
-+    -re "Hardware watchpoint 4: args\\\[3\\\].*Old value = 0.*New value = 1.*main \\\(\\\) at .*watchthreads-threaded.c:$init_line.*$gdb_prompt $"
-+       { set args_3 1; set test_flag 1 }
-+    -re "Hardware watchpoint 3: args\\\[2\\\].*Old value = $args_2.*New value = [expr $args_2+1].*thread_function \\\(arg=0x2\\\) at .*watchthreads-threaded.c:$inc_line.*$gdb_prompt $"
-+       { set args_2 [expr $args_2+1]; set test_flag 1 }
-+    -re "Hardware watchpoint 4: args\\\[3\\\].*Old value = $args_3.*New value = [expr $args_3+1].*thread_function \\\(arg=0x3\\\) at .*watchthreads-threaded.c:$inc_line.*$gdb_prompt $"
-+       { set args_3 [expr $args_3+1]; set test_flag 1 }
-+  }
-+  # If we fail above, don't bother continuing loop
-+  if { $test_flag == 0 } {
-+    set i 30;
-+  }
-+}
-+
-+# Print success message if loop succeeded.
-+if { $test_flag == 1 } {
-+  pass "threaded watch loop"
-+}
-+
-+# Verify that we hit first watchpoint in child thread.
-+set message "watchpoint on args\[2\] hit in thread"
-+if { $args_2 > 1 } {
-+  pass $message
-+} else {
-+  fail $message
-+}
-+
-+# Verify that we hit second watchpoint in child thread.
-+set message "watchpoint on args\[3\] hit in thread"
-+if { $args_3 > 1 } {
-+  pass $message
-+} else {
-+  fail $message
-+}
-+
-+# Verify that all watchpoint hits are accounted for.
-+set message "combination of threaded watchpoints = 30 + initial values"
-+if { [expr $args_2+$args_3] == [expr [expr 30+$init_args_2]+$init_args_3] } {
-+  pass $message
-+} else {
-+  fail $message
-+}

diff --git a/gdb.spec b/gdb.spec
index f546b2b..4a544ba 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -1186,6 +1186,11 @@ fi
 %endif
 
 %changelog
+* Thu Dec 1 2022 Kevin Buettner <kevinb@redhat.com>
+- Remove gdb-6.3-threaded-watchpoints2-20050225.patch.  The test in this
+  patch is a tweaked version of upstream test gdb.threads/watchthreads.exp
+  from 2004.  It doesn't actually test anything new.
+
 * Thu Dec 1  2022 Bruno Larsen <blarsen@redhat.com>
 - Remove gdb-rhbz1325795-framefilters-test.patch.  This test doesn't
   pass in the curret state, and the code that introduced the original