[rpms/gdb] gdb-17.2-rebase-f44: Remove gdb-test-bt-cfi-without-die.patch after it was upstreamed.

[rpms/gdb] gdb-17.2-rebase-f44: Remove gdb-test-bt-cfi-without-die.patch after it was upstreamed.

[Guinevere Larsen]

A new commit has been pushed.

Repo   : rpms/gdb
Branch : gdb-17.2-rebase-f44
Commit : 1e3eb79207e5ff6568b524463c71e02dd0c32c1e
Author : Guinevere Larsen <guinevere@redhat.com>
Date   : 2025-01-17T17:06:27-03:00
Stats  : +13/-228 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/gdb/c/1e3eb79207e5ff6568b524463c71e02dd0c32c1e?branch=gdb-17.2-rebase-f44

Log:
Remove gdb-test-bt-cfi-without-die.patch after it was upstreamed.

---
diff --git a/_gdb.spec.Patch.include b/_gdb.spec.Patch.include
index 860ddc0..a9aa10e 100644
--- a/_gdb.spec.Patch.include
+++ b/_gdb.spec.Patch.include
@@ -30,23 +30,19 @@ Patch007: gdb-6.8-bz466901-backtrace-full-prelinked.patch
 #=fedoratest
 Patch008: gdb-archer-next-over-throw-cxx-exec.patch
 
-# [delayed-symfile] Test a backtrace regression on CFIs without DIE (BZ 614604).
-#=fedoratest
-Patch009: gdb-test-bt-cfi-without-die.patch
-
 # Testcase for `Setting solib-absolute-prefix breaks vDSO' (BZ 818343).
 #=fedoratest
-Patch010: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
+Patch009: 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
-Patch011: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
+Patch010: 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
-Patch012: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
+Patch011: 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
@@ -60,7 +56,7 @@ Patch012: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
 #   https://fedoraproject.org/wiki/Changes/Minimal_GDB_in_buildroot
 #
 #=fedora
-Patch013: gdb-add-index.patch
+Patch012: gdb-add-index.patch
 
 # Backport of upstream commit 36fb20fa93484b104d.  This is not really
 # relevant for our branch, but later commits that are important, and
@@ -84,17 +80,17 @@ Patch013: gdb-add-index.patch
 #
 # Change-Id: I4e25ec26ab06636629adebd02ceb161ee31c232d
 # Approved-by: Kevin Buettner <kevinb@redhat.com>
-Patch014: gdb-remove-qnx-neutrino-support.patch
+Patch013: gdb-remove-qnx-neutrino-support.patch
 
 # Backport patches related to build-id usage when opening a core
 # file, and also improving general build-id based lookup.  These will
 # all drop out when rebasing to GDB 16.
-Patch015: gdb-backport-buildid-related-changes.patch
+Patch014: gdb-backport-buildid-related-changes.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.
-Patch016: gdb-add-rpm-suggestion-script.patch
+Patch015: gdb-add-rpm-suggestion-script.patch
 
 
-Patch017: gdb-catchpoint-re-set.patch
+Patch016: gdb-catchpoint-re-set.patch
 

diff --git a/_gdb.spec.patch.include b/_gdb.spec.patch.include
index 37b4a7a..5df36dd 100644
--- a/_gdb.spec.patch.include
+++ b/_gdb.spec.patch.include
@@ -14,4 +14,3 @@
 %patch -p1 -P014
 %patch -p1 -P015
 %patch -p1 -P016
-%patch -p1 -P017

diff --git a/_patch_order b/_patch_order
index 1858538..2df64cd 100644
--- a/_patch_order
+++ b/_patch_order
@@ -6,7 +6,6 @@ gdb-6.5-gcore-buffer-limit-test.patch
 gdb-6.3-mapping-zero-inode-test.patch
 gdb-6.8-bz466901-backtrace-full-prelinked.patch
 gdb-archer-next-over-throw-cxx-exec.patch
-gdb-test-bt-cfi-without-die.patch
 gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
 gdb-rhbz1149205-catch-syscall-after-fork-test.patch
 gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch

diff --git a/gdb-test-bt-cfi-without-die.patch b/gdb-test-bt-cfi-without-die.patch
deleted file mode 100644
index 6167c14..0000000
--- a/gdb-test-bt-cfi-without-die.patch
+++ /dev/null
@@ -1,214 +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-test-bt-cfi-without-die.patch
-
-;; [delayed-symfile] Test a backtrace regression on CFIs without DIE (BZ 614604).
-;;=fedoratest
-
-http://sourceware.org/ml/archer/2010-q3/msg00028.html
-
-On Wed, 25 Feb 2009 00:14:29 +0100, Jan Kratochvil wrote:
-> commit 6a37c2b9962258ecf9299cc34a650e64a06acaa5
->
-> There was a regression on gdb.base/savedregs.exp.
->
-> quick_addrmap/require_partial_symbols should be used even for the unwind debug
-> info checking as its load has been also delayed by this branch.
-[...]
-> --- a/gdb/dwarf2-frame.c
-> +++ b/gdb/dwarf2-frame.c
-[...]
-> @@ -1499,6 +1500,14 @@ dwarf2_frame_find_fde (CORE_ADDR *pc)
->        struct dwarf2_fde *fde;
->        CORE_ADDR offset;
->
-> +      if (objfile->quick_addrmap)
-> +	{
-> +	  if (!addrmap_find (objfile->quick_addrmap, *pc))
-> +	    continue;
-> +	}
-> +      /* FIXME: Read-in only .debug_frame/.eh_frame without .debug_info?  */
-> +      require_partial_symbols (objfile);
-> +
-
-but this has caused a different regression (as discussed in the confcall).
-
-QUICK_ADDRMAP is built only from .debug_aranges.  But we can have existing
-built .debug_aranges for CUs in OBJFILE but still some CUs do not need to have
-DWARF at all while they can feature CFIs (.eh_frame or .debug_frame).
-It has been described by Daniel Jacobowitz at:
-	Re: [2/4] RFC: check psymtabs_addrmap before reading FDEs
-	http://sourceware.org/ml/gdb-patches/2010-07/msg00012.html
-
-Sorry for this regression by me (in that fix of a different regression).
-
-Fixed it the "slow way" as this branch is now obsoleted by .gdb-index.
-
-No regressions on {x86_64,x86_64-m32,i686}-fedora13-linux-gnu.
-
-Checked-in.
-
-Thanks,
-Jan
-
-eb8df8566acc1ed963e3e9b77c13b9c2c3db03fb
-
-Test CFI is parsed even for range (function) not described by any DIE.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=614028
-
-gdb/
-	* dwarf2-frame.c (dwarf2_frame_find_fde): Remove the
-	OBJFILE->QUICK_ADDRMAP check.  New comment why.
-
-gdb/testsuite/
-	* gdb.base/cfi-without-die.exp, gdb.base/cfi-without-die-main.c,
-	gdb.base/cfi-without-die-caller.c: New files.
-
-diff --git a/gdb/testsuite/gdb.base/cfi-without-die-caller.c b/gdb/testsuite/gdb.base/cfi-without-die-caller.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/cfi-without-die-caller.c
-@@ -0,0 +1,28 @@
-+/* This testcase is part of GDB, the GNU debugger.
-+
-+   Copyright 2005, 2007, 2008, 2009, 2010 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 3 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, see <http://www.gnu.org/licenses/>.  */
-+
-+typedef int (*callback_t) (void);
-+
-+int
-+caller (callback_t callback)
-+{
-+  /* Ensure some frame content to push away the return address.  */
-+  volatile const long one = 1;
-+
-+  /* Modify the return value to prevent any tail-call optimization.  */
-+  return (*callback) () - one;
-+}
-diff --git a/gdb/testsuite/gdb.base/cfi-without-die-main.c b/gdb/testsuite/gdb.base/cfi-without-die-main.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/cfi-without-die-main.c
-@@ -0,0 +1,32 @@
-+/* This testcase is part of GDB, the GNU debugger.
-+
-+   Copyright 2005, 2007, 2008, 2009, 2010 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 3 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, see <http://www.gnu.org/licenses/>.  */
-+
-+typedef int (*callback_t) (void);
-+
-+extern int caller (callback_t callback);
-+
-+int
-+callback (void)
-+{
-+  return 1;
-+}
-+
-+int
-+main (void)
-+{
-+  return caller (callback);
-+}
-diff --git a/gdb/testsuite/gdb.base/cfi-without-die.exp b/gdb/testsuite/gdb.base/cfi-without-die.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/cfi-without-die.exp
-@@ -0,0 +1,71 @@
-+# Copyright 2010 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 3 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, see <http://www.gnu.org/licenses/>.
-+
-+# Test CFI is parsed even for range (function) not described by any DIE.
-+
-+set testfile cfi-without-die
-+set srcmainfile ${testfile}-main.c
-+set srccallerfile ${testfile}-caller.c
-+set executable ${testfile}
-+set objmainfile [standard_output_file ${testfile}-main.o]
-+set objcallerfile [standard_output_file ${testfile}-caller.o]
-+set binfile [standard_output_file ${executable}]
-+
-+if { [gdb_compile "${srcdir}/${subdir}/${srccallerfile}" ${objcallerfile} \
-+      object [list {additional_flags=-fomit-frame-pointer -fno-unwind-tables -fno-asynchronous-unwind-tables}]] != ""
-+     || [gdb_compile "${srcdir}/${subdir}/${srcmainfile}" ${objmainfile} object {debug}] != ""
-+     || [gdb_compile "${objmainfile} ${objcallerfile}" ${binfile} executable {}] != "" } {
-+     untested ${testfile}.exp
-+     return -1
-+}
-+
-+clean_restart $executable
-+
-+if ![runto callback] then {
-+   fail "verify unwinding: Can't run to callback"
-+   return 0
-+}
-+set test "verify unwinding breaks without CFI"
-+gdb_test_multiple "bt" $test {
-+    -re " in \[?\]\[?\] .*\r\n$gdb_prompt $" {
-+	# It may backtrace through some random frames even to main().
-+	pass $test
-+    }
-+    -re " in main .*\r\n$gdb_prompt $" {
-+	fail $test
-+    }
-+    -re "\r\n$gdb_prompt $" {
-+	pass $test
-+    }
-+}
-+
-+if { [gdb_compile "${srcdir}/${subdir}/${srccallerfile}" ${objcallerfile} \
-+      object [list {additional_flags=-fomit-frame-pointer -funwind-tables -fasynchronous-unwind-tables}]] != ""
-+     || [gdb_compile "${srcdir}/${subdir}/${srcmainfile}" ${objmainfile} object {debug}] != ""
-+     || [gdb_compile "${objmainfile} ${objcallerfile}" ${binfile} executable {}] != "" } {
-+     untested ${testfile}.exp
-+     return -1
-+}
-+
-+clean_restart $executable
-+
-+if ![runto callback] then {
-+   fail "test CFI without DIEs: Can't run to callback"
-+   return 0
-+}
-+# #0  callback () at ...
-+# #1  0x00000000004004e9 in caller ()
-+# #2  0x00000000004004cd in main () at ...
-+gdb_test "bt" "#0 +callback \[^\r\n\]+\r\n#1 \[^\r\n\]+ in caller \[^\r\n\]+\r\n#2 \[^\r\n\]+ in main \[^\r\n\]+" "verify unwindin works for CFI without DIEs"

diff --git a/gdb.spec b/gdb.spec
index fae876c..df74b88 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -928,6 +928,11 @@ fi
 # endif scl
 
 %changelog
+* Fri Jan 17 2025
+- remove gdb-test-bt-cfi-without-die.patch.  This test has been
+  accepted upstream and will make its way back to testing with
+  the GDB 17 release.
+
 * Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild