[rpms/gdb] gdb-17.2-rebase-f44: Remove gdb-6.5-bz109921-DW_AT_decl_file-test.patch

[Bruno Larsen <blarsen@redhat.com>]

            A new commit has been pushed.

            Repo   : rpms/gdb
            Branch : gdb-17.2-rebase-f44
            Commit : 231ea6585af3592e0424fca070e514333c00b813
            Author : Bruno Larsen <blarsen@redhat.com>
            Date   : 2023-04-25T14:14:49+02:00
            Stats  : +54/-188 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/gdb/c/231ea6585af3592e0424fca070e514333c00b813?branch=gdb-17.2-rebase-f44

            Log:
            Remove gdb-6.5-bz109921-DW_AT_decl_file-test.patch

This patch only had a test for basic DWARF-2 support, and the test was
already covered by other tests, such as gdb.linespec/linespec.exp

---
diff --git a/_gdb.spec.Patch.include b/_gdb.spec.Patch.include
index 6e0c915..e6595c8 100644
--- a/_gdb.spec.Patch.include
+++ b/_gdb.spec.Patch.include
@@ -23,190 +23,186 @@ Patch005: gdb-6.5-BEA-testsuite.patch
 #=fedoratest
 Patch006: gdb-6.5-bz218379-ppc-solib-trampoline-test.patch
 
-# Find symbols properly at their original (included) file (BZ 109921).
-#=fedoratest
-Patch007: gdb-6.5-bz109921-DW_AT_decl_file-test.patch
-
 # Allow running `/usr/bin/gcore' with provided but inaccessible tty (BZ 229517).
 #=fedoratest
-Patch008: gdb-6.6-bz229517-gcore-without-terminal.patch
+Patch007: gdb-6.6-bz229517-gcore-without-terminal.patch
 
 # Avoid too long timeouts on failing cases of "annota1.exp annota3.exp".
 #=fedoratest
-Patch009: gdb-6.6-testsuite-timeouts.patch
+Patch008: gdb-6.6-testsuite-timeouts.patch
 
 # Support for stepping over PPC atomic instruction sequences (BZ 237572).
 #=fedoratest
-Patch010: gdb-6.6-bz237572-ppc-atomic-sequence-test.patch
+Patch009: gdb-6.6-bz237572-ppc-atomic-sequence-test.patch
 
 # Test kernel VDSO decoding while attaching to an i386 process.
 #=fedoratest
-Patch011: gdb-6.3-attach-see-vdso-test.patch
+Patch010: gdb-6.3-attach-see-vdso-test.patch
 
 # Test leftover zombie process (BZ 243845).
 #=fedoratest
-Patch012: gdb-6.5-bz243845-stale-testing-zombie-test.patch
+Patch011: gdb-6.5-bz243845-stale-testing-zombie-test.patch
 
 # New locating of the matching binaries from the pure core file (build-id).
 #=push+jan
-Patch013: gdb-6.6-buildid-locate.patch
+Patch012: 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
-Patch014: gdb-6.6-buildid-locate-solib-missing-ids.patch
+Patch013: gdb-6.6-buildid-locate-solib-missing-ids.patch
 
 #=push+jan
-Patch015: gdb-6.6-buildid-locate-rpm.patch
+Patch014: 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.
-Patch016: gdb-6.7-charsign-test.patch
+Patch015: gdb-6.7-charsign-test.patch
 
 # Test PPC hiding of call-volatile parameter register.
 #=fedoratest
-Patch017: gdb-6.7-ppc-clobbered-registers-O2-test.patch
+Patch016: gdb-6.7-ppc-clobbered-registers-O2-test.patch
 
 # Testsuite fixes for more stable/comparable results.
 #=fedoratest
-Patch018: gdb-6.7-testsuite-stable-results.patch
+Patch017: gdb-6.7-testsuite-stable-results.patch
 
 # Test ia64 memory leaks of the code using libunwind.
 #=fedoratest
-Patch019: gdb-6.5-ia64-libunwind-leak-test.patch
+Patch018: gdb-6.5-ia64-libunwind-leak-test.patch
 
 # Test hiding unexpected breakpoints on intentional step commands.
 #=fedoratest
-Patch020: gdb-6.5-missed-trap-on-step-test.patch
+Patch019: gdb-6.5-missed-trap-on-step-test.patch
 
 # Test gcore memory and time requirements for large inferiors.
 #=fedoratest
-Patch021: gdb-6.5-gcore-buffer-limit-test.patch
+Patch020: 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.
-Patch022: gdb-6.3-mapping-zero-inode-test.patch
+Patch021: gdb-6.3-mapping-zero-inode-test.patch
 
 # Test a crash on libraries missing the .text section.
 #=fedoratest
-Patch023: gdb-6.5-section-num-fixup-test.patch
+Patch022: gdb-6.5-section-num-fixup-test.patch
 
 # Fix resolving of variables at locations lists in prelinked libs (BZ 466901).
 #=fedoratest
-Patch024: gdb-6.8-bz466901-backtrace-full-prelinked.patch
+Patch023: gdb-6.8-bz466901-backtrace-full-prelinked.patch
 
 # New test for step-resume breakpoint placed in multiple threads at once.
 #=fedoratest
-Patch025: gdb-simultaneous-step-resume-breakpoint-test.patch
+Patch024: 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@.*>
-Patch026: gdb-core-open-vdso-warning.patch
+Patch025: 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.
-Patch027: gdb-ccache-workaround.patch
+Patch026: gdb-ccache-workaround.patch
 
 # Testcase for "Do not make up line information" fix by Daniel Jacobowitz.
 #=fedoratest
-Patch028: gdb-lineno-makeup-test.patch
+Patch027: gdb-lineno-makeup-test.patch
 
 # Test power7 ppc disassembly.
 #=fedoratest
-Patch029: gdb-ppc-power7-test.patch
+Patch028: gdb-ppc-power7-test.patch
 
 # Fix follow-exec for C++ programs (bugreported by Martin Stransky).
 #=fedoratest
-Patch030: gdb-archer-next-over-throw-cxx-exec.patch
+Patch029: gdb-archer-next-over-throw-cxx-exec.patch
 
 # Workaround librpm BZ 643031 due to its unexpected exit() calls (BZ 642879).
 #=push+jan
-Patch031: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
+Patch030: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
 
 # [delayed-symfile] Test a backtrace regression on CFIs without DIE (BZ 614604).
 #=fedoratest
-Patch032: gdb-test-bt-cfi-without-die.patch
+Patch031: gdb-test-bt-cfi-without-die.patch
 
 # Verify GDB Python built-in function gdb.solib_address exists (BZ # 634108).
 #=fedoratest
-Patch033: gdb-bz634108-solib_address.patch
+Patch032: gdb-bz634108-solib_address.patch
 
 # New test gdb.arch/x86_64-pid0-core.exp for kernel PID 0 cores (BZ 611435).
 #=fedoratest
-Patch034: gdb-test-pid0-core.patch
+Patch033: gdb-test-pid0-core.patch
 
 # [archer-tromey-delayed-symfile] New test gdb.dwarf2/dw2-aranges.exp.
 #=fedoratest
-Patch035: gdb-test-dw2-aranges.patch
+Patch034: gdb-test-dw2-aranges.patch
 
 # Workaround PR libc/14166 for inferior calls of strstr.
 #=fedoratest: Compatibility with RHELs (unchecked which ones).
-Patch036: gdb-glibc-strstr-workaround.patch
+Patch035: gdb-glibc-strstr-workaround.patch
 
 # Include testcase for `Unable to see a variable inside a module (XLF)' (BZ 823789).
 #=fedoratest
-Patch037: gdb-rhel5.9-testcase-xlf-var-inside-mod.patch
+Patch036: gdb-rhel5.9-testcase-xlf-var-inside-mod.patch
 
 # Testcase for `Setting solib-absolute-prefix breaks vDSO' (BZ 818343).
 #=fedoratest
-Patch038: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
+Patch037: 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
-Patch039: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
+Patch038: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
 
 # Fix 'memory leak in infpy_read_memory()' (RH BZ 1007614)
 #=fedoratest
-Patch040: gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
+Patch039: 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
-Patch041: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
+Patch040: 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
-Patch042: gdb-rhbz1156192-recursive-dlopen-test.patch
+Patch041: gdb-rhbz1156192-recursive-dlopen-test.patch
 
 # Fix '`catch syscall' doesn't work for parent after `fork' is called'
 # (Philippe Waroquiers, RH BZ 1149205).
 #=fedoratest
-Patch043: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
+Patch042: 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
-Patch044: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
+Patch043: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
 
 # Fix '[ppc64] and [s390x] wrong prologue skip on -O2 -g code' (Jan
 # Kratochvil, RH BZ 1084404).
 #=fedoratest
-Patch045: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
+Patch044: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
 
 # Force libncursesw over libncurses to match the includes (RH BZ 1270534).
 #=push+jan
-Patch046: gdb-fedora-libncursesw.patch
+Patch045: gdb-fedora-libncursesw.patch
 
 # Test clflushopt instruction decode (for RH BZ 1262471).
 #=fedoratest
-Patch047: gdb-opcodes-clflushopt-test.patch
+Patch046: gdb-opcodes-clflushopt-test.patch
 
 # [aarch64] Fix hardware watchpoints (RH BZ 1261564).
 #=fedoratest
-Patch048: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
+Patch047: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
 
 # Add messages suggesting more recent RHEL gdbserver (RH BZ 1321114).
 #=fedora
-Patch049: gdb-container-rh-pkg.patch
+Patch048: gdb-container-rh-pkg.patch
 
 # [dts+el7] [x86*] Bundle linux_perf.h for libipt (RH BZ 1256513).
 #=fedora
-Patch050: gdb-linux_perf-bundle.patch
+Patch049: gdb-linux_perf-bundle.patch
 
 # Fix gdb-headless /usr/bin/ executables (BZ 1390251).
 #
@@ -215,20 +211,20 @@ Patch050: gdb-linux_perf-bundle.patch
 #
 #   https://fedoraproject.org/wiki/Changes/Minimal_GDB_in_buildroot
 #=fedora
-Patch051: gdb-libexec-add-index.patch
+Patch050: gdb-libexec-add-index.patch
 
 # [s390x] Backport arch12 instructions decoding (RH BZ 1553104).
 # =fedoratest
-Patch052: gdb-rhbz1553104-s390x-arch12-test.patch
+Patch051: gdb-rhbz1553104-s390x-arch12-test.patch
 
 # [aarch64] Backport fix from Luis Machado for RH BZ 2177655.
-Patch053: gdb-rhbz2177655-aarch64-pauth-valid-regcache.patch
+Patch052: gdb-rhbz2177655-aarch64-pauth-valid-regcache.patch
 
 # Backport "Fix crash in inside_main_func"
 # (Tom Tromey, RHBZ 2183595)
-Patch054: gdb-rhbz2183595-rustc-inside_main.patch
+Patch053: gdb-rhbz2183595-rustc-inside_main.patch
 
 # Backport "Fix a potential illegal memory access in the BFD library..."
 # (Nick Clifton, binutils/29988)
-Patch055: gdb-binutils29988-read_indexed_address.patch
+Patch054: gdb-binutils29988-read_indexed_address.patch
 

diff --git a/_gdb.spec.patch.include b/_gdb.spec.patch.include
index b72c412..c9558ed 100644
--- a/_gdb.spec.patch.include
+++ b/_gdb.spec.patch.include
@@ -52,4 +52,3 @@
 %patch -p1 -P052
 %patch -p1 -P053
 %patch -p1 -P054
-%patch -p1 -P055

diff --git a/_patch_order b/_patch_order
index 222c6fa..779e82a 100644
--- a/_patch_order
+++ b/_patch_order
@@ -4,7 +4,6 @@ gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
 gdb-6.5-sharedlibrary-path.patch
 gdb-6.5-BEA-testsuite.patch
 gdb-6.5-bz218379-ppc-solib-trampoline-test.patch
-gdb-6.5-bz109921-DW_AT_decl_file-test.patch
 gdb-6.6-bz229517-gcore-without-terminal.patch
 gdb-6.6-testsuite-timeouts.patch
 gdb-6.6-bz237572-ppc-atomic-sequence-test.patch

diff --git a/gdb-6.5-bz109921-DW_AT_decl_file-test.patch b/gdb-6.5-bz109921-DW_AT_decl_file-test.patch
deleted file mode 100644
index 8d03e3f..0000000
--- a/gdb-6.5-bz109921-DW_AT_decl_file-test.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Jan Kratochvil <jan.kratochvil@redhat.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-6.5-bz109921-DW_AT_decl_file-test.patch
-
-;; Find symbols properly at their original (included) file (BZ 109921).
-;;=fedoratest
-
-https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=109921
-
-It is duplicite to its upstream variant:
-http://sourceware.org/ml/gdb-cvs/2007-01/msg00157.html
-http://sourceware.org/ml/gdb-patches/2007-01/msg00434.html
-2007-01-21  Jan Kratochvil  <jan.kratochvil@redhat.com>
-	    Daniel Jacobowitz  <dan@codesourcery.com>
-
-	* gdb.base/included.c, gdb.base/included.exp,
-	gdb.base/included.h: New files.
-
-------------------------------------------------------------------------------
-
-2007-01-09  Jan Kratochvil  <jan.kratochvil@redhat.com>
-
-	* gdb.dwarf2/dw2-included.exp, gdb.dwarf2/dw2-included.c,
-	gdb.dwarf2/dw2-included.h: New files.
-
-diff --git a/gdb/testsuite/gdb.dwarf2/dw2-included.c b/gdb/testsuite/gdb.dwarf2/dw2-included.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.dwarf2/dw2-included.c
-@@ -0,0 +1,26 @@
-+/* 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.  */
-+
-+#include "dw2-included.h"
-+
-+int
-+main()
-+{
-+  return 0;
-+}
-diff --git a/gdb/testsuite/gdb.dwarf2/dw2-included.exp b/gdb/testsuite/gdb.dwarf2/dw2-included.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.dwarf2/dw2-included.exp
-@@ -0,0 +1,47 @@
-+# 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.
-+
-+# Minimal DWARF-2 unit test
-+
-+# This test can only be run on targets which support DWARF-2.
-+# For now pick a sampling of likely targets.
-+if {![istarget *-*-linux*]
-+    && ![istarget *-*-gnu*]
-+    && ![istarget *-*-elf*]
-+    && ![istarget *-*-openbsd*]
-+    && ![istarget arm-*-eabi*]
-+    && ![istarget powerpc-*-eabi*]} {
-+    return 0
-+}
-+
-+set testfile "dw2-included"
-+set srcfile ${testfile}.c
-+set binfile [standard_output_file ${testfile}]
-+
-+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-+    return -1
-+}
-+
-+gdb_exit
-+gdb_start
-+gdb_reinitialize_dir $srcdir/$subdir
-+gdb_load ${binfile}
-+
-+gdb_test "set listsize 1" ""
-+gdb_test "list integer" "int integer;\r"
-+gdb_test "ptype integer" "type = int\r"
-+# Path varies depending on the build location.
-+gdb_test "info variables integer" "\r\nFile \[^\r\n\]*/gdb.dwarf2/dw2-included.h:\r\n${decimal}:.*int integer;\r"
-diff --git a/gdb/testsuite/gdb.dwarf2/dw2-included.h b/gdb/testsuite/gdb.dwarf2/dw2-included.h
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.dwarf2/dw2-included.h
-@@ -0,0 +1,20 @@
-+/* 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.  */
-+
-+int integer;

diff --git a/gdb.spec b/gdb.spec
index eb3b904..26cb424 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -1249,6 +1249,12 @@ fi
 %endif
 
 %changelog
+* Tue Apr 25 2023 Bruno Larsen <blarsen@redhat.com>
+- Remove gdb-6.5-bz109921-DW_AT_decl_file-test.patch. That patch was
+  only a test for basic DWARF-2 support, ensuring that GDB found a
+  variable in a .h file; tests such as gdb.linespec/linespec.exp already
+  tests for it.
+
 * Mon Apr 24 2023 Bruno Larsen <blarsen@redhat.com>
 - Remove gdb-6.5-last-address-space-byte-test.patch. It was used to
   test for a regression in target_xfer_memory, a function that has