[rpms/gdb] gdb-17.2-rebase-f44: Rebase to FSF GDB 14.2.

[rpms/gdb] gdb-17.2-rebase-f44: Rebase to FSF GDB 14.2.

[@ 2026-06-28 0:01 UTC (permalink / raw)]

A new commit has been pushed.

Repo   : rpms/gdb
Branch : gdb-17.2-rebase-f44
Commit : 779f05edda7a3bd6e42e018a7874dcbf53473949
Author : Alexandra Hájková <ahajkova@redhat.com>
Date   : 2024-03-07T12:05:44+01:00
Stats  : +10/-231 in 9 file(s)
URL    : https://src.fedoraproject.org/rpms/gdb/c/779f05edda7a3bd6e42e018a7874dcbf53473949?branch=gdb-17.2-rebase-f44

Log:
Rebase to FSF GDB 14.2.

---
diff --git a/.gitignore b/.gitignore
index 57c00b4..bc31c5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 /new-fedora-release
 /gdb-libstdc++-v3-python-8.1.1-20180626.tar.xz
 /v2.0.5.tar.gz
-/gdb-14.1.tar.xz
+/gdb-14.2.tar.xz

diff --git a/_gdb.spec.Patch.include b/_gdb.spec.Patch.include
index e4aaebc..7a222d6 100644
--- a/_gdb.spec.Patch.include
+++ b/_gdb.spec.Patch.include
@@ -189,16 +189,10 @@ Patch043: gdb-rhbz2250652-gdbpy_gil.patch
 
 Patch044: gdb-rhbz2250652-avoid-PyOS_ReadlineTState.patch
 
-# Backport potential fix for RH BZ 2257562.
-Patch045: gdb-rhbz2257562-cp-namespace-null-ptr-check.patch
 
-
-Patch046: gdb-ftbs-swapped-calloc-args.patch
-
-# Backport gdb: fix "list ." related crash
-Patch047: gdb-rhbz2259850-list-period-crash-fix.patch
+Patch045: gdb-ftbs-swapped-calloc-args.patch
 
 # Backport upstream workaround for GCC 14 problem which cause assertion
 # failures in GDB.
-Patch048: gdb-rhbz2261580-intrusive_list-assertion-fix.patch
+Patch046: gdb-rhbz2261580-intrusive_list-assertion-fix.patch
 

diff --git a/_gdb.spec.patch.include b/_gdb.spec.patch.include
index ef55dd0..80df31a 100644
--- a/_gdb.spec.patch.include
+++ b/_gdb.spec.patch.include
@@ -44,5 +44,3 @@
 %patch -p1 -P044
 %patch -p1 -P045
 %patch -p1 -P046
-%patch -p1 -P047
-%patch -p1 -P048

diff --git a/_git_upstream_commit b/_git_upstream_commit
index 3d8eec6..b70cde9 100644
--- a/_git_upstream_commit
+++ b/_git_upstream_commit
@@ -1 +1 @@
-6bda1c19bcd16eff8488facb8a67d52a436f70e7
+02c10eaecb63e5dbb99cbfdd1c5385e53ed031ff

diff --git a/_patch_order b/_patch_order
index aadb6e3..77122be 100644
--- a/_patch_order
+++ b/_patch_order
@@ -42,7 +42,5 @@ gdb-rhbz-2232086-generate-gdb-index-consistently.patch
 gdb-rhbz-2232086-generate-dwarf-5-index-consistently.patch
 gdb-rhbz2250652-gdbpy_gil.patch
 gdb-rhbz2250652-avoid-PyOS_ReadlineTState.patch
-gdb-rhbz2257562-cp-namespace-null-ptr-check.patch
 gdb-ftbs-swapped-calloc-args.patch
-gdb-rhbz2259850-list-period-crash-fix.patch
 gdb-rhbz2261580-intrusive_list-assertion-fix.patch

diff --git a/gdb-rhbz2257562-cp-namespace-null-ptr-check.patch b/gdb-rhbz2257562-cp-namespace-null-ptr-check.patch
deleted file mode 100644
index f868e6f..0000000
--- a/gdb-rhbz2257562-cp-namespace-null-ptr-check.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Kevin Buettner <kevinb@redhat.com>
-Date: Tue, 16 Jan 2024 20:07:53 -0700
-Subject: gdb-rhbz2257562-cp-namespace-null-ptr-check.patch
-
-;; Backport potential fix for RH BZ 2257562.
-
-Fix printing of global variable stubs if no inferior is running
-
-Since 3c45e9f915ae4aeab7312d6fc55a947859057572 gdb crashes when trying
-to print a global variable stub without a running inferior, because of
-a missing nullptr-check (the block_scope function took care of that
-check before it was converted to a method).
-
-With this check it works again:
-```
-(gdb) print s
-$1 = <incomplete type>
-```
-
-Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31128
-Approved-By: Tom Tromey <tom@tromey.com>
-(cherry picked from commit 576745e26c0ec76a53ba45b20af464628a50b3e4)
-
-diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c
---- a/gdb/cp-namespace.c
-+++ b/gdb/cp-namespace.c
-@@ -1026,7 +1026,11 @@ cp_lookup_transparent_type (const char *name)
- 
-   /* If that doesn't work and we're within a namespace, look there
-      instead.  */
--  scope = get_selected_block (0)->scope ();
-+  const block *block = get_selected_block (0);
-+  if (block == nullptr)
-+    return nullptr;
-+
-+  scope = block->scope ();
- 
-   if (scope[0] == '\0')
-     return NULL;
-diff --git a/gdb/testsuite/gdb.cp/print-global-stub.cc b/gdb/testsuite/gdb.cp/print-global-stub.cc
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.cp/print-global-stub.cc
-@@ -0,0 +1,31 @@
-+/* This testcase is part of GDB, the GNU debugger.
-+
-+   Copyright 2023 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/>.  */
-+
-+struct S
-+{
-+  S (int);
-+  virtual ~S ();
-+
-+  int m_i;
-+};
-+
-+S s (5);
-+
-+int main ()
-+{
-+  return 0;
-+}
-diff --git a/gdb/testsuite/gdb.cp/print-global-stub.exp b/gdb/testsuite/gdb.cp/print-global-stub.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.cp/print-global-stub.exp
-@@ -0,0 +1,32 @@
-+# Copyright (C) 2023 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/>.
-+
-+# This file is part of the GDB testsuite.
-+# It tests printing of a global stub without inferior.
-+
-+require allow_cplus_tests
-+
-+standard_testfile .cc
-+set objfile [standard_output_file ${testfile}.o]
-+
-+if { [gdb_compile $srcdir/$subdir/$srcfile $objfile object \
-+	  {c++ debug}] != "" } {
-+    untested "failed to compile"
-+    return -1
-+}
-+
-+clean_restart $objfile
-+
-+gdb_test "print s" " = <incomplete type>"

diff --git a/gdb-rhbz2259850-list-period-crash-fix.patch b/gdb-rhbz2259850-list-period-crash-fix.patch
deleted file mode 100644
index 0606e66..0000000
--- a/gdb-rhbz2259850-list-period-crash-fix.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Guinevere Larsen <blarsen@redhat.com>
-Date: Mon, 22 Jan 2024 10:13:52 +0100
-Subject: gdb-rhbz2259850-list-period-crash-fix.patch
-
-;; Backport gdb: fix "list ." related crash
-
-When a user attempts to use the "list ." command with an inferior that
-doesn't have debug symbols, GDB would crash. This was reported as PR
-gdb/31256.
-
-The crash would happen when attempting to get the current symtab_and_line
-for the stop location, because the symtab would return a null pointer
-and we'd attempt to dereference it to print the line.
-
-This commit fixes that by checking for an empty symtab and erroring out
-of the function if it happens.
-
-Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31256
-Approved-By: Tom Tromey <tom@tromey.com>
-
-diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
---- a/gdb/cli/cli-cmds.c
-+++ b/gdb/cli/cli-cmds.c
-@@ -1291,6 +1291,8 @@ list_command (const char *arg, int from_tty)
- 	      set_default_source_symtab_and_line ();
- 	      cursal = get_current_source_symtab_and_line ();
- 	    }
-+	  if (cursal.symtab == nullptr)
-+	    error (_("No debug information available to print source lines."));
- 	  list_around_line (arg, cursal);
- 	  /* Set the repeat args so just pressing "enter" after using "list ."
- 	     will print the following lines instead of the same lines again. */
-diff --git a/gdb/testsuite/gdb.base/list-nodebug.c b/gdb/testsuite/gdb.base/list-nodebug.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/list-nodebug.c
-@@ -0,0 +1,21 @@
-+/* This testcase is part of GDB, the GNU debugger.
-+
-+   Copyright 2024 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/>.  */
-+
-+int main ()
-+{
-+    return 0;
-+}
-diff --git a/gdb/testsuite/gdb.base/list-nodebug.exp b/gdb/testsuite/gdb.base/list-nodebug.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/list-nodebug.exp
-@@ -0,0 +1,37 @@
-+# Copyright 2024 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/>.
-+
-+# Test that using the command "list" in a file with no debug information
-+# will not crash GDB and will give reasonable output.
-+
-+standard_testfile .c
-+
-+if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
-+    {nodebug}]} {
-+    return -1
-+}
-+
-+if {![runto_main]} {
-+    untested "couldn't run to main"
-+    return
-+}
-+
-+# Check that GDB doesn't crash when we use list . on an inferior with
-+# no debug information
-+gdb_test "list ." "No debug.*" "first 'list .'"
-+# This should be called twice because the first list invocation since
-+# printing a frame may take a different codepath, which wouldn't
-+# trigger the crash.
-+gdb_test "list ." "No debug.*" "second 'list .'"

diff --git a/gdb.spec b/gdb.spec
index de10094..af9f93b 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -53,11 +53,11 @@ Name: %{?scl_prefix}gdb
 # See timestamp of source gnulib installed into gnulib/ .
 %global snapgnulib 20220501
 %global tarname gdb-%{version}
-Version: 14.1
+Version: 14.2
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 10%{?dist}
+Release: 1%{?dist}
 
 License: GPL-3.0-or-later AND BSD-3-Clause AND FSFAP AND LGPL-2.1-or-later AND GPL-2.0-or-later AND LGPL-2.0-or-later AND LicenseRef-Fedora-Public-Domain AND GFDL-1.3-or-later AND LGPL-2.0-or-later WITH GCC-exception-2.0 AND GPL-3.0-or-later WITH GCC-exception-3.1 AND GPL-2.0-or-later WITH GNU-compiler-exception
 # Do not provide URL for snapshots as the file lasts there only for 2 days.
@@ -1250,6 +1250,9 @@ fi
 %endif
 
 %changelog
+* Wed Mar 6 2024 Alexandra Hájková <ahajkova@redhat.com> - 14.2-1
+- Rebase to FSF GDB 14.2.
+
 * Mon Mar 4 2024 Alexandra Hájková <ahajkova@redhat.com> - 14.1-10
 - Replace zlib to zlib-ng package in a debug-toolset-binary Fedora CI
   test (RHBZ 2266910).

diff --git a/sources b/sources
index 960a489..25677ac 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (gdb-libstdc++-v3-python-8.1.1-20180626.tar.xz) = a8b1c54dd348cfeb37da73f968742896be3dd13a4215f8d8519870c2abea915f5176c3fa6989ddd10f20020a16f0fab20cbae68ee8d58a82234d8778023520f8
 SHA512 (v2.0.5.tar.gz) = 2e7ac2aede84671b15597d9c56dbe077a81357bbf44b6684802592246fb7729b4a5743238ddf02f6ea143b4d29872f581408135f9c1ea1ccc99dab905916d98d
-SHA512 (gdb-14.1.tar.xz) = 575e198105076fc4a88f68591aa114ab9c1196e84386a3f7b9b58fe5f30cdeed33f6a5f957b68f08c47284ec922bb60c964627e238471419673fd913575ce427
+SHA512 (gdb-14.2.tar.xz) = 7e07941f1fe661288cc571b4964012ceabc1760624fce20320db2f470c01439b2386f859b5288da13204b758e2e3b22a74c68c012178db93b9529b06f1e22ede