3 files changed, 51 insertions, 9 deletions
diff --git a/toolchain/gdb/Makefile b/toolchain/gdb/Makefile
index 5f46cb926..9d98e87bc 100644
--- a/toolchain/gdb/Makefile
+++ b/toolchain/gdb/Makefile
@@ -29,7 +29,10 @@ $(WRKBUILD)/.configured:
 		--build=$(GNU_HOST_NAME) \
 		--host=$(GNU_HOST_NAME) \
 		--target=$(GNU_TARGET_NAME) \
-		--with-libgmp-prefix='${STAGING_HOST_DIR}/usr' \
+		--with-gmp='${STAGING_HOST_DIR}/usr' \
+		--with-mpfr='${STAGING_HOST_DIR}/usr' \
+		--with-expat \
+		--with-libexpat-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 c38242eef..e8e29d4c3 100644
--- a/toolchain/gdb/Makefile.inc
+++ b/toolchain/gdb/Makefile.inc
@@ -2,6 +2,20 @@
 # 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
+PKG_RELEASE:=		1
+PKG_HASH:=		bdc1da4a033280ac752e7d34b0418efaa45bed093235cb88e62ea961752a37f8
+PKG_SITES:=		${MASTER_SITE_GNU:=gdb/}
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+endif
+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 +30,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
@@ -35,7 +42,7 @@ ifeq ($(ADK_TOOLCHAIN_GDB_H8300_GIT),y)
 PKG_VERSION:=		ysato-h8300
 PKG_RELEASE:=		1
 PKG_GIT:=		branch
-PKG_SITES:=		git://git.pf.osdn.jp/gitroot/y/ys/ysato/binutils_gdb.git
+PKG_SITES:=		https://github.com/ysat0/binutils-gdb.git
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 endif
 ifeq ($(ADK_TOOLCHAIN_GDB_GIT),y)
diff --git a/toolchain/gdb/patches/ysato-h8300/no_extern_inline.patch b/toolchain/gdb/patches/ysato-h8300/no_extern_inline.patch
new file mode 100644
index 000000000..bbae1d774
--- /dev/null
+++ b/toolchain/gdb/patches/ysato-h8300/no_extern_inline.patch
@@ -0,0 +1,32 @@
+--- a/sim/common/sim-arange.c
++++ b/sim/common/sim-arange.c
+@@ -280,11 +280,7 @@ sim_addr_range_delete (ADDR_RANGE *ar, a
+   build_search_tree (ar);
+ }
+ 
+-#endif /* DEFINE_NON_INLINE_P */
+-
+-#if DEFINE_INLINE_P
+-
+-SIM_ARANGE_INLINE int
++int
+ sim_addr_range_hit_p (ADDR_RANGE *ar, address_word addr)
+ {
+   ADDR_RANGE_TREE *t = ar->range_tree;
+@@ -301,4 +297,4 @@ sim_addr_range_hit_p (ADDR_RANGE *ar, ad
+   return 0;
+ }
+ 
+-#endif /* DEFINE_INLINE_P */
++#endif /* DEFINE_NON_INLINE_P */
+--- a/sim/common/sim-arange.h
++++ b/sim/common/sim-arange.h
+@@ -62,7 +62,7 @@ extern void sim_addr_range_delete (ADDR_
+ 
+ /* Return non-zero if ADDR is in range AR, traversing the entire tree.
+    If no range is specified, that is defined to mean "everything".  */
+-extern INLINE int
++extern int
+ sim_addr_range_hit_p (ADDR_RANGE * /*ar*/, address_word /*addr*/);
+ #define ADDR_RANGE_HIT_P(ar, addr) \
+   ((ar)->range_tree == NULL || sim_addr_range_hit_p ((ar), (addr)))