diff --git a/_gdb.spec.Patch.include b/_gdb.spec.Patch.include index 1f92711..f92273a 100644 --- a/_gdb.spec.Patch.include +++ b/_gdb.spec.Patch.include @@ -192,34 +192,30 @@ Patch045: gdb-rhbz1149205-catch-syscall-after-fork-test.patch #=fedoratest Patch046: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch -# Test 'info type-printers' Python error (RH BZ 1350436). -#=fedoratest -Patch047: gdb-rhbz1350436-type-printers-error.patch - # Fix '[ppc64] and [s390x] wrong prologue skip on -O2 -g code' (Jan # Kratochvil, RH BZ 1084404). #=fedoratest -Patch048: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch +Patch047: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch # Force libncursesw over libncurses to match the includes (RH BZ 1270534). #=push+jan -Patch049: gdb-fedora-libncursesw.patch +Patch048: gdb-fedora-libncursesw.patch # Test clflushopt instruction decode (for RH BZ 1262471). #=fedoratest -Patch050: gdb-opcodes-clflushopt-test.patch +Patch049: gdb-opcodes-clflushopt-test.patch # [aarch64] Fix hardware watchpoints (RH BZ 1261564). #=fedoratest -Patch051: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch +Patch050: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch # Add messages suggesting more recent RHEL gdbserver (RH BZ 1321114). #=fedora -Patch052: gdb-container-rh-pkg.patch +Patch051: gdb-container-rh-pkg.patch # [dts+el7] [x86*] Bundle linux_perf.h for libipt (RH BZ 1256513). #=fedora -Patch053: gdb-linux_perf-bundle.patch +Patch052: gdb-linux_perf-bundle.patch # Fix gdb-headless /usr/bin/ executables (BZ 1390251). # @@ -228,9 +224,9 @@ Patch053: gdb-linux_perf-bundle.patch # # https://fedoraproject.org/wiki/Changes/Minimal_GDB_in_buildroot #=fedora -Patch054: gdb-libexec-add-index.patch +Patch053: gdb-libexec-add-index.patch # [s390x] Backport arch12 instructions decoding (RH BZ 1553104). # =fedoratest -Patch055: gdb-rhbz1553104-s390x-arch12-test.patch +Patch054: gdb-rhbz1553104-s390x-arch12-test.patch diff --git a/_gdb.spec.patch.include b/_gdb.spec.patch.include index cb3143d..cd6769a 100644 --- a/_gdb.spec.patch.include +++ b/_gdb.spec.patch.include @@ -52,4 +52,3 @@ %patch052 -p1 %patch053 -p1 %patch054 -p1 -%patch055 -p1 diff --git a/_patch_order b/_patch_order index 2c86855..311cf24 100644 --- a/_patch_order +++ b/_patch_order @@ -44,7 +44,6 @@ 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-rhbz1350436-type-printers-error.patch gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch gdb-fedora-libncursesw.patch gdb-opcodes-clflushopt-test.patch diff --git a/gdb-rhbz1350436-type-printers-error.patch b/gdb-rhbz1350436-type-printers-error.patch deleted file mode 100644 index 3322327..0000000 --- a/gdb-rhbz1350436-type-printers-error.patch +++ /dev/null @@ -1,83 +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-rhbz1350436-type-printers-error.patch - -;; Test 'info type-printers' Python error (RH BZ 1350436). -;;=fedoratest - -Typo in Python support breaks info type-printers command -https://bugzilla.redhat.com/show_bug.cgi?id=1350436 - -[testsuite patch] PR python/17136: 'info type-printers' causes an exception when there are per-objfile printers -https://sourceware.org/ml/gdb-patches/2016-06/msg00455.html - -diff --git a/gdb/testsuite/gdb.python/py-typeprint.cc b/gdb/testsuite/gdb.python/py-typeprint.cc ---- a/gdb/testsuite/gdb.python/py-typeprint.cc -+++ b/gdb/testsuite/gdb.python/py-typeprint.cc -@@ -31,6 +31,12 @@ templ s; - - basic_string bs; - -+class Other -+{ -+}; -+ -+Other ovar; -+ - int main() - { - return 0; -diff --git a/gdb/testsuite/gdb.python/py-typeprint.exp b/gdb/testsuite/gdb.python/py-typeprint.exp ---- a/gdb/testsuite/gdb.python/py-typeprint.exp -+++ b/gdb/testsuite/gdb.python/py-typeprint.exp -@@ -50,3 +50,7 @@ gdb_test_no_output "enable type-printer string" - gdb_test "whatis bs" "string" "whatis with enabled printer" - - gdb_test "whatis s" "templ" -+ -+gdb_test "info type-printers" "Type printers for \[^\r\n\]*/py-typeprint:\r\n *other\r\n.*" \ -+ "info type-printers for other" -+gdb_test "whatis ovar" "type = Another" -diff --git a/gdb/testsuite/gdb.python/py-typeprint.py b/gdb/testsuite/gdb.python/py-typeprint.py ---- a/gdb/testsuite/gdb.python/py-typeprint.py -+++ b/gdb/testsuite/gdb.python/py-typeprint.py -@@ -15,8 +15,7 @@ - - import gdb - -- --class Recognizer(object): -+class StringRecognizer(object): - def __init__(self): - self.enabled = True - -@@ -32,7 +31,27 @@ class StringTypePrinter(object): - self.enabled = True - - def instantiate(self): -- return Recognizer() -+ return StringRecognizer() - - - gdb.type_printers.append(StringTypePrinter()) -+ -+class OtherRecognizer(object): -+ def __init__(self): -+ self.enabled = True -+ -+ def recognize(self, type_obj): -+ if type_obj.tag == 'Other': -+ return 'Another' -+ return None -+ -+class OtherTypePrinter(object): -+ def __init__(self): -+ self.name = 'other' -+ self.enabled = True -+ -+ def instantiate(self): -+ return OtherRecognizer() -+ -+import gdb.types -+gdb.types.register_type_printer(gdb.objfiles()[0], OtherTypePrinter()) diff --git a/gdb.spec b/gdb.spec index 2255a2d..06b52c7 100644 --- a/gdb.spec +++ b/gdb.spec @@ -1192,6 +1192,9 @@ fi %endif %changelog +* Mon Mar 20 2023 Bruno Larsen +- Remove gdb-rhbz1350436-type-printers-error.patch since it is upstreamed. + * Wed Mar 8 2023 Kevin Buettner - 13.1-1 - Rebase to FSF GDB 13.1. - Update gdb-6.3-rh-testversion-20041202.patch.