gdb: Bump to 13.1

packages/gdb/build.sh

@@ -4,14 +4,14 @@ TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 # This package depends on libpython${TERMUX_PYTHON_VERSION}.so.
 # Please revbump and rebuild when bumping TERMUX_PYTHON_VERSION.
-TERMUX_PKG_VERSION=12.1
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=13.1
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gdb/gdb-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=0e1793bf8f2b54d53f46dea84ccfd446f48f81b297b28c4f7fc017b818d69fed
-TERMUX_PKG_DEPENDS="libc++, liblzma, libexpat, readline, ncurses, libmpfr, python, zlib, libthread-db"
+TERMUX_PKG_SHA256=115ad5c18d69a6be2ab15882d365dda2a2211c14f480b3502c6eba576e2e95a0
+TERMUX_PKG_DEPENDS="libc++, libexpat, libiconv, liblzma, libmpfr, libthread-db, ncurses, python, readline, zlib, zstd"
 TERMUX_PKG_BREAKS="gdb-dev"
 TERMUX_PKG_REPLACES="gdb-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+--disable-shared
 --disable-werror
 --with-system-readline
 --with-curses
@@ -37,3 +37,7 @@ termux_step_pre_configure() {
 
 	LDFLAGS+=" $($CC -print-libgcc-file-name)"
 }
+
+termux_step_post_make_install() {
+	install -Dm700 -t $TERMUX_PREFIX/bin gdbserver/gdbserver
+}

packages/gdb/gdb-12.1-readline-8.2.patch

@@ -1,38 +0,0 @@
-https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=1add37b567a7dee39d99f37b37802034c3fce9c4
-
-From 1add37b567a7dee39d99f37b37802034c3fce9c4 Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@linux-m68k.org>
-Date: Sun, 20 Mar 2022 14:01:54 +0100
-Subject: [PATCH] Add support for readline 8.2
-
-In readline 8.2 the type of rl_completer_word_break_characters changed to
-include const.
----
- gdb/completer.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gdb/completer.c b/gdb/completer.c
-index d3900ae2014..a51c16ac7f8 100644
---- a/gdb/completer.c
-+++ b/gdb/completer.c
-@@ -36,7 +36,7 @@
-    calling a hook instead so we eliminate the CLI dependency.  */
- #include "gdbcmd.h"
- 
--/* Needed for rl_completer_word_break_characters() and for
-+/* Needed for rl_completer_word_break_characters and for
-    rl_filename_completion_function.  */
- #include "readline/readline.h"
- 
-@@ -2011,7 +2011,7 @@ gdb_completion_word_break_characters_throw ()
-       rl_basic_quote_characters = NULL;
-     }
- 
--  return rl_completer_word_break_characters;
-+  return (char *) rl_completer_word_break_characters;
- }
- 
- char *
--- 
-2.31.1
-

packages/gdb/gdb-aarch64-linux-nat.c.patch

@@ -0,0 +1,22 @@
+--- a/gdb/aarch64-linux-nat.c
++++ b/gdb/aarch64-linux-nat.c
+@@ -445,7 +445,8 @@
+   gdb_assert (regno != -1);
+   gdb_assert (tdep->tls_register_count > 0);
+ 
+-  uint64_t tpidrs[tdep->tls_register_count] = { 0 };
++  uint64_t tpidrs[tdep->tls_register_count];
++  memset (tpidrs, 0, sizeof (tpidrs));
+   struct iovec iovec;
+   iovec.iov_base = tpidrs;
+   iovec.iov_len = sizeof (tpidrs);
+@@ -471,7 +472,8 @@
+   gdb_assert (regno != -1);
+   gdb_assert (tdep->tls_register_count > 0);
+ 
+-  uint64_t tpidrs[tdep->tls_register_count] = { 0 };
++  uint64_t tpidrs[tdep->tls_register_count];
++  memset (tpidrs, 0, sizeof (tpidrs));
+ 
+   for (int i = 0; i < tdep->tls_register_count; i++)
+     {

packages/gdb/gdbserver.subpackage.sh

@@ -0,0 +1,9 @@
+TERMUX_SUBPKG_INCLUDE="
+bin/gdbserver
+share/man/man1/gdbserver.*
+"
+TERMUX_SUBPKG_DESCRIPTION="The gdbserver program"
+TERMUX_SUBPKG_DEPENDS="libc++, libthread-db"
+TERMUX_SUBPKG_DEPEND_ON_PARENT=no
+TERMUX_SUBPKG_BREAKS="gdb (<< 13.1)"
+TERMUX_SUBPKG_REPLACES="gdb (<< 13.1)"