gdb: update 16.x and add 17.1 host-gdb, requires libiconv on Debian 13

7 files changed, 58 insertions, 11 deletions

diff --git a/target/config/Config.in.gdb b/target/config/Config.in.gdb
index f1a09ca9e..e7b16d54d 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_16_2
+default ADK_TOOLCHAIN_GDB_17_1
 
 config ADK_TOOLCHAIN_GDB_GIT
 	bool "git"
@@ -33,8 +33,14 @@ config ADK_TOOLCHAIN_GDB_H8300_GIT
 	bool "h8300-git"
 	depends on ADK_TARGET_ARCH_H8300
 
-config ADK_TOOLCHAIN_GDB_16_2
-	bool "16.2"
+config ADK_TOOLCHAIN_GDB_17_1
+	bool "17.1"
+	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_H8300
+	depends on !ADK_TARGET_ARCH_NDS32
+
+config ADK_TOOLCHAIN_GDB_16_3
+	bool "16.3"
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_H8300
 	depends on !ADK_TARGET_ARCH_NDS32
diff --git a/toolchain/Makefile b/toolchain/Makefile
index c9e17c9cc..fb2834c9d 100644
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -42,8 +42,8 @@ endif
 ifeq ($(ADK_TOOLCHAIN_WITH_GDB),y)
 # disable gdb for some architectures
 ifeq ($(ADK_TARGET_ARCH_CR16)$(ADK_TARGET_ARCH_EPIPHANY)$(ADK_TARGET_ARCH_METAG)$(ADK_TARGET_ARCH_NDS32),)
-TARGETS+=expat gdb
-GDB:=expat-install gdb-install
+TARGETS+=libiconv expat gdb
+GDB:=libiconv-install expat-install gdb-install
 endif
 endif
 
diff --git a/toolchain/expat/Makefile.inc b/toolchain/expat/Makefile.inc
index b5b9f8932..bdef320c8 100644
--- a/toolchain/expat/Makefile.inc
+++ b/toolchain/expat/Makefile.inc
@@ -2,8 +2,8 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=		expat
-PKG_VERSION:=		2.7.1
+PKG_VERSION:=		2.7.3
 PKG_RELEASE:=		1
-PKG_HASH:=		0cce2e6e69b327fc607b8ff264f4b66bdf71ead55a87ffd5f3143f535f15cfa2
-PKG_SITES:=		https://github.com/libexpat/libexpat/releases/download/R_2_7_1/
+PKG_HASH:=		821ac9710d2c073eaf13e1b1895a9c9aa66c1157a99635c639fbff65cdbdd732
+PKG_SITES:=		https://github.com/libexpat/libexpat/releases/download/R_2_7_3/
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/toolchain/gdb/Makefile b/toolchain/gdb/Makefile
index 9d98e87bc..9d5b12e54 100644
--- a/toolchain/gdb/Makefile
+++ b/toolchain/gdb/Makefile
@@ -33,6 +33,7 @@ $(WRKBUILD)/.configured:
 		--with-mpfr='${STAGING_HOST_DIR}/usr' \
 		--with-expat \
 		--with-libexpat-prefix='${STAGING_HOST_DIR}/usr' \
+		--with-libiconv-prefix='${STAGING_HOST_DIR}/usr' \
 		--disable-dependency-tracking \
 		--without-uiout \
 		--enable-gdbmi \
diff --git a/toolchain/gdb/Makefile.inc b/toolchain/gdb/Makefile.inc
index e8e29d4c3..c0ec2d983 100644
--- a/toolchain/gdb/Makefile.inc
+++ b/toolchain/gdb/Makefile.inc
@@ -2,10 +2,17 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=		gdb
-ifeq ($(ADK_TOOLCHAIN_GDB_16_2),y)
-PKG_VERSION:=		16.2
+ifeq ($(ADK_TOOLCHAIN_GDB_17_1),y)
+PKG_VERSION:=		17.1
 PKG_RELEASE:=		1
-PKG_HASH:=		bdc1da4a033280ac752e7d34b0418efaa45bed093235cb88e62ea961752a37f8
+PKG_HASH:=		2b93c4c9726a4b8cfe771036e155377405dfa41c483d90945481319c5663c120
+PKG_SITES:=		${MASTER_SITE_GNU:=gdb/}
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+endif
+ifeq ($(ADK_TOOLCHAIN_GDB_16_3),y)
+PKG_VERSION:=		16.3
+PKG_RELEASE:=		1
+PKG_HASH:=		86015081217dc82c5485db9ce864dcc0b703759d2bdbe4441b095c5f900a6a37
 PKG_SITES:=		${MASTER_SITE_GNU:=gdb/}
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 endif
diff --git a/toolchain/libiconv/Makefile b/toolchain/libiconv/Makefile
new file mode 100644
index 000000000..8da551437
--- /dev/null
+++ b/toolchain/libiconv/Makefile
@@ -0,0 +1,24 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+include Makefile.inc
+include ../rules.mk
+include ${ADK_TOPDIR}/mk/buildhlp.mk
+
+$(WRKBUILD)/.configured:
+	(cd $(WRKBUILD); \
+		$(WRKBUILD)/configure \
+		--prefix=$(STAGING_HOST_DIR)/usr \
+	);
+	touch $@
+
+$(WRKBUILD)/.compiled: $(WRKBUILD)/.configured
+	$(MAKE) ${MPC_MAKEOPTS} -C $(WRKBUILD) all
+	touch $@
+
+$(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
+	$(MAKE) -C $(WRKBUILD) install
+	touch $@
+
+include ${ADK_TOPDIR}/mk/toolchain.mk
diff --git a/toolchain/libiconv/Makefile.inc b/toolchain/libiconv/Makefile.inc
new file mode 100644
index 000000000..bf6b569c5
--- /dev/null
+++ b/toolchain/libiconv/Makefile.inc
@@ -0,0 +1,9 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+PKG_NAME:=		libiconv
+PKG_VERSION:=		1.18
+PKG_RELEASE:=		1
+PKG_HASH:=		3b08f5f4f9b4eb82f151a7040bfd6fe6c6fb922efe4b1659c66ea933276965e8
+PKG_SITES:=		https://ftp.gnu.org/pub/gnu/libiconv/
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz