[rpms/gdb] gdb-17.2-rebase-f44: Remove gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch

[rpms/gdb] gdb-17.2-rebase-f44: Remove gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch

[Guinevere Larsen]

            A new commit has been pushed.

            Repo   : rpms/gdb
            Branch : gdb-17.2-rebase-f44
            Commit : 87ade3a0003ff6a560e953762870025febdf6e99
            Author : Guinevere Larsen <blarsen@redhat.com>
            Date   : 2023-10-11T16:25:55+02:00
            Stats  : +19/-158 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/gdb/c/87ade3a0003ff6a560e953762870025febdf6e99?branch=gdb-17.2-rebase-f44

            Log:
            Remove gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch

The test was upstreamed back in 2010, but the final file has a different
name, so this was never removed:
https://sourceware.org/legacy-ml/gdb-patches/2010-06/msg00046.html

---
diff --git a/_gdb.spec.Patch.include b/_gdb.spec.Patch.include
index 228a68c..db63def 100644
--- a/_gdb.spec.Patch.include
+++ b/_gdb.spec.Patch.include
@@ -140,32 +140,26 @@ Patch033: gdb-rhbz1156192-recursive-dlopen-test.patch
 #=fedoratest
 Patch034: 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
-Patch035: 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
-Patch036: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
+Patch035: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
 
 # Force libncursesw over libncurses to match the includes (RH BZ 1270534).
 #=push+jan
-Patch037: gdb-fedora-libncursesw.patch
+Patch036: gdb-fedora-libncursesw.patch
 
 # [aarch64] Fix hardware watchpoints (RH BZ 1261564).
 #=fedoratest
-Patch038: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
+Patch037: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
 
 # Add messages suggesting more recent RHEL gdbserver (RH BZ 1321114).
 #=fedora
-Patch039: gdb-container-rh-pkg.patch
+Patch038: gdb-container-rh-pkg.patch
 
 # [dts+el7] [x86*] Bundle linux_perf.h for libipt (RH BZ 1256513).
 #=fedora
-Patch040: gdb-linux_perf-bundle.patch
+Patch039: gdb-linux_perf-bundle.patch
 
 # Update gdb-add-index.sh such that, when the GDB environment
 # variable is not set, the script is smarter than just looking for
@@ -179,41 +173,41 @@ Patch040: gdb-linux_perf-bundle.patch
 #   https://fedoraproject.org/wiki/Changes/Minimal_GDB_in_buildroot
 #
 #=fedora
-Patch041: gdb-add-index.patch
+Patch040: gdb-add-index.patch
 
 # Backport "Fix a potential illegal memory access in the BFD library..."
 # (Nick Clifton, binutils/29988)
-Patch042: gdb-binutils29988-read_indexed_address.patch
+Patch041: gdb-binutils29988-read_indexed_address.patch
 
 # Backport upstream patch fixing a "dangling pointer" build problem
 # first seen when building with GCC 13.1.1 20230426 (Red Hat ;; 13.1.1-1).
-Patch043: gdb-rhbz2192105-ftbs-dangling-pointer
+Patch042: gdb-rhbz2192105-ftbs-dangling-pointer
 
 # Backport two commits, 0ad504dd464 and ea70f941f9b, from Lancelot SIX
 # which prevent repeated warnings from being printed while loading a
 # core file. (RH BZ 2160211)
-Patch044: gdb-rhbz2160211-excessive-core-file-warnings.patch
+Patch043: gdb-rhbz2160211-excessive-core-file-warnings.patch
 
 # Backport upstream commit f3eee5861743d635 to fix a crash triggered
 # when debuginfod makes use of particular openssl settings.
-Patch045: gdb-bz2196395-debuginfod-legacy-openssl-crash.patch
+Patch044: gdb-bz2196395-debuginfod-legacy-openssl-crash.patch
 
 # Backport upstream commit f96328accde1e63 to fix a potential double
 # free issue in the debuginfod code.
-Patch046: gdb-bz2237515-debuginfod-double-free.patch
+Patch045: gdb-bz2237515-debuginfod-double-free.patch
 
 # Backport upstream commit 54392c4df604f20 to fix an incorrect
 # obstack allocation that wold lead to memory corruption.
-Patch047: gdb-bz2237392-dwarf-obstack-allocation.patch
+Patch046: gdb-bz2237392-dwarf-obstack-allocation.patch
 
 # Backport PR29922, SHT_NOBITS section
 # avoids section size sanity check.
-Patch048: gdb-rhbz2233961-CVE-2022-4806.patch
+Patch047: gdb-rhbz2233961-CVE-2022-4806.patch
 
 # Backport PR29925, Memory leak in find_abstract_instance
-Patch049: gdb-rhbz2233965-memory-leak.patch
+Patch048: gdb-rhbz2233965-memory-leak.patch
 
 # Backport upstream patch which prevents internal error when
 # generating a gdb-index file (RH BZ 1773651).
-Patch050: gdb-rhbz1773651-gdb-index-internal-error.patch
+Patch049: gdb-rhbz1773651-gdb-index-internal-error.patch
 

diff --git a/_gdb.spec.patch.include b/_gdb.spec.patch.include
index f84adba..2ca0c1f 100644
--- a/_gdb.spec.patch.include
+++ b/_gdb.spec.patch.include
@@ -47,4 +47,3 @@
 %patch -p1 -P047
 %patch -p1 -P048
 %patch -p1 -P049
-%patch -p1 -P050

diff --git a/_patch_order b/_patch_order
index 2b52649..3cdd236 100644
--- a/_patch_order
+++ b/_patch_order
@@ -32,7 +32,6 @@ gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
 gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
 gdb-rhbz1156192-recursive-dlopen-test.patch
 gdb-rhbz1149205-catch-syscall-after-fork-test.patch
-gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
 gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
 gdb-fedora-libncursesw.patch
 gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch

diff --git a/gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch b/gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
deleted file mode 100644
index 21a1a08..0000000
--- a/gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
+++ /dev/null
@@ -1,135 +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-rhbz1186476-internal-error-unqualified-name-re-set-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
-
-Comments from Sergio Durigan Junior:
-
-  The "proper" fix for this whole problem would be to backport the
-  "ambiguous linespec" patch series.  However, it is really not
-  recommended to do that for RHEL GDB, because the patch series is too
-  big and could introduce unwanted regressions.  Instead, what we
-  chose to do was to replace the gdb_assert call by a warning (which
-  allows the user to continue the debugging session), and tell the
-  user that, although more than one location was found for his/her
-  breakpoint, only one will be used.
-
-diff --git a/gdb/testsuite/gdb.cp/gdb-rhbz1186476-internal-error-unqualified-name-re-set-main.cc b/gdb/testsuite/gdb.cp/gdb-rhbz1186476-internal-error-unqualified-name-re-set-main.cc
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.cp/gdb-rhbz1186476-internal-error-unqualified-name-re-set-main.cc
-@@ -0,0 +1,22 @@
-+/* This testcase is part of GDB, the GNU debugger.
-+
-+   Copyright 2015 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/>.  */
-+
-+int
-+main (int argc, char *argv[])
-+{
-+  return 0;
-+}
-diff --git a/gdb/testsuite/gdb.cp/gdb-rhbz1186476-internal-error-unqualified-name-re-set.cc b/gdb/testsuite/gdb.cp/gdb-rhbz1186476-internal-error-unqualified-name-re-set.cc
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.cp/gdb-rhbz1186476-internal-error-unqualified-name-re-set.cc
-@@ -0,0 +1,26 @@
-+/* This testcase is part of GDB, the GNU debugger.
-+
-+   Copyright 2015 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/>.  */
-+
-+class C
-+  {
-+    public:
-+      C () {}
-+      C (int x) {}
-+  };
-+
-+C a;
-+C b (1);
-diff --git a/gdb/testsuite/gdb.cp/gdb-rhbz1186476-internal-error-unqualified-name-re-set.exp b/gdb/testsuite/gdb.cp/gdb-rhbz1186476-internal-error-unqualified-name-re-set.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.cp/gdb-rhbz1186476-internal-error-unqualified-name-re-set.exp
-@@ -0,0 +1,51 @@
-+# Copyright 2015 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/>.
-+
-+if { [skip_cplus_tests] } { continue }
-+if { [skip_shlib_tests] } { continue }
-+if { [is_remote target] } { continue }
-+if { [target_info exists use_gdb_stub] } { continue }
-+
-+set testfile gdb-rhbz1186476-internal-error-unqualified-name-re-set-main
-+set srcfile $testfile.cc
-+set executable $testfile
-+set binfile [standard_output_file $executable]
-+
-+set libtestfile gdb-rhbz1186476-internal-error-unqualified-name-re-set
-+set libsrcfile $libtestfile.cc
-+set sofile [standard_output_file lib$libtestfile.so]
-+
-+# Create and source the file that provides information about the compiler
-+# used to compile the test case.
-+if [get_compiler_info "c++"] {
-+    return -1
-+}
-+
-+if { [gdb_compile_shlib $srcdir/$subdir/$libsrcfile $sofile {debug c++ "additional_flags=-fPIC"}] != ""
-+     || [gdb_compile $srcdir/$subdir/$srcfile $binfile executable [list additional_flags=-Wl,-rpath,[file dirname ${sofile}] "c++" shlib=${sofile} ]] != ""} {
-+    untested $libtestfile.exp
-+    return -1
-+}
-+
-+clean_restart $executable
-+
-+gdb_test_no_output "set breakpoint pending on"
-+# gdb_breakpoint would print a failure because of some warning messages
-+gdb_test "break C::C" "Breakpoint $decimal \\(C::C\\) pending."
-+
-+#gdb_test "run" "warning: Found more than one location for breakpoint #$decimal; only the first location will be used.(\r\n)+Breakpoint $decimal, C::C.*"
-+gdb_test "run"
-+
-+gdb_test "info break" " in C::C\\(\\) at .* in C::C\\(int\\) at .*"

diff --git a/gdb.spec b/gdb.spec
index 3602def..72c50f4 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -1252,6 +1252,10 @@ fi
 %endif
 
 %changelog
+* Wed Oct 11 2022 Guinevere Larsen <blarsen@redhat.com>
+- Remove gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
+  as it was upstreamed back in 2010 with a different test name.
+
 * Mon Oct 2 2023 Kevin Buettner <kevinb@redhat.com> - 13.2-11
 - Backport upstream commit which prevents internal error when
   generating an overly large gdb-index file.  (RHBZ 1773651, Kevin