[rpms/gdb] gdb-17.2-rebase-f44: Remove several unnecessary test patches

[Keith Seitz <keiths@redhat.com>]

            A new commit has been pushed.

            Repo   : rpms/gdb
            Branch : gdb-17.2-rebase-f44
            Commit : 7e69ec9711e6cb2b66a984b8234e43b1f27d69b7
            Author : Keith Seitz <keiths@redhat.com>
            Date   : 2022-12-05T14:51:32-08:00
            Stats  : +31/-654 in 8 file(s)
            URL    : https://src.fedoraproject.org/rpms/gdb/c/7e69ec9711e6cb2b66a984b8234e43b1f27d69b7?branch=gdb-17.2-rebase-f44

            Log:
            Remove several unnecessary test patches

- gdb-physname-pr11734-test.patch
- gdb-physname-pr12273-test.patch
These two tests were merged upstream under a different file name.

- gdb-runtest-pie-override.patch
This patch appears unnecessary today. I have tested on all supported
host architectures and detected no regressions. I presume this was
fixed in a different manner through the years.

- gdb-test-expr-cumulative-archer.patch
The patch contains two tests. Both are upstream already.
While one is a little more involved than what landed upstream,
both tests are equivalent. The other test, gdb.cp/namespace-no-imports.exp,
is identical to upstream's gdb.cp/nsnoimports.exp with whitespace
and other trivial changes.

---
diff --git a/_gdb.spec.Patch.include b/_gdb.spec.Patch.include
index 03b4a63..c9cc0fc 100644
--- a/_gdb.spec.Patch.include
+++ b/_gdb.spec.Patch.include
@@ -174,104 +174,88 @@ Patch042: gdb-test-pid0-core.patch
 #=fedoratest
 Patch043: gdb-test-dw2-aranges.patch
 
-# [archer-keiths-expr-cumulative+upstream] Import C++ testcases.
-#=fedoratest
-Patch044: gdb-test-expr-cumulative-archer.patch
-
-# Fix regressions on C++ names resolving (PR 11734, PR 12273, Keith Seitz).
-#=fedoratest
-Patch045: gdb-physname-pr11734-test.patch
-
-# Fix regressions on C++ names resolving (PR 11734, PR 12273, Keith Seitz).
-#=fedoratest
-Patch046: gdb-physname-pr12273-test.patch
-
 # Test GDB opcodes/ disassembly of Intel Ivy Bridge instructions (BZ 696890).
 #=fedoratest
-Patch047: gdb-test-ivy-bridge.patch
-
-# Hack for proper PIE run of the testsuite.
-#=fedoratest
-Patch048: gdb-runtest-pie-override.patch
+Patch044: gdb-test-ivy-bridge.patch
 
 # Workaround PR libc/14166 for inferior calls of strstr.
 #=fedoratest: Compatibility with RHELs (unchecked which ones).
-Patch049: gdb-glibc-strstr-workaround.patch
+Patch045: gdb-glibc-strstr-workaround.patch
 
 # Include testcase for `Unable to see a variable inside a module (XLF)' (BZ 823789).
 #=fedoratest
-Patch050: gdb-rhel5.9-testcase-xlf-var-inside-mod.patch
+Patch046: gdb-rhel5.9-testcase-xlf-var-inside-mod.patch
 
 # Testcase for `Setting solib-absolute-prefix breaks vDSO' (BZ 818343).
 #=fedoratest
-Patch051: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
+Patch047: 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
-Patch052: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
+Patch048: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
 
 # Fix 'memory leak in infpy_read_memory()' (RH BZ 1007614)
 #=fedoratest
-Patch053: gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
+Patch049: 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
-Patch054: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
+Patch050: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
 
 # Display Fortran strings in backtraces.
 #=fedoratest
-Patch055: gdb-fortran-frame-string.patch
+Patch051: gdb-fortran-frame-string.patch
 
 # Testcase for '[SAP] Recursive dlopen causes SAP HANA installer to
 # crash.' (RH BZ 1156192).
 #=fedoratest
-Patch056: gdb-rhbz1156192-recursive-dlopen-test.patch
+Patch052: gdb-rhbz1156192-recursive-dlopen-test.patch
 
 # Fix '`catch syscall' doesn't work for parent after `fork' is called'
 # (Philippe Waroquiers, RH BZ 1149205).
 #=fedoratest
-Patch057: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
+Patch053: 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
-Patch058: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
+Patch054: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
 
 # Test 'info type-printers' Python error (RH BZ 1350436).
 #=fedoratest
-Patch059: gdb-rhbz1350436-type-printers-error.patch
+Patch055: gdb-rhbz1350436-type-printers-error.patch
 
 # Fix '[ppc64] and [s390x] wrong prologue skip on -O2 -g code' (Jan
 # Kratochvil, RH BZ 1084404).
 #=fedoratest
-Patch060: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
+Patch056: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
 
 # Force libncursesw over libncurses to match the includes (RH BZ 1270534).
 #=push+jan
-Patch061: gdb-fedora-libncursesw.patch
+Patch057: gdb-fedora-libncursesw.patch
 
 # Test clflushopt instruction decode (for RH BZ 1262471).
 #=fedoratest
-Patch062: gdb-opcodes-clflushopt-test.patch
+Patch058: gdb-opcodes-clflushopt-test.patch
 
 # [SCL] Skip deprecated .gdb_index warning for Red Hat built files (BZ 953585).
 #=push+jan
-Patch063: gdb-6.6-buildid-locate-rpm-scl.patch
+Patch059: gdb-6.6-buildid-locate-rpm-scl.patch
 
 # [aarch64] Fix hardware watchpoints (RH BZ 1261564).
 #=fedoratest
-Patch064: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
+Patch060: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
 
 # Add messages suggesting more recent RHEL gdbserver (RH BZ 1321114).
 #=fedora
-Patch065: gdb-container-rh-pkg.patch
+Patch061: gdb-container-rh-pkg.patch
 
 # [dts+el7] [x86*] Bundle linux_perf.h for libipt (RH BZ 1256513).
 #=fedora
-Patch066: gdb-linux_perf-bundle.patch
+Patch062: gdb-linux_perf-bundle.patch
 
 # Fix gdb-headless /usr/bin/ executables (BZ 1390251).
 #
@@ -280,28 +264,28 @@ Patch066: gdb-linux_perf-bundle.patch
 #
 #   https://fedoraproject.org/wiki/Changes/Minimal_GDB_in_buildroot
 #=fedora
-Patch067: gdb-libexec-add-index.patch
+Patch063: gdb-libexec-add-index.patch
 
 # New testcase for: Fix <tab>-completion crash (Gary Benson, RH BZ 1398387).
 #=fedoratest
-Patch068: gdb-rhbz1398387-tab-crash-test.patch
+Patch064: gdb-rhbz1398387-tab-crash-test.patch
 
 # [s390x] Backport arch12 instructions decoding (RH BZ 1553104).
 # =fedoratest
-Patch069: gdb-rhbz1553104-s390x-arch12-test.patch
+Patch065: gdb-rhbz1553104-s390x-arch12-test.patch
 
 
-Patch070: gdb-backport-readline_support.patch
+Patch066: gdb-backport-readline_support.patch
 
 # [gdb/testsuite] Use prototype to call libc functions
 # (Tom de Vries)
-Patch071: gdb-backport-fix-break-main-file-remove-fail.patch
+Patch067: gdb-backport-fix-break-main-file-remove-fail.patch
 
 # Constify target_desc to fix PPC ODR violations.
 # (Keith Seitz, build/22395)
-Patch072: gdb-sw22395-constify-target_desc.patch
+Patch068: gdb-sw22395-constify-target_desc.patch
 
 # libiberty: Fix C89-isms in configure tests
 # (Florian Weimer, RHBZ 2143992)
-Patch073: gdb-rhbz2143992-libiberty-fix-c89isms-in-configure.patch
+Patch069: gdb-rhbz2143992-libiberty-fix-c89isms-in-configure.patch
 

diff --git a/_gdb.spec.patch.include b/_gdb.spec.patch.include
index 9601239..4ef8e6c 100644
--- a/_gdb.spec.patch.include
+++ b/_gdb.spec.patch.include
@@ -67,7 +67,3 @@
 %patch067 -p1
 %patch068 -p1
 %patch069 -p1
-%patch070 -p1
-%patch071 -p1
-%patch072 -p1
-%patch073 -p1

diff --git a/_patch_order b/_patch_order
index 2a8c121..25b8f1e 100644
--- a/_patch_order
+++ b/_patch_order
@@ -41,11 +41,7 @@ gdb-test-bt-cfi-without-die.patch
 gdb-bz634108-solib_address.patch
 gdb-test-pid0-core.patch
 gdb-test-dw2-aranges.patch
-gdb-test-expr-cumulative-archer.patch
-gdb-physname-pr11734-test.patch
-gdb-physname-pr12273-test.patch
 gdb-test-ivy-bridge.patch
-gdb-runtest-pie-override.patch
 gdb-glibc-strstr-workaround.patch
 gdb-rhel5.9-testcase-xlf-var-inside-mod.patch
 gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch

diff --git a/gdb-physname-pr11734-test.patch b/gdb-physname-pr11734-test.patch
deleted file mode 100644
index 835e18c..0000000
--- a/gdb-physname-pr11734-test.patch
+++ /dev/null
@@ -1,229 +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-physname-pr11734-test.patch
-
-;; Fix regressions on C++ names resolving (PR 11734, PR 12273, Keith Seitz).
-;;=fedoratest
-
-http://sourceware.org/ml/gdb-patches/2010-12/msg00263.html
-
-diff --git a/gdb/testsuite/gdb.cp/pr11734-1.cc b/gdb/testsuite/gdb.cp/pr11734-1.cc
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.cp/pr11734-1.cc
-@@ -0,0 +1,29 @@
-+/* This testcase is part of GDB, the GNU debugger.
-+
-+   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/>.
-+
-+   Please email any bugs, comments, and/or additions to this file to:
-+   bug-gdb@gnu.org  */
-+
-+#include "pr11734.h"
-+
-+int
-+main ()
-+{
-+  pr11734 *p = new pr11734;
-+  p->foo ();
-+  return 0;
-+}
-diff --git a/gdb/testsuite/gdb.cp/pr11734-2.cc b/gdb/testsuite/gdb.cp/pr11734-2.cc
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.cp/pr11734-2.cc
-@@ -0,0 +1,26 @@
-+/* This testcase is part of GDB, the GNU debugger.
-+
-+   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/>.
-+
-+   Please email any bugs, comments, and/or additions to this file to:
-+   bug-gdb@gnu.org  */
-+
-+#include "pr11734.h"
-+
-+void
-+pr11734::foo(void)
-+{
-+}
-diff --git a/gdb/testsuite/gdb.cp/pr11734-3.cc b/gdb/testsuite/gdb.cp/pr11734-3.cc
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.cp/pr11734-3.cc
-@@ -0,0 +1,26 @@
-+/* This testcase is part of GDB, the GNU debugger.
-+
-+   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/>.
-+
-+   Please email any bugs, comments, and/or additions to this file to:
-+   bug-gdb@gnu.org  */
-+
-+#include "pr11734.h"
-+
-+void
-+pr11734::foo (int a)
-+{
-+}
-diff --git a/gdb/testsuite/gdb.cp/pr11734-4.cc b/gdb/testsuite/gdb.cp/pr11734-4.cc
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.cp/pr11734-4.cc
-@@ -0,0 +1,26 @@
-+/* This testcase is part of GDB, the GNU debugger.
-+
-+   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/>.
-+
-+   Please email any bugs, comments, and/or additions to this file to:
-+   bug-gdb@gnu.org  */
-+
-+#include "pr11734.h"
-+
-+void
-+pr11734::foo (char *a)
-+{
-+}
-diff --git a/gdb/testsuite/gdb.cp/pr11734.exp b/gdb/testsuite/gdb.cp/pr11734.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.cp/pr11734.exp
-@@ -0,0 +1,55 @@
-+# Copyright 2010 Free Software Foundation, Inc.
-+#
-+# Contributed by Red Hat, originally written by Keith Seitz.
-+#
-+# 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/>.
-+
-+# This file is part of the gdb testsuite.
-+
-+if { [skip_cplus_tests] } { continue }
-+
-+set testfile "pr11734"
-+set class $testfile
-+
-+set srcfiles {}
-+for {set i 1} {$i < 5} {incr i} {
-+    lappend srcfiles $testfile-$i.cc
-+}
-+
-+prepare_for_testing pr11734 $testfile $srcfiles {c++ debug}
-+
-+if {![runto_main]} {
-+    perror "couldn't run to breakpoint"
-+    continue
-+}
-+
-+# An array holding the overload types for the method pr11734::foo.  The
-+# first element is the overloaded method parameter.  The second element
-+# is the expected source file number, e.g. "pr11734-?.cc".
-+array set tests {
-+    "char*"  4
-+    "int"    3
-+    ""       2
-+}
-+
-+# Test each overload instance twice: once quoted, once unquoted
-+foreach ovld [array names tests] {
-+    set method "${class}::foo\($ovld\)"
-+    set result "Breakpoint (\[0-9\]).*file .*/$class-$tests($ovld).*"
-+    gdb_test "break $method" $result
-+    gdb_test "break '$method'" $result
-+}
-+
-+gdb_exit
-+return 0
-diff --git a/gdb/testsuite/gdb.cp/pr11734.h b/gdb/testsuite/gdb.cp/pr11734.h
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.cp/pr11734.h
-@@ -0,0 +1,27 @@
-+/* This testcase is part of GDB, the GNU debugger.
-+
-+   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/>.
-+
-+   Please email any bugs, comments, and/or additions to this file to:
-+   bug-gdb@gnu.org  */
-+
-+class pr11734
-+{
-+ public:
-+  void foo ();
-+  void foo (int);
-+  void foo (char *);
-+};

diff --git a/gdb-physname-pr12273-test.patch b/gdb-physname-pr12273-test.patch
deleted file mode 100644
index 6c943ad..0000000
--- a/gdb-physname-pr12273-test.patch
+++ /dev/null
@@ -1,103 +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-physname-pr12273-test.patch
-
-;; Fix regressions on C++ names resolving (PR 11734, PR 12273, Keith Seitz).
-;;=fedoratest
-
-http://sourceware.org/ml/gdb-patches/2010-12/msg00264.html
-
-diff --git a/gdb/testsuite/gdb.cp/pr12273.cc b/gdb/testsuite/gdb.cp/pr12273.cc
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.cp/pr12273.cc
-@@ -0,0 +1,37 @@
-+/* This test case is part of GDB, the GNU debugger.
-+
-+   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/>.  */
-+
-+template <typename T>
-+class GDB
-+{
-+ public:
-+   static int simple (void) { return 0; }
-+   static int harder (T a) { return 1; }
-+   template <typename X>
-+   static X even_harder (T a) { return static_cast<X> (a); }
-+   int operator == (GDB const& other)
-+   { return 1; }
-+};
-+
-+int main(int argc, char **argv)
-+{
-+   GDB<int> a, b;
-+   if (a == b)
-+     return GDB<char>::harder('a') + GDB<int>::harder(3)
-+	+ GDB<char>::even_harder<int> ('a');
-+   return GDB<int>::simple ();
-+}
-diff --git a/gdb/testsuite/gdb.cp/pr12273.exp b/gdb/testsuite/gdb.cp/pr12273.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.cp/pr12273.exp
-@@ -0,0 +1,46 @@
-+# Copyright 2010 Free Software Foundation, Inc.
-+#
-+# Contributed by Red Hat, originally written by Keith Seitz.
-+#
-+# 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/>.
-+
-+# This file is part of the gdb testsuite.
-+
-+if {[skip_cplus_tests]} { continue }
-+
-+set testfile "pr12273"
-+# Do NOT compile with debug flag.
-+prepare_for_testing pr12273 $testfile $testfile.cc {c++}
-+
-+gdb_test_no_output "set language c++"
-+
-+# A list of minimal symbol names to check.
-+# Note that GDB<char>::even_harder<int>(char) is quoted and includes
-+# the return type.  This is necessary because this is the demangled name
-+# of the minimal symbol.
-+set min_syms [list \
-+		  "GDB<int>::operator ==" \
-+		  "GDB<int>::operator==(GDB<int> const&)" \
-+		  "GDB<char>::harder(char)" \
-+		  "GDB<int>::harder(int)" \
-+		  {"int GDB<char>::even_harder<int>(char)"} \
-+		  "GDB<int>::simple()"]
-+
-+foreach sym $min_syms {
-+    if {[gdb_breakpoint $sym]} {
-+	pass "setting breakpoint at $sym"
-+    }
-+}
-+
-+gdb_exit

diff --git a/gdb-runtest-pie-override.patch b/gdb-runtest-pie-override.patch
deleted file mode 100644
index 25c2bb8..0000000
--- a/gdb-runtest-pie-override.patch
+++ /dev/null
@@ -1,49 +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-runtest-pie-override.patch
-
-;; Hack for proper PIE run of the testsuite.
-;;=fedoratest
-
-make check//unix/-fPIE/-pie RUNTESTFLAGS=solib-display.exp
-
-gcc -fpic -c  -fPIE -pie -o x.o x.c
-/usr/lib/gcc/x86_64-redhat-linux/4.6.1/../../../../lib64/Scrt1.o: In function `_start':
-(.text+0x20): undefined reference to `main'
-
-=> Change the order for overrides.
-
-One has to also use -fPIC rather than -fPIE, -fPIC is stronger.
-
-The correct way would be:
-make check//unix RUNTESTFLAGS='CC_FOR_TARGET=gcc\ -fPIC\ -pie CXX_FOR_TARGET=g++\ -fPIC\ -pie solib-display.exp'
-
-But there is a problem with testsuite.unix non-unique subdir name and also
-a problem with make -j parallelization of the testsuite.
-
-diff --git a/gdb/testsuite/lib/future.exp b/gdb/testsuite/lib/future.exp
---- a/gdb/testsuite/lib/future.exp
-+++ b/gdb/testsuite/lib/future.exp
-@@ -197,6 +197,10 @@ proc gdb_default_target_compile_1 {source destfile type options} {
-     set ldflags ""
-     set dest [target_info name]
- 
-+    if {[board_info $dest exists multilib_flags]} {
-+	append add_flags " [board_info $dest multilib_flags]"
-+    }
-+
-     if {[info exists CFLAGS_FOR_TARGET]} {
- 	append add_flags " $CFLAGS_FOR_TARGET"
-     }
-@@ -531,10 +535,6 @@ proc gdb_default_target_compile_1 {source destfile type options} {
- 	}
-     }
- 
--    if {[board_info $dest exists multilib_flags]} {
--	append add_flags " [board_info $dest multilib_flags]"
--    }
--
-     verbose "doing compile"
- 
-     set sources ""

diff --git a/gdb-test-expr-cumulative-archer.patch b/gdb-test-expr-cumulative-archer.patch
deleted file mode 100644
index 28a903d..0000000
--- a/gdb-test-expr-cumulative-archer.patch
+++ /dev/null
@@ -1,223 +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-expr-cumulative-archer.patch
-
-;; [archer-keiths-expr-cumulative+upstream] Import C++ testcases.
-;;=fedoratest
-
-archer archer-keiths-expr-cumulative
-b5a7497340b24199f0c7ba7fdf0d54d4df44d6bc
-
-diff --git a/gdb/testsuite/gdb.cp/namespace-nested-imports.cc b/gdb/testsuite/gdb.cp/namespace-nested-imports.cc
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.cp/namespace-nested-imports.cc
-@@ -0,0 +1,36 @@
-+namespace A
-+{
-+  namespace B
-+  {
-+    int ab = 11;
-+  }
-+}
-+
-+namespace C
-+{
-+  namespace D
-+  {
-+    using namespace A::B;
-+
-+    int
-+    second()
-+    {
-+      ab;
-+      return 0;
-+    }
-+  }
-+
-+  int
-+  first()
-+  {
-+    //ab;
-+    return D::second();
-+  }
-+}
-+
-+int
-+main()
-+{
-+  //ab;
-+  return C::first();
-+}
-diff --git a/gdb/testsuite/gdb.cp/namespace-nested-imports.exp b/gdb/testsuite/gdb.cp/namespace-nested-imports.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.cp/namespace-nested-imports.exp
-@@ -0,0 +1,50 @@
-+# Copyright 2008 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/>.
-+
-+set testfile namespace-nested-imports
-+set srcfile ${testfile}.cc
-+set binfile [standard_output_file ${testfile}]
-+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-+    untested "Couldn't compile test program"
-+    return -1
-+}
-+
-+# Get things started.
-+
-+gdb_exit
-+gdb_start
-+gdb_reinitialize_dir $srcdir/$subdir
-+gdb_load ${binfile}
-+
-+############################################
-+if ![runto_main] then {
-+    perror "couldn't run to breakpoint main"
-+    continue
-+}
-+
-+gdb_test "print ab" "No symbol .* in current context."
-+
-+############################################
-+gdb_breakpoint C::first
-+gdb_continue_to_breakpoint "C::first"
-+
-+gdb_test "print ab" "No symbol .* in current context."
-+gdb_test "print C::D::ab" "= 11"
-+
-+############################################
-+gdb_breakpoint C::D::second
-+gdb_continue_to_breakpoint "C::D::second"
-+
-+gdb_test "print ab" "= 11"
-diff --git a/gdb/testsuite/gdb.cp/namespace-no-imports.cc b/gdb/testsuite/gdb.cp/namespace-no-imports.cc
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.cp/namespace-no-imports.cc
-@@ -0,0 +1,37 @@
-+
-+namespace A
-+{
-+  int _a = 11;
-+
-+  namespace B{
-+
-+    int ab = 22;
-+
-+    namespace C{
-+
-+      int abc = 33;
-+
-+      int second(){
-+        return 0;
-+      }
-+
-+    }
-+
-+    int first(){
-+      _a;
-+      ab;
-+      C::abc;
-+      return C::second();
-+    }
-+  }
-+}
-+
-+
-+int
-+main()
-+{
-+  A::_a;
-+  A::B::ab;
-+  A::B::C::abc;
-+  return A::B::first();
-+}
-diff --git a/gdb/testsuite/gdb.cp/namespace-no-imports.exp b/gdb/testsuite/gdb.cp/namespace-no-imports.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.cp/namespace-no-imports.exp
-@@ -0,0 +1,69 @@
-+# Copyright 2008 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/>.
-+
-+set testfile namespace-no-imports
-+set srcfile ${testfile}.cc
-+set binfile [standard_output_file ${testfile}]
-+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-+    untested "Couldn't compile test program"
-+    return -1
-+}
-+
-+# Get things started.
-+
-+gdb_exit
-+gdb_start
-+gdb_reinitialize_dir $srcdir/$subdir
-+gdb_load ${binfile}
-+
-+############################################
-+if ![runto_main] then {
-+    perror "couldn't run to breakpoint main"
-+    continue
-+}
-+
-+gdb_test "print A::_a" "= 11"
-+gdb_test "print A::B::ab" "= 22"
-+gdb_test "print A::B::C::abc" "= 33"
-+
-+gdb_test "print _a" "No symbol .* in current context."
-+gdb_test "print ab" "No symbol .* in current context."
-+gdb_test "print abc" "No symbol .* in current context."
-+
-+############################################
-+gdb_breakpoint A::B::first
-+gdb_continue_to_breakpoint "A::B::first"
-+
-+gdb_test "print A::_a" "= 11"
-+gdb_test "print A::B::ab" "= 22"
-+gdb_test "print A::B::C::abc" "= 33"
-+
-+gdb_test "print _a" "= 11"
-+gdb_test "print ab" "= 22"
-+gdb_test "print C::abc" "= 33"
-+
-+gdb_test "print abc" "No symbol .* in current context."
-+
-+############################################
-+gdb_breakpoint A::B::C::second
-+gdb_continue_to_breakpoint "A::B::C::second"
-+
-+gdb_test "print A::_a" "= 11"
-+gdb_test "print A::B::ab" "= 22"
-+gdb_test "print A::B::C::abc" "= 33"
-+
-+gdb_test "print _a" "= 11"
-+gdb_test "print ab" "= 22"
-+gdb_test "print abc" "= 33"

diff --git a/gdb.spec b/gdb.spec
index 4a544ba..5105647 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -1186,6 +1186,11 @@ fi
 %endif
 
 %changelog
+* Mon Dec 5 2022 Keith Seitz <keiths@redhat.com>
+- Remove gdb-physname-pr11734-test.patch,
+  gdb-physname-pr12273-test.patch, gdb-runtest-pie-override.patch,
+  gdb-test-expr-cumulative-archer.patch.
+
 * Thu Dec 1 2022 Kevin Buettner <kevinb@redhat.com>
 - Remove gdb-6.3-threaded-watchpoints2-20050225.patch.  The test in this
   patch is a tweaked version of upstream test gdb.threads/watchthreads.exp