[rpms/gdb] gdb-17.2-rebase-f44: drop gdb-6.5-bz218379-ppc-solib-trampoline-test.patch

[rpms/gdb] gdb-17.2-rebase-f44: drop gdb-6.5-bz218379-ppc-solib-trampoline-test.patch

[Andrew Burgess]

            A new commit has been pushed.

            Repo   : rpms/gdb
            Branch : gdb-17.2-rebase-f44
            Commit : 73a92e455cb369f39adf2bb2e0cb3e52eec44ef5
            Author : Andrew Burgess <aburgess@redhat.com>
            Date   : 2025-02-07T09:32:46+00:00
            Stats  : +15/-123 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/gdb/c/73a92e455cb369f39adf2bb2e0cb3e52eec44ef5?branch=gdb-17.2-rebase-f44

            Log:
            drop gdb-6.5-bz218379-ppc-solib-trampoline-test.patch

Drop gdb-6.5-bz218379-ppc-solib-trampoline-test.patch.  This is a test
only patch which appears to be trying to catch an issue when using
'next' to step over a libc call.

I did go back and try to find a version of GDB which would fail this
test, but couldn't find one.  I'm not really surprised though, the
bugzilla logs indicate this might have been an issue that was
introduced by a commit, spotted, and rapidly fixed, so the window of
failing GDB versions might be pretty small.

Additionally, the test uses 'next' to step over a libc call, and then
checks for the inferior stopping at call___do_global_ctors_aux, if it
does, then this is a failure.  However, the test comments talk about
stopping at a trampoline (which I assume means, maybe a PLT
trampoline?) but either way, the call___do_global_ctors_aux label is,
if I understand correctly, about initialisation of global state, so
I'm not sure how this all ties together.

I think we should just drop this test from Fedora.

The core of the test appears to be about using 'next' to step over a
libc library call.  If that breaks then I'm pretty sure we'll know
about it pretty quickly.  If/when that happens, we can upstream a test
along with the fix at that point.  Until then, I don't see the need to
carry this test.

---
diff --git a/_gdb.spec.Patch.include b/_gdb.spec.Patch.include
index f6e9160..0f34581 100644
--- a/_gdb.spec.Patch.include
+++ b/_gdb.spec.Patch.include
@@ -1,43 +1,39 @@
 # Check distro name is included in the version output.
 Patch001: gdb-6.3-rh-testversion-20041202.patch
 
-# Test sideeffects of skipping ppc .so libs trampolines (BZ 218379).
-#=fedoratest
-Patch002: gdb-6.5-bz218379-ppc-solib-trampoline-test.patch
-
 # Support for stepping over PPC atomic instruction sequences (BZ 237572).
 #=fedoratest
-Patch003: gdb-6.6-bz237572-ppc-atomic-sequence-test.patch
+Patch002: gdb-6.6-bz237572-ppc-atomic-sequence-test.patch
 
 # Test gcore memory and time requirements for large inferiors.
 #=fedoratest
-Patch004: gdb-6.5-gcore-buffer-limit-test.patch
+Patch003: 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.
-Patch005: gdb-6.3-mapping-zero-inode-test.patch
+Patch004: gdb-6.3-mapping-zero-inode-test.patch
 
 # Fix resolving of variables at locations lists in prelinked libs (BZ 466901).
 #=fedoratest
-Patch006: gdb-6.8-bz466901-backtrace-full-prelinked.patch
+Patch005: gdb-6.8-bz466901-backtrace-full-prelinked.patch
 
 # Fix follow-exec for C++ programs (bugreported by Martin Stransky).
 #=fedoratest
-Patch007: gdb-archer-next-over-throw-cxx-exec.patch
+Patch006: gdb-archer-next-over-throw-cxx-exec.patch
 
 # Testcase for `Setting solib-absolute-prefix breaks vDSO' (BZ 818343).
 #=fedoratest
-Patch008: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
+Patch007: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
 
 # Fix '`catch syscall' doesn't work for parent after `fork' is called'
 # (Philippe Waroquiers, RH BZ 1149205).
 #=fedoratest
-Patch009: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
+Patch008: 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
-Patch010: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
+Patch009: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
 
 # Update gdb-add-index.sh such that, when the GDB environment
 # variable is not set, the script is smarter than just looking for
@@ -51,9 +47,9 @@ Patch010: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
 #   https://fedoraproject.org/wiki/Changes/Minimal_GDB_in_buildroot
 #
 #=fedora
-Patch011: gdb-add-index.patch
+Patch010: gdb-add-index.patch
 
 # Not a backport.  Add a new script which hooks into GDB and suggests
 # RPMs to install when GDB finds an objfile with no debug info.
-Patch012: gdb-add-rpm-suggestion-script.patch
+Patch011: gdb-add-rpm-suggestion-script.patch
 

diff --git a/_gdb.spec.patch.include b/_gdb.spec.patch.include
index dad4d0a..a409d9f 100644
--- a/_gdb.spec.patch.include
+++ b/_gdb.spec.patch.include
@@ -9,4 +9,3 @@
 %patch -p1 -P009
 %patch -p1 -P010
 %patch -p1 -P011
-%patch -p1 -P012

diff --git a/_patch_order b/_patch_order
index 047f472..fa1116c 100644
--- a/_patch_order
+++ b/_patch_order
@@ -1,5 +1,4 @@
 gdb-6.3-rh-testversion-20041202.patch
-gdb-6.5-bz218379-ppc-solib-trampoline-test.patch
 gdb-6.6-bz237572-ppc-atomic-sequence-test.patch
 gdb-6.5-gcore-buffer-limit-test.patch
 gdb-6.3-mapping-zero-inode-test.patch

diff --git a/gdb-6.5-bz218379-ppc-solib-trampoline-test.patch b/gdb-6.5-bz218379-ppc-solib-trampoline-test.patch
deleted file mode 100644
index db4229d..0000000
--- a/gdb-6.5-bz218379-ppc-solib-trampoline-test.patch
+++ /dev/null
@@ -1,107 +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-bz218379-ppc-solib-trampoline-test.patch
-
-;; Test sideeffects of skipping ppc .so libs trampolines (BZ 218379).
-;;=fedoratest
-
-https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=218379
-
-diff --git a/gdb/testsuite/gdb.base/step-over-trampoline.c b/gdb/testsuite/gdb.base/step-over-trampoline.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/step-over-trampoline.c
-@@ -0,0 +1,28 @@
-+/* This testcase is part of GDB, the GNU debugger.
-+
-+   Copyright 2006 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  */
-+
-+#include <stdio.h>
-+
-+int main (void)
-+{
-+	puts ("hello world");
-+	return 0;
-+}
-diff --git a/gdb/testsuite/gdb.base/step-over-trampoline.exp b/gdb/testsuite/gdb.base/step-over-trampoline.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/step-over-trampoline.exp
-@@ -0,0 +1,59 @@
-+# Copyright 2006 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.
-+
-+if {[use_gdb_stub]} {
-+    untested "skipping test because of use_gdb_stub"
-+    return -1
-+}
-+
-+if $tracelevel then {
-+    strace $tracelevel
-+}
-+
-+set testfile step-over-trampoline
-+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}
-+
-+# For C programs, "start" should stop in main().
-+
-+gdb_test "start" \
-+         "main \\(\\) at .*$srcfile.*" \
-+         "start"
-+
-+# main () at hello2.c:5
-+# 5		puts("hello world\n");
-+# (gdb) next
-+# 0x100007e0 in call___do_global_ctors_aux ()
-+
-+gdb_test_multiple "next" "invalid `next' output" {
-+	-re "\nhello world.*return 0;.*" {
-+		pass "stepped over"
-+	}
-+	-re " in call___do_global_ctors_aux \\(\\).*" {
-+		fail "stepped into trampoline"
-+	}
-+}

diff --git a/gdb.spec b/gdb.spec
index d89a704..f1aaf60 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -924,6 +924,11 @@ fi
 
 %changelog
 * Fri Feb 06 2025 Andrew Burgess <aburgess@redhat.com>
+- Remove gdb-6.5-bz218379-ppc-solib-trampoline-test.patch.  There must
+  be upstream tests that 'next' over a libc call.  Additionally, it is
+  not clear to me exactly what bug is being tested for here.
+
+* Fri Feb 06 2025 Andrew Burgess <aburgess@redhat.com>
 - Remove gdb-gstack.man file.  This is no longer used.  There is an
   upstream version of gstack which provides its own man page.