remove gdb-6.3-test-dtor-fix, since it was upstreamed.

2022-10-12 09:41:33 +02:00 · 2022-10-12 09:41:33 +02:00 · 89341dc865
commit 89341dc865
parent d6591abf53
5 changed files with 76 additions and 325 deletions
--- a/_gdb.spec.Patch.include
+++ b/_gdb.spec.Patch.include
@ -7,291 +7,287 @@ Patch001: gdb-6.3-rh-testversion-20041202.patch
 #=push
 Patch002: gdb-6.3-gstack-20050411.patch

-# Test support of multiple destructors just like multiple constructors
-#=fedoratest
-Patch003: gdb-6.3-test-dtorfix-20050121.patch
-
 # Fix to support executable moving
 #=fedoratest
-Patch004: gdb-6.3-test-movedir-20050125.patch
+Patch003: gdb-6.3-test-movedir-20050125.patch

 # Test sibling threads to set threaded watchpoints for x86 and x86-64
 #=fedoratest
-Patch005: gdb-6.3-threaded-watchpoints2-20050225.patch
+Patch004: gdb-6.3-threaded-watchpoints2-20050225.patch

 # Verify printing of inherited members test
 #=fedoratest
-Patch006: gdb-6.3-inheritancetest-20050726.patch
+Patch005: gdb-6.3-inheritancetest-20050726.patch

 # Support TLS symbols (+`errno' suggestion if no pthread is found) (BZ 185337).
 #=push+jan: It should be replaced by Infinity project.
-Patch007: gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
+Patch006: gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch

 # Fix TLS symbols resolving for shared libraries with a relative pathname.
 # The testsuite needs `gdb-6.5-tls-of-separate-debuginfo.patch'.
 #=fedoratest: One should recheck if it is really fixed upstream.
-Patch008: gdb-6.5-sharedlibrary-path.patch
+Patch007: gdb-6.5-sharedlibrary-path.patch

 # Improved testsuite results by the testsuite provided by the courtesy of BEA.
 #=fedoratest: For upstream it should be rewritten as a dejagnu test, the test of no "??" was useful.
-Patch009: gdb-6.5-BEA-testsuite.patch
+Patch008: gdb-6.5-BEA-testsuite.patch

 # Testcase for deadlocking on last address space byte; for corrupted backtraces.
 #=fedoratest
-Patch010: gdb-6.5-last-address-space-byte-test.patch
+Patch009: gdb-6.5-last-address-space-byte-test.patch

 # Fix readline segfault on excessively long hand-typed lines.
 #=fedoratest
-Patch011: gdb-6.5-readline-long-line-crash-test.patch
+Patch010: gdb-6.5-readline-long-line-crash-test.patch

 # Test sideeffects of skipping ppc .so libs trampolines (BZ 218379).
 #=fedoratest
-Patch012: gdb-6.5-bz218379-ppc-solib-trampoline-test.patch
+Patch011: gdb-6.5-bz218379-ppc-solib-trampoline-test.patch

 # Find symbols properly at their original (included) file (BZ 109921).
 #=fedoratest
-Patch013: gdb-6.5-bz109921-DW_AT_decl_file-test.patch
+Patch012: gdb-6.5-bz109921-DW_AT_decl_file-test.patch

 # Update PPC unwinding patches to their upstream variants (BZ 140532).
 #=fedoratest
-Patch014: gdb-6.3-bz140532-ppc-unwinding-test.patch
+Patch013: gdb-6.3-bz140532-ppc-unwinding-test.patch

 # Testcase for exec() from threaded program (BZ 202689).
 #=fedoratest
-Patch015: gdb-6.3-bz202689-exec-from-pthread-test.patch
+Patch014: gdb-6.3-bz202689-exec-from-pthread-test.patch

 # Testcase for PPC Power6/DFP instructions disassembly (BZ 230000).
 #=fedoratest
-Patch016: gdb-6.6-bz230000-power6-disassembly-test.patch
+Patch015: gdb-6.6-bz230000-power6-disassembly-test.patch

 # Allow running `/usr/bin/gcore' with provided but inaccessible tty (BZ 229517).
 #=fedoratest
-Patch017: gdb-6.6-bz229517-gcore-without-terminal.patch
+Patch016: gdb-6.6-bz229517-gcore-without-terminal.patch

 # Avoid too long timeouts on failing cases of "annota1.exp annota3.exp".
 #=fedoratest
-Patch018: gdb-6.6-testsuite-timeouts.patch
+Patch017: gdb-6.6-testsuite-timeouts.patch

 # Support for stepping over PPC atomic instruction sequences (BZ 237572).
 #=fedoratest
-Patch019: gdb-6.6-bz237572-ppc-atomic-sequence-test.patch
+Patch018: gdb-6.6-bz237572-ppc-atomic-sequence-test.patch

 # Test kernel VDSO decoding while attaching to an i386 process.
 #=fedoratest
-Patch020: gdb-6.3-attach-see-vdso-test.patch
+Patch019: gdb-6.3-attach-see-vdso-test.patch

 # Test leftover zombie process (BZ 243845).
 #=fedoratest
-Patch021: gdb-6.5-bz243845-stale-testing-zombie-test.patch
+Patch020: gdb-6.5-bz243845-stale-testing-zombie-test.patch

 # New locating of the matching binaries from the pure core file (build-id).
 #=push+jan
-Patch022: gdb-6.6-buildid-locate.patch
+Patch021: 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
-Patch023: gdb-6.6-buildid-locate-solib-missing-ids.patch
+Patch022: gdb-6.6-buildid-locate-solib-missing-ids.patch

 #=push+jan
-Patch024: gdb-6.6-buildid-locate-rpm.patch
+Patch023: 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.
-Patch025: gdb-6.7-charsign-test.patch
+Patch024: gdb-6.7-charsign-test.patch

 # Test PPC hiding of call-volatile parameter register.
 #=fedoratest
-Patch026: gdb-6.7-ppc-clobbered-registers-O2-test.patch
+Patch025: gdb-6.7-ppc-clobbered-registers-O2-test.patch

 # Testsuite fixes for more stable/comparable results.
 #=fedoratest
-Patch027: gdb-6.7-testsuite-stable-results.patch
+Patch026: gdb-6.7-testsuite-stable-results.patch

 # Test ia64 memory leaks of the code using libunwind.
 #=fedoratest
-Patch028: gdb-6.5-ia64-libunwind-leak-test.patch
+Patch027: gdb-6.5-ia64-libunwind-leak-test.patch

 # Test hiding unexpected breakpoints on intentional step commands.
 #=fedoratest
-Patch029: gdb-6.5-missed-trap-on-step-test.patch
+Patch028: gdb-6.5-missed-trap-on-step-test.patch

 # Test gcore memory and time requirements for large inferiors.
 #=fedoratest
-Patch030: gdb-6.5-gcore-buffer-limit-test.patch
+Patch029: 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.
-Patch031: gdb-6.3-mapping-zero-inode-test.patch
+Patch030: gdb-6.3-mapping-zero-inode-test.patch

 # Test a crash on `focus cmd', `focus prev' commands.
 #=fedoratest
-Patch032: gdb-6.3-focus-cmd-prev-test.patch
+Patch031: gdb-6.3-focus-cmd-prev-test.patch

 # Test various forms of threads tracking across exec() (BZ 442765).
 #=fedoratest
-Patch033: gdb-6.8-bz442765-threaded-exec-test.patch
+Patch032: gdb-6.8-bz442765-threaded-exec-test.patch

 # Test a crash on libraries missing the .text section.
 #=fedoratest
-Patch034: gdb-6.5-section-num-fixup-test.patch
+Patch033: gdb-6.5-section-num-fixup-test.patch

 # Fix resolving of variables at locations lists in prelinked libs (BZ 466901).
 #=fedoratest
-Patch035: gdb-6.8-bz466901-backtrace-full-prelinked.patch
+Patch034: gdb-6.8-bz466901-backtrace-full-prelinked.patch

 # New test for step-resume breakpoint placed in multiple threads at once.
 #=fedoratest
-Patch036: gdb-simultaneous-step-resume-breakpoint-test.patch
+Patch035: 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@.*>
-Patch037: gdb-core-open-vdso-warning.patch
+Patch036: 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.
-Patch038: gdb-ccache-workaround.patch
+Patch037: gdb-ccache-workaround.patch

 # Testcase for "Do not make up line information" fix by Daniel Jacobowitz.
 #=fedoratest
-Patch039: gdb-lineno-makeup-test.patch
+Patch038: gdb-lineno-makeup-test.patch

 # Test power7 ppc disassembly.
 #=fedoratest
-Patch040: gdb-ppc-power7-test.patch
+Patch039: gdb-ppc-power7-test.patch

 # Fix follow-exec for C++ programs (bugreported by Martin Stransky).
 #=fedoratest
-Patch041: gdb-archer-next-over-throw-cxx-exec.patch
+Patch040: gdb-archer-next-over-throw-cxx-exec.patch

 # Backport DWARF-4 support (BZ 601887, Tom Tromey).
 #=fedoratest
-Patch042: gdb-bz601887-dwarf4-rh-test.patch
+Patch041: gdb-bz601887-dwarf4-rh-test.patch

 # Workaround librpm BZ 643031 due to its unexpected exit() calls (BZ 642879).
 #=push+jan
-Patch043: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
+Patch042: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch

 # [delayed-symfile] Test a backtrace regression on CFIs without DIE (BZ 614604).
 #=fedoratest
-Patch044: gdb-test-bt-cfi-without-die.patch
+Patch043: gdb-test-bt-cfi-without-die.patch

 # Verify GDB Python built-in function gdb.solib_address exists (BZ # 634108).
 #=fedoratest
-Patch045: gdb-bz634108-solib_address.patch
+Patch044: gdb-bz634108-solib_address.patch

 # New test gdb.arch/x86_64-pid0-core.exp for kernel PID 0 cores (BZ 611435).
 #=fedoratest
-Patch046: gdb-test-pid0-core.patch
+Patch045: gdb-test-pid0-core.patch

 # [archer-tromey-delayed-symfile] New test gdb.dwarf2/dw2-aranges.exp.
 #=fedoratest
-Patch047: gdb-test-dw2-aranges.patch
+Patch046: gdb-test-dw2-aranges.patch

 # [archer-keiths-expr-cumulative+upstream] Import C++ testcases.
 #=fedoratest
-Patch048: gdb-test-expr-cumulative-archer.patch
+Patch047: gdb-test-expr-cumulative-archer.patch

 # Fix regressions on C++ names resolving (PR 11734, PR 12273, Keith Seitz).
 #=fedoratest
-Patch049: gdb-physname-pr11734-test.patch
+Patch048: gdb-physname-pr11734-test.patch

 # Fix regressions on C++ names resolving (PR 11734, PR 12273, Keith Seitz).
 #=fedoratest
-Patch050: gdb-physname-pr12273-test.patch
+Patch049: gdb-physname-pr12273-test.patch

 # Test GDB opcodes/ disassembly of Intel Ivy Bridge instructions (BZ 696890).
 #=fedoratest
-Patch051: gdb-test-ivy-bridge.patch
+Patch050: gdb-test-ivy-bridge.patch

 # Hack for proper PIE run of the testsuite.
 #=fedoratest
-Patch052: gdb-runtest-pie-override.patch
+Patch051: gdb-runtest-pie-override.patch

 # Workaround PR libc/14166 for inferior calls of strstr.
 #=fedoratest: Compatibility with RHELs (unchecked which ones).
-Patch053: gdb-glibc-strstr-workaround.patch
+Patch052: gdb-glibc-strstr-workaround.patch

 # Include testcase for `Unable to see a variable inside a module (XLF)' (BZ 823789).
 #=fedoratest
-Patch054: gdb-rhel5.9-testcase-xlf-var-inside-mod.patch
+Patch053: gdb-rhel5.9-testcase-xlf-var-inside-mod.patch

 # Testcase for `Setting solib-absolute-prefix breaks vDSO' (BZ 818343).
 #=fedoratest
-Patch055: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
+Patch054: 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
-Patch056: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
+Patch055: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch

 # Fix 'memory leak in infpy_read_memory()' (RH BZ 1007614)
 #=fedoratest
-Patch057: gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
+Patch056: 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
-Patch058: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
+Patch057: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch

 # Display Fortran strings in backtraces.
 #=fedoratest
-Patch059: gdb-fortran-frame-string.patch
+Patch058: gdb-fortran-frame-string.patch

 # Testcase for '[SAP] Recursive dlopen causes SAP HANA installer to
 # crash.' (RH BZ 1156192).
 #=fedoratest
-Patch060: gdb-rhbz1156192-recursive-dlopen-test.patch
+Patch059: gdb-rhbz1156192-recursive-dlopen-test.patch

 # Fix '`catch syscall' doesn't work for parent after `fork' is called'
 # (Philippe Waroquiers, RH BZ 1149205).
 #=fedoratest
-Patch061: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
+Patch060: 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
-Patch062: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
+Patch061: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch

 # Test 'info type-printers' Python error (RH BZ 1350436).
 #=fedoratest
-Patch063: gdb-rhbz1350436-type-printers-error.patch
+Patch062: gdb-rhbz1350436-type-printers-error.patch

 # Fix '[ppc64] and [s390x] wrong prologue skip on -O2 -g code' (Jan
 # Kratochvil, RH BZ 1084404).
 #=fedoratest
-Patch064: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
+Patch063: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch

 # Force libncursesw over libncurses to match the includes (RH BZ 1270534).
 #=push+jan
-Patch065: gdb-fedora-libncursesw.patch
+Patch064: gdb-fedora-libncursesw.patch

 # Test clflushopt instruction decode (for RH BZ 1262471).
 #=fedoratest
-Patch066: gdb-opcodes-clflushopt-test.patch
+Patch065: gdb-opcodes-clflushopt-test.patch

 # [SCL] Skip deprecated .gdb_index warning for Red Hat built files (BZ 953585).
 #=push+jan
-Patch067: gdb-6.6-buildid-locate-rpm-scl.patch
+Patch066: gdb-6.6-buildid-locate-rpm-scl.patch

 # [aarch64] Fix hardware watchpoints (RH BZ 1261564).
 #=fedoratest
-Patch068: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
+Patch067: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch

 # Add messages suggesting more recent RHEL gdbserver (RH BZ 1321114).
 #=fedora
-Patch069: gdb-container-rh-pkg.patch
+Patch068: gdb-container-rh-pkg.patch

 # New test for Python "Cannot locate object file for block" (for RH BZ 1325795).
 #=fedoratest
-Patch070: gdb-rhbz1325795-framefilters-test.patch
+Patch069: gdb-rhbz1325795-framefilters-test.patch

 # [dts+el7] [x86*] Bundle linux_perf.h for libipt (RH BZ 1256513).
 #=fedora
-Patch071: gdb-linux_perf-bundle.patch
+Patch070: gdb-linux_perf-bundle.patch

 # Fix gdb-headless /usr/bin/ executables (BZ 1390251).
 #
@ -300,16 +296,16 @@ Patch071: gdb-linux_perf-bundle.patch
 #
 #   https://fedoraproject.org/wiki/Changes/Minimal_GDB_in_buildroot
 #=fedora
-Patch072: gdb-libexec-add-index.patch
+Patch071: gdb-libexec-add-index.patch

 # New testcase for: Fix <tab>-completion crash (Gary Benson, RH BZ 1398387).
 #=fedoratest
-Patch073: gdb-rhbz1398387-tab-crash-test.patch
+Patch072: gdb-rhbz1398387-tab-crash-test.patch

 # [s390x] Backport arch12 instructions decoding (RH BZ 1553104).
 # =fedoratest
-Patch074: gdb-rhbz1553104-s390x-arch12-test.patch
+Patch073: gdb-rhbz1553104-s390x-arch12-test.patch


-Patch075: gdb-backport-readline_support.patch
+Patch074: gdb-backport-readline_support.patch

--- a/_gdb.spec.patch.include
+++ b/_gdb.spec.patch.include
@ -72,4 +72,3 @@
 %patch072 -p1
 %patch073 -p1
 %patch074 -p1
-%patch075 -p1
--- a/1
+++ b/1
@ -1,6 +1,5 @@
 gdb-6.3-rh-testversion-20041202.patch
 gdb-6.3-gstack-20050411.patch
-gdb-6.3-test-dtorfix-20050121.patch
 gdb-6.3-test-movedir-20050125.patch
 gdb-6.3-threaded-watchpoints2-20050225.patch
 gdb-6.3-inheritancetest-20050726.patch
--- a/gdb-6.3-test-dtorfix-20050121.patch
+++ b/gdb-6.3-test-dtorfix-20050121.patch
@ -1,247 +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.3-test-dtorfix-20050121.patch
-
-;; Test support of multiple destructors just like multiple constructors
-;;=fedoratest
-
-diff --git a/gdb/testsuite/gdb.cp/constructortest.cc b/gdb/testsuite/gdb.cp/constructortest.cc
-new file mode 100644
--- /dev/null
-+++ b/gdb/testsuite/gdb.cp/constructortest.cc
-@@ -0,0 +1,99 @@
-+/* This testcase is part of GDB, the GNU debugger.
-+
-+   Copyright 2005 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.  */
-+
-+class A
-+{
-+  public:
-+    A();
-+    ~A();
-+    int  k;
-+  private:
-+    int  x;
-+};
-+
-+class B: public A
-+{
-+  public:
-+    B();
-+  private:
-+    int  y;
-+};
-+
-+/* C and D are for the $delete destructor.  */
-+
-+class C
-+{
-+  public:
-+    C();
-+    virtual ~C();
-+  private:
-+    int  x;
-+};
-+
-+class D: public C
-+{
-+  public:
-+    D();
-+  private:
-+    int  y;
-+};
-+
-+int main(int argc, char *argv[])
-+{
-+  A* a = new A;
-+  B* b = new B;
-+  D* d = new D;
-+  delete a;
-+  delete b;
-+  delete d;
-+  return 0;
-+}
-+
-+A::A() /* Constructor A */
-+{
-+   x = 1; /* First line A */
-+   k = 4; /* Second line A */
-+}
-+
-+A::~A() /* Destructor A */
-+{
-+   x = 3; /* First line ~A */
-+   k = 6; /* Second line ~A */
-+}
-+
-+B::B()
-+{
-+   y = 2; /* First line B */
-+   k = 5;
-+}
-+
-+C::C() /* Constructor C */
-+{
-+   x = 1; /* First line C */
-+}
-+
-+C::~C() /* Destructor C */
-+{
-+   x = 3; /* First line ~C */
-+}
-+
-+D::D()
-+{
-+   y = 2; /* First line D */
-+}
-diff --git a/gdb/testsuite/gdb.cp/constructortest.exp b/gdb/testsuite/gdb.cp/constructortest.exp
-new file mode 100644
--- /dev/null
-+++ b/gdb/testsuite/gdb.cp/constructortest.exp
-@@ -0,0 +1,130 @@
-+# This testcase is part of GDB, the GNU debugger.
-+
-+# Copyright 2005, 2007 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.
-+
-+# Check that GDB can break at multiple forms of constructors.
-+
-+set testfile "constructortest"
-+set srcfile ${testfile}.cc
-+set binfile [standard_output_file ${testfile}]
-+# PIE is required for testing proper BREAKPOINT_RE_SET of the multiple-PC
-+# breakpoints.
-+if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++ "additional_flags=-fpie -pie"}] != "" } {
-+    return -1
-+}
-+
-+gdb_exit
-+gdb_start
-+gdb_reinitialize_dir $srcdir/$subdir
-+gdb_load ${binfile}
-+
-+#
-+# Run to `main' where we begin our tests.
-+#
-+
-+if ![runto_main] then {
-+    gdb_suppress_tests
-+}
-+
-+# Break on the various forms of the A::A constructor.
-+# " (2 locations)" is displayed depending on G++ version.
-+gdb_test "break A\:\:A" "Breakpoint 2 at .*" "breaking on A::A"
-+
-+# Verify that we break for the A constructor two times
-+# Once for new A and once for new B
-+gdb_continue_to_breakpoint "First line A"
-+gdb_test "bt" "#0.*A.*#1.*main.*" "Verify in in-charge A::A"
-+gdb_continue_to_breakpoint "First line A"
-+gdb_test "bt" "#0.*A.*#1.*B.*#2.*main.*" "Verify in not-in-charge A::A"
-+
-+# Now do the same for destructors
-+gdb_test "break 'A::~A()'" ""
-+
-+# Verify that we break for the A destructor two times
-+# Once for delete a and once for delete b
-+gdb_continue_to_breakpoint "First line ~A"
-+gdb_test "bt" "#0.*~A.*#1.*main.*" "Verify in in-charge A::~A"
-+gdb_continue_to_breakpoint "First line ~A"
-+gdb_test "bt" "#0.*~A.*#1.*~B.*#2.*main.*" "Verify in not-in-charge A::~A"
-+
-+
-+# Verify that we can break by line number in a constructor and find
-+# both occurrences
-+runto_main
-+gdb_test "break 'A::A()'" "" "break in constructor A 2"
-+gdb_continue_to_breakpoint "First line A"
-+set second_line [gdb_get_line_number "Second line A"]
-+# " (2 locations)" is displayed depending on G++ version.
-+gdb_test "break $second_line" "Breakpoint .*, line $second_line\\..*" "break by line in constructor"
-+gdb_continue_to_breakpoint "Second line A"
-+gdb_test "bt" "#0.*A.*#1.*main.*" "Verify in in-charge A::A second line"
-+gdb_continue_to_breakpoint "Second line A"
-+gdb_test "bt" "#0.*A.*#1.*B.*#2.*main.*" "Verify in not-in-charge A::A second line"
-+
-+# Verify that we can break by line number in a destructor and find
-+# both occurrences
-+gdb_test "break 'A::~A()'" "" "break in constructor ~A 2"
-+gdb_continue_to_breakpoint "First line ~A"
-+set second_line_dtor [gdb_get_line_number "Second line ~A"]
-+# " (2 locations)" is displayed depending on G++ version.
-+gdb_test "break $second_line_dtor" "Breakpoint .*, line $second_line_dtor\\..*" "break by line in destructor"
-+gdb_continue_to_breakpoint "Second line ~A"
-+gdb_test "bt" "#0.*A.*#1.*main.*" "Verify in in-charge A::~A second line"
-+# FIXME: Analyse this case better.
-+gdb_continue_to_breakpoint "Second line ~A"
-+gdb_test "bt" "#0.*A.*#1.*main.*" "Verify in A::~A second line #2"
-+gdb_continue_to_breakpoint "Second line ~A"
-+gdb_test "bt" "#0.*A.*#1.*B.*#2.*main.*" "Verify in not-in-charge A::~A second line"
-+
-+
-+# Test now the $delete destructors.
-+
-+gdb_load ${binfile}
-+runto_main
-+
-+set first_line_dtor [gdb_get_line_number "First line ~C"]
-+set define_line_dtor [gdb_get_line_number "Destructor C"]
-+# Break on the various forms of the C::~C destructor
-+# " ([23] locations)" is displayed depending on G++ version.
-+gdb_test "break C\:\:~C" "Breakpoint .*: C::~C\\. \\(2 locations\\)" "breaking on C::~C"
-+gdb_continue_to_breakpoint "First line ~C"
-+
-+# Verify that we can break by line number in a destructor and find
-+# the $delete occurence
-+
-+gdb_load ${binfile}
-+delete_breakpoints
-+
-+# " (3 locations)" is displayed depending on G++ version.
-+gdb_test "break $first_line_dtor" "Breakpoint .*, line $first_line_dtor\\..*" "break by line in destructor"
-+
-+# Run to `main' where we begin our tests.
-+# Set the breakpoints first to test PIE multiple-PC BREAKPOINT_RE_SET.
-+# RUNTO_MAIN or RUNTO MAIN are not usable here as it runs DELETE_BREAKPOINTS.
-+
-+if ![gdb_breakpoint main] {
-+    gdb_suppress_tests
-+}
-+gdb_run_cmd
-+set test "running to main"
-+gdb_test_multiple "" $test {
-+    -re "Breakpoint \[0-9\]*, main .*$gdb_prompt $" {
-+	pass $test
-+    }
-+}
-+
-+gdb_continue_to_breakpoint "First line ~C"
--- a/gdb.spec
+++ b/gdb.spec
@ -1189,6 +1189,10 @@ fi
 %endif

 %changelog
+* Wed Oct 18 2022 Bruno Larsen - 12.1-7
+- Remove patch gdb-6.3-test-dtorfix.
+  Was upstreamed, will be back in the next rebase.
+
 * Thu Oct 13 2022 Alexandra Hájková - 12.1-7
 - Bump the release number.