gdb: update to 15.1, remove 12.1

5 files changed, 18 insertions, 28 deletions

diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index d9e4b91f5..b19d19716 100644
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		gdb
-PKG_VERSION:=		14.2
+PKG_VERSION:=		15.1
 PKG_RELEASE:=		1
-PKG_HASH:=		2d4dd8061d8ded12b6c63f55e45344881e8226105f4d2a9b234040efa5ce7772
+PKG_HASH:=		38254eacd4572134bca9c5a5aa4d4ca564cbbd30c369d881f733fb6b903354f2
 PKG_DESCR:=		program debugger
 PKG_SECTION:=		app/debug
 PKG_SITES:=		${MASTER_SITE_GNU:=gdb/}
diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile
index 5eb676517..40a2e4111 100644
--- a/package/gdbserver/Makefile
+++ b/package/gdbserver/Makefile
@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		gdbserver
-PKG_VERSION:=		14.2
+PKG_VERSION:=		15.1
 PKG_RELEASE:=		1
-PKG_HASH:=		2d4dd8061d8ded12b6c63f55e45344881e8226105f4d2a9b234040efa5ce7772
+PKG_HASH:=		38254eacd4572134bca9c5a5aa4d4ca564cbbd30c369d881f733fb6b903354f2
 PKG_DESCR:=		remote program debugger utility
 PKG_SECTION:=		app/debug
 PKG_NEEDS:=		c++
diff --git a/package/gdbserver/patches/patch-gdb_nat_fork-inferior_c b/package/gdbserver/patches/patch-gdb_nat_fork-inferior_c
deleted file mode 100644
index b1949c798..000000000
--- a/package/gdbserver/patches/patch-gdb_nat_fork-inferior_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- gdb-14.2.orig/gdb/nat/fork-inferior.c	2024-03-03 06:55:00.000000000 +0100
-+++ gdb-14.2/gdb/nat/fork-inferior.c	2024-03-22 17:02:35.981582750 +0100
-@@ -27,6 +27,7 @@
- #include "gdbsupport/pathstuff.h"
- #include "gdbsupport/signals-state-save-restore.h"
- #include "gdbsupport/gdb_tilde_expand.h"
-+#include "linux-ptrace.h"
- #include <vector>
- 
- extern char **environ;
diff --git a/target/config/Config.in.gdb b/target/config/Config.in.gdb
index c86930a30..d8daac66e 100644
--- a/target/config/Config.in.gdb
+++ b/target/config/Config.in.gdb
@@ -21,7 +21,7 @@ choice
 prompt "GNU debugger version"
 depends on ADK_TOOLCHAIN_WITH_GDB
 default ADK_TOOLCHAIN_GDB_H8300_GIT if ADK_TARGET_ARCH_H8300
-default ADK_TOOLCHAIN_GDB_14_2
+default ADK_TOOLCHAIN_GDB_15_1
 
 config ADK_TOOLCHAIN_GDB_GIT
 	bool "git"
@@ -33,20 +33,20 @@ config ADK_TOOLCHAIN_GDB_H8300_GIT
 	bool "h8300-git"
 	depends on ADK_TARGET_ARCH_H8300
 
-config ADK_TOOLCHAIN_GDB_14_2
-	bool "14.2"
+config ADK_TOOLCHAIN_GDB_15_1
+	bool "15.1"
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_H8300
 	depends on !ADK_TARGET_ARCH_NDS32
 
-config ADK_TOOLCHAIN_GDB_13_2
-	bool "13.2"
+config ADK_TOOLCHAIN_GDB_14_2
+	bool "14.2"
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_H8300
 	depends on !ADK_TARGET_ARCH_NDS32
 
-config ADK_TOOLCHAIN_GDB_12_1
-	bool "12.1"
+config ADK_TOOLCHAIN_GDB_13_2
+	bool "13.2"
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_H8300
 	depends on !ADK_TARGET_ARCH_NDS32
diff --git a/toolchain/gdb/Makefile.inc b/toolchain/gdb/Makefile.inc
index c38242eef..0262ff2e0 100644
--- a/toolchain/gdb/Makefile.inc
+++ b/toolchain/gdb/Makefile.inc
@@ -2,6 +2,13 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=		gdb
+ifeq ($(ADK_TOOLCHAIN_GDB_15_1),y)
+PKG_VERSION:=		15.1
+PKG_RELEASE:=		1
+PKG_HASH:=		8b61b0c2bdd9d9c83b113c9167866bdb474651d291fedcaa5eb7cde49bd47036
+PKG_SITES:=		${MASTER_SITE_GNU:=gdb/}
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+endif
 ifeq ($(ADK_TOOLCHAIN_GDB_14_2),y)
 PKG_VERSION:=		14.2
 PKG_RELEASE:=		1
@@ -16,13 +23,6 @@ PKG_HASH:=		7ead13d9e19fa0c57bb19104e1a5f67eefa9fc79f2e6360de491e8fddeda1e30
 PKG_SITES:=		${MASTER_SITE_GNU:=gdb/}
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 endif
-ifeq ($(ADK_TOOLCHAIN_GDB_12_1),y)
-PKG_VERSION:=		12.1
-PKG_RELEASE:=		1
-PKG_HASH:=		87296a3a9727356b56712c793704082d5df0ff36a34ca9ec9734fc9a8bdfdaab
-PKG_SITES:=		${MASTER_SITE_GNU:=gdb/}
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
-endif
 ifeq ($(ADK_TOOLCHAIN_GDB_6_7_1),y)
 PKG_VERSION:=		6.7.1
 PKG_RELEASE:=		1