gdb: Upgrade to 16.3

Add couple of readline patches to fix build with internal readline

Other Changes

* PR symtab/32309 ([gdb/symtab, fission] gdb/dwarf2/read.h:289:
internal-error: version: Assertion `m_dwarf_version != 0' failed)

 * PR corefiles/32441 (gdb segfaults when generating a core file if
target_fileio_read_alloc fails)

 * PR tui/32623 (TUI console window doesn't update while inferior is running)

 * PR corefiles/32634 ([gdb/corefiles] segfault in
gdb.arch/i386-biarch-core.exp)

 * PR backtrace/32757 ("Assertion `stashed' failed" when inline frame #0 is
duplicated)

 * PR tdep/32770 ([gdb/tdep, i386] FAIL: gdb.reverse/recvmsg-reverse.exp:
continue to breakpoint: marker2)

 * PR gdb/32775 ([AArch64] gdbserver crashes on SVE/SME-enabled systems)

 * PR record/32784 ([gdb/record, aarch64] Stack smashing detected in
aarch64_record_asimd_load_store)

 * PR tui/32797 (Escape sequences to only reset foreground or background color
to default fail)

 * PR gdb/32828 (gstack regression: missing file names and line numbers)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_16.2.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_16.3.bb
similarity index 100%
rename from meta/recipes-devtools/gdb/gdb-cross-canadian_16.2.bb
rename to meta/recipes-devtools/gdb/gdb-cross-canadian_16.3.bb

diff --git a/meta/recipes-devtools/gdb/gdb-cross_16.2.bb b/meta/recipes-devtools/gdb/gdb-cross_16.3.bb
similarity index 100%
rename from meta/recipes-devtools/gdb/gdb-cross_16.2.bb
rename to meta/recipes-devtools/gdb/gdb-cross_16.3.bb

diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc
index 1ac29b45f6853249a358b1c14e2e7010a197db30..a36f78fe6727dd0c44998e9b0ba3db172413815c 100644 (file)
--- a/meta/recipes-devtools/gdb/gdb.inc
+++ b/meta/recipes-devtools/gdb/gdb.inc
@@ -12,5 +12,7 @@ SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \
            file://0005-Change-order-of-CFLAGS.patch \
            file://0006-Fix-invalid-sigprocmask-call.patch \
            file://0007-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \
+           file://0008-Add-fix-for-packages-that-are-not-compatible-with-C2.patch \
+           file://0009-Readline-8.3-alpha-release.patch \
            "
-SRC_URI[sha256sum] = "4002cb7f23f45c37c790536a13a720942ce4be0402d929c9085e92f10d480119"
+SRC_URI[sha256sum] = "bcfcd095528a987917acf9fff3f1672181694926cc18d609c99d0042c00224c5"

diff --git a/meta/recipes-devtools/gdb/gdb/0001-mips-linux-nat-Define-_ABIO32-if-not-defined.patch b/meta/recipes-devtools/gdb/gdb/0001-mips-linux-nat-Define-_ABIO32-if-not-defined.patch
index 5e313a08b21b0c6e899f6d770fb642f4f11575bb..7a3064a14bb752bbd5cd6d400107ff3b5a22d622 100644 (file)
--- a/meta/recipes-devtools/gdb/gdb/0001-mips-linux-nat-Define-_ABIO32-if-not-defined.patch
+++ b/meta/recipes-devtools/gdb/gdb/0001-mips-linux-nat-Define-_ABIO32-if-not-defined.patch
@@ -1,4 +1,4 @@
-From 31c6c42479e750aff3130e76bae2646c418cb548 Mon Sep 17 00:00:00 2001
+From 8448967d9cfb09eb11fd3573a72a35ae94a89ba1 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 23 Mar 2016 06:30:09 +0000
 Subject: [PATCH] mips-linux-nat: Define _ABIO32 if not defined

diff --git a/meta/recipes-devtools/gdb/gdb/0002-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/meta/recipes-devtools/gdb/gdb/0002-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
index 69d4d51af08d71d8d1295c26cb9c9ce2bd58e3e7..56cbacf384881e3744cef55354a90f0bda9fe44f 100644 (file)
--- a/meta/recipes-devtools/gdb/gdb/0002-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
+++ b/meta/recipes-devtools/gdb/gdb/0002-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
@@ -1,4 +1,4 @@
-From 8f350f9b7b3934bd492cad35e1b6e44d142313a4 Mon Sep 17 00:00:00 2001
+From ec49e6283bc6a4a99596410db9509bee6cd941ce Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 30 Apr 2016 18:32:14 -0700
 Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems
@@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  2 files changed, 12 insertions(+)
 
 diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h
-index b51e2278f4b..f1bc07df0e9 100644
+index 3efc1b9a9bf..635d07486de 100644
 --- a/gdb/nat/ppc-linux.h
 +++ b/gdb/nat/ppc-linux.h
 @@ -18,7 +18,13 @@
@@ -30,7 +30,7 @@ index b51e2278f4b..f1bc07df0e9 100644
  
  /* This sometimes isn't defined.  */
 diff --git a/gdbserver/linux-ppc-low.cc b/gdbserver/linux-ppc-low.cc
-index bd3ac143660..1c8c0b3a98e 100644
+index 3ce978f4c7c..38534297cdf 100644
 --- a/gdbserver/linux-ppc-low.cc
 +++ b/gdbserver/linux-ppc-low.cc
 @@ -22,7 +22,13 @@

diff --git a/meta/recipes-devtools/gdb/gdb/0003-Dont-disable-libreadline.a-when-using-disable-static.patch b/meta/recipes-devtools/gdb/gdb/0003-Dont-disable-libreadline.a-when-using-disable-static.patch
index 0f7f38786622ed5ea2e3f37fecfbe6ef6beda8a8..024cf34427cb66b62b302fbf489c4cc2cc326ec4 100644 (file)
--- a/meta/recipes-devtools/gdb/gdb/0003-Dont-disable-libreadline.a-when-using-disable-static.patch
+++ b/meta/recipes-devtools/gdb/gdb/0003-Dont-disable-libreadline.a-when-using-disable-static.patch
@@ -1,4 +1,4 @@
-From c4102e4fd74804b053c437352ef92c64c8b1fdbf Mon Sep 17 00:00:00 2001
+From 2fa91dec5f0ec5663861ca53bde8951e48557bb3 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 30 Apr 2016 15:25:03 -0700
 Subject: [PATCH] Dont disable libreadline.a when using --disable-static

diff --git a/meta/recipes-devtools/gdb/gdb/0004-use-asm-sgidefs.h.patch b/meta/recipes-devtools/gdb/gdb/0004-use-asm-sgidefs.h.patch
index 6dee5037dafc9278b89c3bb9e3dad4b27b822a51..556f371fee0af4579f533075b03c8f800be27f7c 100644 (file)
--- a/meta/recipes-devtools/gdb/gdb/0004-use-asm-sgidefs.h.patch
+++ b/meta/recipes-devtools/gdb/gdb/0004-use-asm-sgidefs.h.patch
@@ -1,4 +1,4 @@
-From 91e294b399c8e3de2cbdd495309f31b6a218516d Mon Sep 17 00:00:00 2001
+From 6d37100388d45185a6e88ea7099a698c2c76b084 Mon Sep 17 00:00:00 2001
 From: Andre McCurdy <amccurdy@gmail.com>
 Date: Sat, 30 Apr 2016 15:29:06 -0700
 Subject: [PATCH] use <asm/sgidefs.h>

diff --git a/meta/recipes-devtools/gdb/gdb/0005-Change-order-of-CFLAGS.patch b/meta/recipes-devtools/gdb/gdb/0005-Change-order-of-CFLAGS.patch
index 6d5d3a7e4f91a9221a9e09cfa22ce53544ea087f..809cd232aaa41586c2dca0d35b1377373e1d9cdf 100644 (file)
--- a/meta/recipes-devtools/gdb/gdb/0005-Change-order-of-CFLAGS.patch
+++ b/meta/recipes-devtools/gdb/gdb/0005-Change-order-of-CFLAGS.patch
@@ -1,4 +1,4 @@
-From c151a90c6df7a8b31fe0a6c4d6d28aaff55ac25f Mon Sep 17 00:00:00 2001
+From e7cab417080f3454ea984e19384d9f1bf9e48fba Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 30 Apr 2016 15:35:39 -0700
 Subject: [PATCH] Change order of CFLAGS
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in
-index 6148ccf9121..3ad15573923 100644
+index 365dcf23650..fc16218334f 100644
 --- a/gdbserver/Makefile.in
 +++ b/gdbserver/Makefile.in
 @@ -174,6 +174,7 @@ INTERNAL_CFLAGS = \

diff --git a/meta/recipes-devtools/gdb/gdb/0006-Fix-invalid-sigprocmask-call.patch b/meta/recipes-devtools/gdb/gdb/0006-Fix-invalid-sigprocmask-call.patch
index a256b8fc6826187d96fd8b09e16644a4497b1d66..7c9129b9f5707597cfed5f15829ec2046310ba4b 100644 (file)
--- a/meta/recipes-devtools/gdb/gdb/0006-Fix-invalid-sigprocmask-call.patch
+++ b/meta/recipes-devtools/gdb/gdb/0006-Fix-invalid-sigprocmask-call.patch
@@ -1,4 +1,4 @@
-From f63dddf6b986642eeeefa27176d59780e1681ddd Mon Sep 17 00:00:00 2001
+From 13e61d515b74389e61fa52ca43656f9d1c294683 Mon Sep 17 00:00:00 2001
 From: Yousong Zhou <yszhou4tech@gmail.com>
 Date: Fri, 24 Mar 2017 10:36:03 +0800
 Subject: [PATCH] Fix invalid sigprocmask call

diff --git a/meta/recipes-devtools/gdb/gdb/0007-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch b/meta/recipes-devtools/gdb/gdb/0007-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch
index dcc01e414cc1ef20651370d213c84b2a3405adb7..d8816e3bef221658f8407442214d3a820f75b455 100644 (file)
--- a/meta/recipes-devtools/gdb/gdb/0007-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch
+++ b/meta/recipes-devtools/gdb/gdb/0007-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch
@@ -1,4 +1,4 @@
-From f1b4a90ea61771840fcf4889f616b156b5157843 Mon Sep 17 00:00:00 2001
+From 3d3d91ac1db8ee7f624d225734cb5b57b752e00b Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sun, 15 Jan 2023 00:16:25 -0800
 Subject: [PATCH] Define alignof using _Alignof when using C11 or newer

diff --git a/meta/recipes-devtools/gdb/gdb/0008-Add-fix-for-packages-that-are-not-compatible-with-C2.patch b/meta/recipes-devtools/gdb/gdb/0008-Add-fix-for-packages-that-are-not-compatible-with-C2.patch
new file mode 100644 (file)
index 0000000..661eb26
--- /dev/null
+++ b/meta/recipes-devtools/gdb/gdb/0008-Add-fix-for-packages-that-are-not-compatible-with-C2.patch
@@ -0,0 +1,29 @@
+From f71cfa9db1a196f0fadb2090ac04ce3164e171d3 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 16 Mar 2025 12:48:46 -0700
+Subject: [PATCH] Add fix for packages that are not compatible with C23
+
+Fixes builds with GCC-15
+Sourced from Fedora: https://src.fedoraproject.org/rpms/readline/c/c47eb813afb942128253213ad5b8221770557e48?branch=rawhide
+
+Help getting packages like bluez5 building
+
+Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bug-readline/2025-03/msg00001.html]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ readline/readline/rlstdc.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/readline/readline/rlstdc.h b/readline/readline/rlstdc.h
+index 2aaa30babfb..a7a0ef30428 100644
+--- a/readline/readline/rlstdc.h
++++ b/readline/readline/rlstdc.h
+@@ -44,7 +44,7 @@
+ 
+ /* Moved from config.h.in because readline.h:rl_message depends on these
+    defines. */
+-#if defined (__STDC__) && defined (HAVE_STDARG_H)
++#if defined (__STDC__)
+ #  define PREFER_STDARG
+ #  define USE_VARARGS
+ #else

diff --git a/meta/recipes-devtools/gdb/gdb/0009-Readline-8.3-alpha-release.patch b/meta/recipes-devtools/gdb/gdb/0009-Readline-8.3-alpha-release.patch
new file mode 100644 (file)
index 0000000..206b4ba
--- /dev/null
+++ b/meta/recipes-devtools/gdb/gdb/0009-Readline-8.3-alpha-release.patch
@@ -0,0 +1,164 @@
+From 8807681557d9f30aac819186369ee62f4f8d1d96 Mon Sep 17 00:00:00 2001
+From: Chet Ramey <chet.ramey@case.edu>
+Date: Mon, 22 Apr 2024 10:41:37 -0400
+Subject: [PATCH] Readline-8.3-alpha release
+
+Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/readline.git/commit/tcap.h?h=readline-8.3-testing&id=69e5c5e4c9778bf86c3d1c6b058ddece70854de8]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ ...ap-Add-function-parameter-prototypes.patch | 37 ++++++++++
+ ...d=cef614441f99b7b6e444ba601d8465a6e88f5a98 | 67 +++++++++++++++++++
+ readline/readline/tcap.h                      | 14 ++--
+ 3 files changed, 111 insertions(+), 7 deletions(-)
+ create mode 100644 readline/readline/0001-tcap-Add-function-parameter-prototypes.patch
+ create mode 100644 readline/readline/index.html?id=cef614441f99b7b6e444ba601d8465a6e88f5a98
+
+diff --git a/readline/readline/0001-tcap-Add-function-parameter-prototypes.patch b/readline/readline/0001-tcap-Add-function-parameter-prototypes.patch
+new file mode 100644
+index 00000000000..f28e31fd0e0
+--- /dev/null
++++ b/readline/readline/0001-tcap-Add-function-parameter-prototypes.patch
+@@ -0,0 +1,37 @@
++From 0c16af6ebf0bf81138c973e5e6a7c4ebf71f2489 Mon Sep 17 00:00:00 2001
++From: Khem Raj <raj.khem@gmail.com>
++Date: Wed, 30 Apr 2025 10:41:12 -0700
++Subject: [PATCH] tcap: Add function parameter prototypes
++
++GCC-15 with C23 dilect defaults expects full function signature
++
++Signed-off-by: Khem Raj <raj.khem@gmail.com>
++---
++ readline/readline/tcap.h | 14 ++++++--------
++ 1 file changed, 6 insertions(+), 8 deletions(-)
++
++diff --git a/readline/readline/tcap.h b/readline/readline/tcap.h
++index 859e6ee..2b22ff7 100644
++--- a/readline/readline/tcap.h
+++++ b/readline/readline/tcap.h
++@@ -46,14 +46,12 @@ extern char *UP, *BC;
++ 
++ extern short ospeed;
++ 
++-extern int tgetent ();
++-extern int tgetflag ();
++-extern int tgetnum ();
++-extern char *tgetstr ();
++-
++-extern int tputs ();
++-
++-extern char *tgoto ();
+++extern int tgetent(char*, const char*);
+++extern int tgetflag(const char*);
+++extern int tgetnum(const char*);
+++extern char *tgetstr(const char*, char**);
+++extern char *tgoto(const char*, int, int);
+++extern int tputs(const char*, int, int (*)(int));
++ 
++ #endif /* HAVE_TERMCAP_H */
++ 
+diff --git a/readline/readline/index.html?id=cef614441f99b7b6e444ba601d8465a6e88f5a98 b/readline/readline/index.html?id=cef614441f99b7b6e444ba601d8465a6e88f5a98
+new file mode 100644
+index 00000000000..02e665b143b
+--- /dev/null
++++ b/readline/readline/index.html?id=cef614441f99b7b6e444ba601d8465a6e88f5a98
+@@ -0,0 +1,67 @@
++From cef614441f99b7b6e444ba601d8465a6e88f5a98 Mon Sep 17 00:00:00 2001
++From: Chet Ramey <chet.ramey@case.edu>
++Date: Sun, 14 Jan 2024 15:19:37 -0500
++Subject: Readline-8.2 patch 8: add missing function prototypes
++
++---
++ bind.c     | 4 +---
++ patchlevel | 2 +-
++ rltty.c    | 3 +--
++ text.c     | 3 +--
++ 4 files changed, 4 insertions(+), 8 deletions(-)
++
++diff --git a/bind.c b/bind.c
++index 971116a..2596006 100644
++--- a/bind.c
+++++ b/bind.c
++@@ -1167,9 +1167,7 @@ _rl_init_file_error (va_alist)
++ /* **************************************************************** */
++ 
++ static int
++-parse_comparison_op (s, indp)
++-     const char *s;
++-     int *indp;
+++parse_comparison_op (const char *s, int *indp)
++ {
++   int i, peekc, op;
++ 
++diff --git a/patchlevel b/patchlevel
++index e340b58..6c10f12 100644
++--- a/patchlevel
+++++ b/patchlevel
++@@ -1,3 +1,3 @@
++ # Do not edit -- exists only for use by patch
++ 
++-7
+++8
++diff --git a/rltty.c b/rltty.c
++index 882a3d4..a4863ac 100644
++--- a/rltty.c
+++++ b/rltty.c
++@@ -80,8 +80,7 @@ static int ksrflow;
++ /* Dummy call to force a backgrounded readline to stop before it tries
++    to get the tty settings. */
++ static void
++-set_winsize (tty)
++-     int tty;
+++set_winsize (int tty)
++ {
++ #if defined (TIOCGWINSZ)
++   struct winsize w;
++diff --git a/text.c b/text.c
++index 91c3f33..30fdaa1 100644
++--- a/text.c
+++++ b/text.c
++@@ -1764,8 +1764,7 @@ _rl_char_search (int count, int fdir, int bdir)
++ 
++ #if defined (READLINE_CALLBACKS)
++ static int
++-_rl_char_search_callback (data)
++-     _rl_callback_generic_arg *data;
+++_rl_char_search_callback (_rl_callback_generic_arg *data)
++ {
++   _rl_callback_func = 0;
++   _rl_want_redisplay = 1;
++-- 
++cgit v1.1
++
+diff --git a/readline/readline/tcap.h b/readline/readline/tcap.h
+index 859e6eed5aa..467ea60e903 100644
+--- a/readline/readline/tcap.h
++++ b/readline/readline/tcap.h
+@@ -1,6 +1,6 @@
+ /* tcap.h -- termcap library functions and variables. */
+ 
+-/* Copyright (C) 1996-2015 Free Software Foundation, Inc.
++/* Copyright (C) 1996-2015,2023 Free Software Foundation, Inc.
+ 
+    This file is part of the GNU Readline Library (Readline), a library
+    for reading lines of text with interactive input and history editing.      
+@@ -46,14 +46,14 @@ extern char *UP, *BC;
+ 
+ extern short ospeed;
+ 
+-extern int tgetent ();
+-extern int tgetflag ();
+-extern int tgetnum ();
+-extern char *tgetstr ();
++extern int tgetent (char *, const char *);
++extern int tgetflag (const char *);
++extern int tgetnum (const char *);
++extern char *tgetstr (const char *, char **);
+ 
+-extern int tputs ();
++extern int tputs (const char *, int, int (*)(int));
+ 
+-extern char *tgoto ();
++extern char *tgoto (const char *, int, int);
+ 
+ #endif /* HAVE_TERMCAP_H */
+ 

diff --git a/meta/recipes-devtools/gdb/gdb_16.2.bb b/meta/recipes-devtools/gdb/gdb_16.3.bb
similarity index 100%
rename from meta/recipes-devtools/gdb/gdb_16.2.bb
rename to meta/recipes-devtools/gdb/gdb_16.3.bb