From patchwork Thu Jun 22 15:57:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 6945 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Qn4lD58Tnz3wmZ for ; Thu, 22 Jun 2023 15:57:44 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Qn4lB0c61z2S4; Thu, 22 Jun 2023 15:57:42 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Qn4l94nyjz30GP; Thu, 22 Jun 2023 15:57:41 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Qn4l850xrz2xZG for ; Thu, 22 Jun 2023 15:57:40 +0000 (UTC) Received: from michael.haj.ipfire.org (michael.haj.ipfire.org [172.28.1.242]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "michael.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Qn4l82gFkz1Np; Thu, 22 Jun 2023 15:57:40 +0000 (UTC) Received: by michael.haj.ipfire.org (Postfix, from userid 0) id 4Qn4l81S3GzTgk7; Thu, 22 Jun 2023 15:57:40 +0000 (UTC) From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 3/3] gdb: Update to 13.2 Date: Thu, 22 Jun 2023 15:57:36 +0000 Message-Id: <20230622155736.2208-3-michael.tremer@ipfire.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230622155736.2208-1-michael.tremer@ipfire.org> References: <20230622155736.2208-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer Reviewed-by: Peter Müller --- config/rootfiles/common/gdb | 8 +++++-- lfs/gdb | 5 ++--- src/patches/gdb-readline8.2.patch | 35 ------------------------------- 3 files changed, 8 insertions(+), 40 deletions(-) delete mode 100644 src/patches/gdb-readline8.2.patch diff --git a/config/rootfiles/common/gdb b/config/rootfiles/common/gdb index e1f87549e..6a366ac7d 100644 --- a/config/rootfiles/common/gdb +++ b/config/rootfiles/common/gdb @@ -2,10 +2,14 @@ #usr/bin/gdb #usr/bin/gdb-add-index #usr/bin/gdbserver +#usr/bin/run #usr/include/gdb #usr/include/gdb/jit-reader.h +#usr/include/sim +#usr/include/sim/callback.h +#usr/include/sim/sim.h #usr/lib/libinproctrace.so -#usr/share/gdb +#usr/lib/libsim.a #usr/share/gdb/python #usr/share/gdb/python/gdb #usr/share/gdb/python/gdb/FrameDecorator.py @@ -20,6 +24,7 @@ #usr/share/gdb/python/gdb/command/type_printers.py #usr/share/gdb/python/gdb/command/unwinders.py #usr/share/gdb/python/gdb/command/xmethods.py +#usr/share/gdb/python/gdb/disassembler.py #usr/share/gdb/python/gdb/frames.py #usr/share/gdb/python/gdb/function #usr/share/gdb/python/gdb/function/__init__.py @@ -56,7 +61,6 @@ #usr/share/gdb/system-gdbinit/elinos.py #usr/share/gdb/system-gdbinit/wrs-linux.py #usr/share/info/annotate.info -#usr/share/info/ctf-spec.info #usr/share/info/gdb.info #usr/share/info/gdb.info-1 #usr/share/info/gdb.info-2 diff --git a/lfs/gdb b/lfs/gdb index bd5a57f29..f534774e0 100644 --- a/lfs/gdb +++ b/lfs/gdb @@ -24,7 +24,7 @@ include Config -VER = 12.1 +VER = 13.2 THISAPP = gdb-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 7f6f853d1640908cf2c79932cdc1ba02549a07721c005d9c7ce2946a715761719cc164a4e68235a18664ec8a029afe3a2a0cfb57e1635f280076d6bed91317fd +$(DL_FILE)_BLAKE2 = bf5216ba2286448a46f9e0a405367c5a678e6d7540204722d355b618018b7b75a2ebc5b51353304c5ded02a3979223a81781d305f5afa5be82516cdc2863d49f install : $(TARGET) @@ -70,7 +70,6 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gdb-readline8.2.patch cd $(DIR_APP) && mkdir -pv build cd $(DIR_APP)/build && \ ../configure \ diff --git a/src/patches/gdb-readline8.2.patch b/src/patches/gdb-readline8.2.patch deleted file mode 100644 index 93724b109..000000000 --- a/src/patches/gdb-readline8.2.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 1add37b567a7dee39d99f37b37802034c3fce9c4 Mon Sep 17 00:00:00 2001 -From: Andreas Schwab -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