From 3d614802ea8cbb56c16f1a055b5f61aedf2a8fd6 Mon Sep 17 00:00:00 2001 From: Kevin Buettner Date: Nov 23 2022 21:05:18 +0000 Subject: Remove gdb-6.3-inheritancetest-20050726.patch. Upstream testcase gdb.cp/impl-this.exp tests the printing of an instance variable from an inherited class in the "print c" test. --- diff --git a/_gdb.spec.Patch.include b/_gdb.spec.Patch.include index 9ff79a2..e2b909c 100644 --- a/_gdb.spec.Patch.include +++ b/_gdb.spec.Patch.include @@ -11,279 +11,275 @@ Patch002: gdb-6.3-gstack-20050411.patch #=fedoratest Patch003: gdb-6.3-threaded-watchpoints2-20050225.patch -# Verify printing of inherited members test -#=fedoratest -Patch004: 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. -Patch005: gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch +Patch004: 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. -Patch006: gdb-6.5-sharedlibrary-path.patch +Patch005: 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. -Patch007: gdb-6.5-BEA-testsuite.patch +Patch006: gdb-6.5-BEA-testsuite.patch # Testcase for deadlocking on last address space byte; for corrupted backtraces. #=fedoratest -Patch008: gdb-6.5-last-address-space-byte-test.patch +Patch007: gdb-6.5-last-address-space-byte-test.patch # Fix readline segfault on excessively long hand-typed lines. #=fedoratest -Patch009: gdb-6.5-readline-long-line-crash-test.patch +Patch008: gdb-6.5-readline-long-line-crash-test.patch # Test sideeffects of skipping ppc .so libs trampolines (BZ 218379). #=fedoratest -Patch010: gdb-6.5-bz218379-ppc-solib-trampoline-test.patch +Patch009: gdb-6.5-bz218379-ppc-solib-trampoline-test.patch # Find symbols properly at their original (included) file (BZ 109921). #=fedoratest -Patch011: gdb-6.5-bz109921-DW_AT_decl_file-test.patch +Patch010: gdb-6.5-bz109921-DW_AT_decl_file-test.patch # Update PPC unwinding patches to their upstream variants (BZ 140532). #=fedoratest -Patch012: gdb-6.3-bz140532-ppc-unwinding-test.patch +Patch011: gdb-6.3-bz140532-ppc-unwinding-test.patch # Testcase for exec() from threaded program (BZ 202689). #=fedoratest -Patch013: gdb-6.3-bz202689-exec-from-pthread-test.patch +Patch012: gdb-6.3-bz202689-exec-from-pthread-test.patch # Testcase for PPC Power6/DFP instructions disassembly (BZ 230000). #=fedoratest -Patch014: gdb-6.6-bz230000-power6-disassembly-test.patch +Patch013: gdb-6.6-bz230000-power6-disassembly-test.patch # Allow running `/usr/bin/gcore' with provided but inaccessible tty (BZ 229517). #=fedoratest -Patch015: gdb-6.6-bz229517-gcore-without-terminal.patch +Patch014: gdb-6.6-bz229517-gcore-without-terminal.patch # Avoid too long timeouts on failing cases of "annota1.exp annota3.exp". #=fedoratest -Patch016: gdb-6.6-testsuite-timeouts.patch +Patch015: gdb-6.6-testsuite-timeouts.patch # Support for stepping over PPC atomic instruction sequences (BZ 237572). #=fedoratest -Patch017: gdb-6.6-bz237572-ppc-atomic-sequence-test.patch +Patch016: gdb-6.6-bz237572-ppc-atomic-sequence-test.patch # Test kernel VDSO decoding while attaching to an i386 process. #=fedoratest -Patch018: gdb-6.3-attach-see-vdso-test.patch +Patch017: gdb-6.3-attach-see-vdso-test.patch # Test leftover zombie process (BZ 243845). #=fedoratest -Patch019: gdb-6.5-bz243845-stale-testing-zombie-test.patch +Patch018: gdb-6.5-bz243845-stale-testing-zombie-test.patch # New locating of the matching binaries from the pure core file (build-id). #=push+jan -Patch020: gdb-6.6-buildid-locate.patch +Patch019: 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 -Patch021: gdb-6.6-buildid-locate-solib-missing-ids.patch +Patch020: gdb-6.6-buildid-locate-solib-missing-ids.patch #=push+jan -Patch022: gdb-6.6-buildid-locate-rpm.patch +Patch021: 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. -Patch023: gdb-6.7-charsign-test.patch +Patch022: gdb-6.7-charsign-test.patch # Test PPC hiding of call-volatile parameter register. #=fedoratest -Patch024: gdb-6.7-ppc-clobbered-registers-O2-test.patch +Patch023: gdb-6.7-ppc-clobbered-registers-O2-test.patch # Testsuite fixes for more stable/comparable results. #=fedoratest -Patch025: gdb-6.7-testsuite-stable-results.patch +Patch024: gdb-6.7-testsuite-stable-results.patch # Test ia64 memory leaks of the code using libunwind. #=fedoratest -Patch026: gdb-6.5-ia64-libunwind-leak-test.patch +Patch025: gdb-6.5-ia64-libunwind-leak-test.patch # Test hiding unexpected breakpoints on intentional step commands. #=fedoratest -Patch027: gdb-6.5-missed-trap-on-step-test.patch +Patch026: gdb-6.5-missed-trap-on-step-test.patch # Test gcore memory and time requirements for large inferiors. #=fedoratest -Patch028: gdb-6.5-gcore-buffer-limit-test.patch +Patch027: 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. -Patch029: gdb-6.3-mapping-zero-inode-test.patch +Patch028: gdb-6.3-mapping-zero-inode-test.patch # Test a crash on `focus cmd', `focus prev' commands. #=fedoratest -Patch030: gdb-6.3-focus-cmd-prev-test.patch +Patch029: gdb-6.3-focus-cmd-prev-test.patch # Test various forms of threads tracking across exec() (BZ 442765). #=fedoratest -Patch031: gdb-6.8-bz442765-threaded-exec-test.patch +Patch030: gdb-6.8-bz442765-threaded-exec-test.patch # Test a crash on libraries missing the .text section. #=fedoratest -Patch032: gdb-6.5-section-num-fixup-test.patch +Patch031: gdb-6.5-section-num-fixup-test.patch # Fix resolving of variables at locations lists in prelinked libs (BZ 466901). #=fedoratest -Patch033: gdb-6.8-bz466901-backtrace-full-prelinked.patch +Patch032: gdb-6.8-bz466901-backtrace-full-prelinked.patch # New test for step-resume breakpoint placed in multiple threads at once. #=fedoratest -Patch034: gdb-simultaneous-step-resume-breakpoint-test.patch +Patch033: 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@.*> -Patch035: gdb-core-open-vdso-warning.patch +Patch034: 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. -Patch036: gdb-ccache-workaround.patch +Patch035: gdb-ccache-workaround.patch # Testcase for "Do not make up line information" fix by Daniel Jacobowitz. #=fedoratest -Patch037: gdb-lineno-makeup-test.patch +Patch036: gdb-lineno-makeup-test.patch # Test power7 ppc disassembly. #=fedoratest -Patch038: gdb-ppc-power7-test.patch +Patch037: gdb-ppc-power7-test.patch # Fix follow-exec for C++ programs (bugreported by Martin Stransky). #=fedoratest -Patch039: gdb-archer-next-over-throw-cxx-exec.patch +Patch038: gdb-archer-next-over-throw-cxx-exec.patch # Backport DWARF-4 support (BZ 601887, Tom Tromey). #=fedoratest -Patch040: gdb-bz601887-dwarf4-rh-test.patch +Patch039: gdb-bz601887-dwarf4-rh-test.patch # Workaround librpm BZ 643031 due to its unexpected exit() calls (BZ 642879). #=push+jan -Patch041: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch +Patch040: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch # [delayed-symfile] Test a backtrace regression on CFIs without DIE (BZ 614604). #=fedoratest -Patch042: gdb-test-bt-cfi-without-die.patch +Patch041: gdb-test-bt-cfi-without-die.patch # Verify GDB Python built-in function gdb.solib_address exists (BZ # 634108). #=fedoratest -Patch043: gdb-bz634108-solib_address.patch +Patch042: gdb-bz634108-solib_address.patch # New test gdb.arch/x86_64-pid0-core.exp for kernel PID 0 cores (BZ 611435). #=fedoratest -Patch044: gdb-test-pid0-core.patch +Patch043: gdb-test-pid0-core.patch # [archer-tromey-delayed-symfile] New test gdb.dwarf2/dw2-aranges.exp. #=fedoratest -Patch045: gdb-test-dw2-aranges.patch +Patch044: gdb-test-dw2-aranges.patch # [archer-keiths-expr-cumulative+upstream] Import C++ testcases. #=fedoratest -Patch046: gdb-test-expr-cumulative-archer.patch +Patch045: gdb-test-expr-cumulative-archer.patch # Fix regressions on C++ names resolving (PR 11734, PR 12273, Keith Seitz). #=fedoratest -Patch047: gdb-physname-pr11734-test.patch +Patch046: gdb-physname-pr11734-test.patch # Fix regressions on C++ names resolving (PR 11734, PR 12273, Keith Seitz). #=fedoratest -Patch048: gdb-physname-pr12273-test.patch +Patch047: gdb-physname-pr12273-test.patch # Test GDB opcodes/ disassembly of Intel Ivy Bridge instructions (BZ 696890). #=fedoratest -Patch049: gdb-test-ivy-bridge.patch +Patch048: gdb-test-ivy-bridge.patch # Hack for proper PIE run of the testsuite. #=fedoratest -Patch050: gdb-runtest-pie-override.patch +Patch049: gdb-runtest-pie-override.patch # Workaround PR libc/14166 for inferior calls of strstr. #=fedoratest: Compatibility with RHELs (unchecked which ones). -Patch051: gdb-glibc-strstr-workaround.patch +Patch050: gdb-glibc-strstr-workaround.patch # Include testcase for `Unable to see a variable inside a module (XLF)' (BZ 823789). #=fedoratest -Patch052: gdb-rhel5.9-testcase-xlf-var-inside-mod.patch +Patch051: gdb-rhel5.9-testcase-xlf-var-inside-mod.patch # Testcase for `Setting solib-absolute-prefix breaks vDSO' (BZ 818343). #=fedoratest -Patch053: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch +Patch052: 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 -Patch054: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch +Patch053: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch # Fix 'memory leak in infpy_read_memory()' (RH BZ 1007614) #=fedoratest -Patch055: gdb-rhbz1007614-memleak-infpy_read_memory-test.patch +Patch054: 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 -Patch056: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch +Patch055: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch # Display Fortran strings in backtraces. #=fedoratest -Patch057: gdb-fortran-frame-string.patch +Patch056: gdb-fortran-frame-string.patch # Testcase for '[SAP] Recursive dlopen causes SAP HANA installer to # crash.' (RH BZ 1156192). #=fedoratest -Patch058: gdb-rhbz1156192-recursive-dlopen-test.patch +Patch057: gdb-rhbz1156192-recursive-dlopen-test.patch # Fix '`catch syscall' doesn't work for parent after `fork' is called' # (Philippe Waroquiers, RH BZ 1149205). #=fedoratest -Patch059: gdb-rhbz1149205-catch-syscall-after-fork-test.patch +Patch058: 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 -Patch060: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch +Patch059: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch # Test 'info type-printers' Python error (RH BZ 1350436). #=fedoratest -Patch061: gdb-rhbz1350436-type-printers-error.patch +Patch060: gdb-rhbz1350436-type-printers-error.patch # Fix '[ppc64] and [s390x] wrong prologue skip on -O2 -g code' (Jan # Kratochvil, RH BZ 1084404). #=fedoratest -Patch062: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch +Patch061: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch # Force libncursesw over libncurses to match the includes (RH BZ 1270534). #=push+jan -Patch063: gdb-fedora-libncursesw.patch +Patch062: gdb-fedora-libncursesw.patch # Test clflushopt instruction decode (for RH BZ 1262471). #=fedoratest -Patch064: gdb-opcodes-clflushopt-test.patch +Patch063: gdb-opcodes-clflushopt-test.patch # [SCL] Skip deprecated .gdb_index warning for Red Hat built files (BZ 953585). #=push+jan -Patch065: gdb-6.6-buildid-locate-rpm-scl.patch +Patch064: gdb-6.6-buildid-locate-rpm-scl.patch # [aarch64] Fix hardware watchpoints (RH BZ 1261564). #=fedoratest -Patch066: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch +Patch065: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch # Add messages suggesting more recent RHEL gdbserver (RH BZ 1321114). #=fedora -Patch067: gdb-container-rh-pkg.patch +Patch066: gdb-container-rh-pkg.patch # New test for Python "Cannot locate object file for block" (for RH BZ 1325795). #=fedoratest -Patch068: gdb-rhbz1325795-framefilters-test.patch +Patch067: gdb-rhbz1325795-framefilters-test.patch # [dts+el7] [x86*] Bundle linux_perf.h for libipt (RH BZ 1256513). #=fedora -Patch069: gdb-linux_perf-bundle.patch +Patch068: gdb-linux_perf-bundle.patch # Fix gdb-headless /usr/bin/ executables (BZ 1390251). # @@ -292,24 +288,24 @@ Patch069: gdb-linux_perf-bundle.patch # # https://fedoraproject.org/wiki/Changes/Minimal_GDB_in_buildroot #=fedora -Patch070: gdb-libexec-add-index.patch +Patch069: gdb-libexec-add-index.patch # New testcase for: Fix -completion crash (Gary Benson, RH BZ 1398387). #=fedoratest -Patch071: gdb-rhbz1398387-tab-crash-test.patch +Patch070: gdb-rhbz1398387-tab-crash-test.patch # [s390x] Backport arch12 instructions decoding (RH BZ 1553104). # =fedoratest -Patch072: gdb-rhbz1553104-s390x-arch12-test.patch +Patch071: gdb-rhbz1553104-s390x-arch12-test.patch -Patch073: gdb-backport-readline_support.patch +Patch072: gdb-backport-readline_support.patch # [gdb/testsuite] Use prototype to call libc functions # (Tom de Vries) -Patch074: gdb-backport-fix-break-main-file-remove-fail.patch +Patch073: gdb-backport-fix-break-main-file-remove-fail.patch # Constify target_desc to fix PPC ODR violations. # (Keith Seitz, build/22395) -Patch075: gdb-sw22395-constify-target_desc.patch +Patch074: gdb-sw22395-constify-target_desc.patch diff --git a/_gdb.spec.patch.include b/_gdb.spec.patch.include index f5bd893..affe771 100644 --- a/_gdb.spec.patch.include +++ b/_gdb.spec.patch.include @@ -72,4 +72,3 @@ %patch072 -p1 %patch073 -p1 %patch074 -p1 -%patch075 -p1 diff --git a/_patch_order b/_patch_order index 21ab34f..bc9565c 100644 --- a/_patch_order +++ b/_patch_order @@ -1,7 +1,6 @@ gdb-6.3-rh-testversion-20041202.patch gdb-6.3-gstack-20050411.patch gdb-6.3-threaded-watchpoints2-20050225.patch -gdb-6.3-inheritancetest-20050726.patch gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch gdb-6.5-sharedlibrary-path.patch gdb-6.5-BEA-testsuite.patch diff --git a/gdb-6.3-inheritancetest-20050726.patch b/gdb-6.3-inheritancetest-20050726.patch deleted file mode 100644 index 6e12c82..0000000 --- a/gdb-6.3-inheritancetest-20050726.patch +++ /dev/null @@ -1,160 +0,0 @@ -From FEDORA_PATCHES Mon Sep 17 00:00:00 2001 -From: Jeff Johnston -Date: Fri, 27 Oct 2017 21:07:50 +0200 -Subject: gdb-6.3-inheritancetest-20050726.patch - -;; Verify printing of inherited members test -;;=fedoratest - -2005-07-26 Jeff Johnston - - * gdb.cp/b146835.exp: New testcase. - * gdb.cp/b146835.cc: Ditto. - * gdb.cp/b146835b.cc: Ditto. - * gdb.cp/b146835.h: Ditto. - -diff --git a/gdb/testsuite/gdb.cp/b146835.cc b/gdb/testsuite/gdb.cp/b146835.cc -new file mode 100644 ---- /dev/null -+++ b/gdb/testsuite/gdb.cp/b146835.cc -@@ -0,0 +1,31 @@ -+#include "b146835.h" -+#include -+ -+class F : public C { -+ -+protected: -+ -+ virtual void funcA (unsigned long a, B *b); -+ virtual void funcB (E *e); -+ virtual void funcC (unsigned long x, bool y); -+ -+ char *s1, *s2; -+ bool b1; -+ int k; -+ -+public: -+ void foo() { -+ std::cout << "foo" << std::endl; -+ } -+}; -+ -+ -+void F::funcA (unsigned long a, B *b) {} -+void F::funcB (E *e) {} -+void F::funcC (unsigned long x, bool y) {} -+ -+int main() -+{ -+ F f; -+ f.foo(); -+} -diff --git a/gdb/testsuite/gdb.cp/b146835.exp b/gdb/testsuite/gdb.cp/b146835.exp -new file mode 100644 ---- /dev/null -+++ b/gdb/testsuite/gdb.cp/b146835.exp -@@ -0,0 +1,47 @@ -+# 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. -+ -+# Check that GDB can properly print an inherited member variable -+# (Bugzilla 146835) -+ -+set testfile "b146835" -+set srcfile ${testfile}.cc -+set srcfile2 ${testfile}b.cc -+set binfile [standard_output_file ${testfile}] -+if {[gdb_compile "${srcdir}/${subdir}/${srcfile} ${srcdir}/${subdir}/${srcfile2}" "${binfile}" executable {debug c++}] != "" } { -+ 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 -+} -+ -+gdb_test "break 'F::foo()'" "" -+gdb_continue_to_breakpoint "First line foo" -+ -+# Verify that we can access the inherited member d -+gdb_test "p d" " = \\(D \\*\\) *0x0" "Verify inherited member d accessible" -diff --git a/gdb/testsuite/gdb.cp/b146835.h b/gdb/testsuite/gdb.cp/b146835.h -new file mode 100644 ---- /dev/null -+++ b/gdb/testsuite/gdb.cp/b146835.h -@@ -0,0 +1,36 @@ -+ -+class A { -+ -+protected: -+ -+ virtual void funcA (unsigned long a, class B *b) = 0; -+ virtual void funcB (class E *e) = 0; -+ virtual void funcC (unsigned long x, bool y) = 0; -+ -+ void funcD (class E *e, class D* d); -+ virtual void funcE (E *e, D *d); -+ virtual void funcF (unsigned long x, D *d); -+}; -+ -+ -+class C : public A { -+ -+protected: -+ -+ int x; -+ class K *k; -+ class H *h; -+ -+ D *d; -+ -+ class W *w; -+ class N *n; -+ class L *l; -+ unsigned long *r; -+ -+public: -+ -+ C(); -+ int z (char *s); -+ virtual ~C(); -+}; -diff --git a/gdb/testsuite/gdb.cp/b146835b.cc b/gdb/testsuite/gdb.cp/b146835b.cc -new file mode 100644 ---- /dev/null -+++ b/gdb/testsuite/gdb.cp/b146835b.cc -@@ -0,0 +1,11 @@ -+#include "b146835.h" -+ -+C::C() { d = 0; x = 3; } -+ -+int C::z (char *s) { return 0; } -+ -+C::~C() {} -+ -+void A::funcD (class E *e, class D *d) {} -+void A::funcE (E *e, D *d) {} -+void A::funcF (unsigned long x, D *d) {} diff --git a/gdb.spec b/gdb.spec index d34f193..db60cd0 100644 --- a/gdb.spec +++ b/gdb.spec @@ -1186,6 +1186,11 @@ fi %endif %changelog +* Wed Nov 23 2022 Kevin Buettner +- Remove gdb-6.3-inheritancetest-20050726.patch. Upstream testcase + gdb.cp/impl-this.exp tests the printing of an instance variable from + an inherited class in the "print c" test. + * Fri Nov 18 2022 Kevin Buettner - Remove gdb-6.3-test-movedir-20050125.patch. Upstream test gdb.base/fullname.exp provides coverage for this case and more.