diff --git a/_gdb.spec.Patch.include b/_gdb.spec.Patch.include index cfa47d0..6d3ff93 100644 --- a/_gdb.spec.Patch.include +++ b/_gdb.spec.Patch.include @@ -97,96 +97,92 @@ Patch023: gdb-simultaneous-step-resume-breakpoint-test.patch #=fedoratest: It should be in glibc: libc-alpha: <20091004161706.GA27450@.*> Patch024: 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. -Patch025: gdb-ccache-workaround.patch - # Testcase for "Do not make up line information" fix by Daniel Jacobowitz. #=fedoratest -Patch026: gdb-lineno-makeup-test.patch +Patch025: gdb-lineno-makeup-test.patch # Fix follow-exec for C++ programs (bugreported by Martin Stransky). #=fedoratest -Patch027: gdb-archer-next-over-throw-cxx-exec.patch +Patch026: gdb-archer-next-over-throw-cxx-exec.patch # Workaround librpm BZ 643031 due to its unexpected exit() calls (BZ 642879). #=push+jan -Patch028: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch +Patch027: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch # [delayed-symfile] Test a backtrace regression on CFIs without DIE (BZ 614604). #=fedoratest -Patch029: gdb-test-bt-cfi-without-die.patch +Patch028: gdb-test-bt-cfi-without-die.patch # Verify GDB Python built-in function gdb.solib_address exists (BZ # 634108). #=fedoratest -Patch030: gdb-bz634108-solib_address.patch +Patch029: gdb-bz634108-solib_address.patch # New test gdb.arch/x86_64-pid0-core.exp for kernel PID 0 cores (BZ 611435). #=fedoratest -Patch031: gdb-test-pid0-core.patch +Patch030: gdb-test-pid0-core.patch # [archer-tromey-delayed-symfile] New test gdb.dwarf2/dw2-aranges.exp. #=fedoratest -Patch032: gdb-test-dw2-aranges.patch +Patch031: gdb-test-dw2-aranges.patch # Workaround PR libc/14166 for inferior calls of strstr. #=fedoratest: Compatibility with RHELs (unchecked which ones). -Patch033: gdb-glibc-strstr-workaround.patch +Patch032: gdb-glibc-strstr-workaround.patch # Testcase for `Setting solib-absolute-prefix breaks vDSO' (BZ 818343). #=fedoratest -Patch034: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch +Patch033: 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 -Patch035: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch +Patch034: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch # Fix 'memory leak in infpy_read_memory()' (RH BZ 1007614) #=fedoratest -Patch036: gdb-rhbz1007614-memleak-infpy_read_memory-test.patch +Patch035: 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 -Patch037: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch +Patch036: 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 -Patch038: gdb-rhbz1156192-recursive-dlopen-test.patch +Patch037: gdb-rhbz1156192-recursive-dlopen-test.patch # Fix '`catch syscall' doesn't work for parent after `fork' is called' # (Philippe Waroquiers, RH BZ 1149205). #=fedoratest -Patch039: gdb-rhbz1149205-catch-syscall-after-fork-test.patch +Patch038: 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 -Patch040: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch +Patch039: 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 -Patch041: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch +Patch040: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch # Force libncursesw over libncurses to match the includes (RH BZ 1270534). #=push+jan -Patch042: gdb-fedora-libncursesw.patch +Patch041: gdb-fedora-libncursesw.patch # [aarch64] Fix hardware watchpoints (RH BZ 1261564). #=fedoratest -Patch043: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch +Patch042: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch # Add messages suggesting more recent RHEL gdbserver (RH BZ 1321114). #=fedora -Patch044: gdb-container-rh-pkg.patch +Patch043: gdb-container-rh-pkg.patch # [dts+el7] [x86*] Bundle linux_perf.h for libipt (RH BZ 1256513). #=fedora -Patch045: gdb-linux_perf-bundle.patch +Patch044: 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 @@ -200,24 +196,24 @@ Patch045: gdb-linux_perf-bundle.patch # https://fedoraproject.org/wiki/Changes/Minimal_GDB_in_buildroot # #=fedora -Patch046: gdb-add-index.patch +Patch045: gdb-add-index.patch # [s390x] Backport arch12 instructions decoding (RH BZ 1553104). # =fedoratest -Patch047: gdb-rhbz1553104-s390x-arch12-test.patch +Patch046: gdb-rhbz1553104-s390x-arch12-test.patch # [aarch64] Backport fix from Luis Machado for RH BZ 2177655. -Patch048: gdb-rhbz2177655-aarch64-pauth-valid-regcache.patch +Patch047: gdb-rhbz2177655-aarch64-pauth-valid-regcache.patch # Backport "Fix crash in inside_main_func" # (Tom Tromey, RHBZ 2183595) -Patch049: gdb-rhbz2183595-rustc-inside_main.patch +Patch048: gdb-rhbz2183595-rustc-inside_main.patch # Backport "Fix a potential illegal memory access in the BFD library..." # (Nick Clifton, binutils/29988) -Patch050: gdb-binutils29988-read_indexed_address.patch +Patch049: 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). -Patch051: gdb-rhbz2192105-ftbs-dangling-pointer +Patch050: gdb-rhbz2192105-ftbs-dangling-pointer diff --git a/_gdb.spec.patch.include b/_gdb.spec.patch.include index 161654d..f84adba 100644 --- a/_gdb.spec.patch.include +++ b/_gdb.spec.patch.include @@ -48,4 +48,3 @@ %patch -p1 -P048 %patch -p1 -P049 %patch -p1 -P050 -%patch -p1 -P051 diff --git a/_patch_order b/_patch_order index f789b6e..2ddd86b 100644 --- a/_patch_order +++ b/_patch_order @@ -22,7 +22,6 @@ gdb-6.5-section-num-fixup-test.patch gdb-6.8-bz466901-backtrace-full-prelinked.patch gdb-simultaneous-step-resume-breakpoint-test.patch gdb-core-open-vdso-warning.patch -gdb-ccache-workaround.patch gdb-lineno-makeup-test.patch gdb-archer-next-over-throw-cxx-exec.patch gdb-6.6-buildid-locate-rpm-librpm-workaround.patch diff --git a/gdb-ccache-workaround.patch b/gdb-ccache-workaround.patch deleted file mode 100644 index e6137f7..0000000 --- a/gdb-ccache-workaround.patch +++ /dev/null @@ -1,26 +0,0 @@ -From FEDORA_PATCHES Mon Sep 17 00:00:00 2001 -From: Fedora GDB patches -Date: Fri, 27 Oct 2017 21:07:50 +0200 -Subject: gdb-ccache-workaround.patch - -;; Workaround ccache making lineno non-zero for command-line definitions. -;;=fedoratest: ccache is rarely used and it is even fixed now. - -diff --git a/gdb/testsuite/gdb.base/macscp.exp b/gdb/testsuite/gdb.base/macscp.exp ---- a/gdb/testsuite/gdb.base/macscp.exp -+++ b/gdb/testsuite/gdb.base/macscp.exp -@@ -20,6 +20,14 @@ set objfile [standard_output_file ${testfile}.o] - - set options {debug macros additional_flags=-DFROM_COMMANDLINE=ARG} - -+# Workaround ccache making lineno non-zero for command-line definitions. -+if {[find_gcc] == "gcc" && [file executable "/usr/bin/gcc"]} { -+ set result [catch "exec which gcc" output] -+ if {$result == 0 && [string first "/ccache/" $output] > -1} { -+ lappend options "compiler=/usr/bin/gcc" -+ } -+} -+ - # Generate the intermediate object file. This is required by Darwin to - # have access to the .debug_macinfo section. - if {[gdb_compile "${srcdir}/${subdir}/macscp1.c" "${objfile}" \ diff --git a/gdb.spec b/gdb.spec index a4d6e8f..ca09465 100644 --- a/gdb.spec +++ b/gdb.spec @@ -1249,6 +1249,11 @@ fi %endif %changelog +* Tue May 16 2023 Andrew Burgess +- Remove gdb-ccache-workaround.patch. This patch works around + problems when using older versions of ccache, however, upstream GDB + now disables ccache during testing, see upstream commit 49b4de64242d. + * Tue May 16 2023 Andrew Burgess - Remove gdb-ppc-power7-test.patch, this patch is already covered by upstream tests gdb.arch/powerpc-*.exp.