From acc33b04c9d1ae81d0ee8a0a336903e0ac7add8a Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@fedoraproject.org>
Date: Apr 13 2024 15:24:37 +0000
Subject: Add valgrind-3.22.0-gdb-thread-exited.patch


---

diff --git a/valgrind-3.22.0-gdb-thread-exited.patch b/valgrind-3.22.0-gdb-thread-exited.patch
new file mode 100644
index 0000000..4a4d451
--- /dev/null
+++ b/valgrind-3.22.0-gdb-thread-exited.patch
@@ -0,0 +1,23 @@
+commit 7aa63de01a3cda2a346f90be16bd29fd7b410c63
+Author: Mark Wielaard <mark@klomp.org>
+Date:   Mon Jan 22 14:08:30 2024 +0100
+
+    gdbserver_tests/filter_gdb.in: delete thread exiting
+    
+    The hginfo testcase would fail with GDB 14.1 because it would output
+    an extra line saying: [Thread .... exited]
+
+diff --git a/gdbserver_tests/filter_gdb.in b/gdbserver_tests/filter_gdb.in
+index 16186dfe2c9b..6c85284b7531 100755
+--- a/gdbserver_tests/filter_gdb.in
++++ b/gdbserver_tests/filter_gdb.in
+@@ -65,6 +65,9 @@ s/Thread [0-9][0-9]*/Thread ..../g
+ #       delete thread switches
+ /\[Switching to Thread ....\]/d
+ 
++#       delete thread exiting
++/\[Thread .... exited\]/d
++
+ #       ??? Probably we had a 'Switching ' message in front of
+ #        a frame line ?
+ s/\(\[Switching to thread [1234] (Thread ....)\]\)#0/\1\n#0/
diff --git a/valgrind.spec b/valgrind.spec
index 3a90a7b..ceb9109 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -106,6 +106,10 @@ Patch8: valgrind-3.22.0-x86-nop.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=2257546
 Patch9: valgrind-3.22.0-gcc-builtin_strcmp-128-256-bit-vector.patch
 
+# Upstream commit 7aa63de01a3cda2a346f90be16bd29fd7b410c63
+# Testsuite fix gdbserver_tests/filter_gdb.in: delete thread exiting
+Patch10: valgrind-3.22.0-gdb-thread-exited.patch
+
 BuildRequires: make
 BuildRequires: glibc-devel
 
@@ -249,6 +253,7 @@ Valgrind User Manual for details.
 %patch -P7 -p1
 %patch -P8 -p1
 %patch -P9 -p1
+%patch -P10 -p1
 
 %build
 # LTO triggers undefined symbols in valgrind.  Valgrind has a --enable-lto
@@ -467,6 +472,7 @@ echo ===============END TESTING===============
 %changelog
 * Sat Apr 13 2024 Mark Wielaard <mjw@fedoraproject.org>
 - Add BuildRequires: python3-devel for running testsuite.
+- Add valgrind-3.22.0-gdb-thread-exited.patch
 
 * Mon Mar 11 2024 Mark Wielaard <mjw@fedoraproject.org> - 3.22.0-7
 - Add valgrind-3.22.0-gcc-builtin_strcmp-128-256-bit-vector.patch