From 97e04ea21a34985e7d687c82fea496ca579ef062 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 10 Oct 2019 00:50:56 +0200
Subject: gdb: update to 8.3.1

---
 package/gdb/Makefile        |  4 ++--
 package/gdbserver/Makefile  |  2 +-
 target/config/Config.in.gdb | 16 +++-------------
 toolchain/gdb/Makefile.inc  | 11 ++---------
 4 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index 889f31116..14c272a42 100644
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -4,7 +4,7 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		gdb
-PKG_VERSION:=		8.2.1
+PKG_VERSION:=		8.3.1
 PKG_RELEASE:=		1
 PKG_HASH:=		0a6a432907a03c5c8eaad3c3cffd50c00a40c3a5e3c4039440624bae703f2202
 PKG_DESCR:=		programm debugger
@@ -14,7 +14,7 @@ PKG_DEPENDS:=		libncurses zlib libexpat libthread-db
 PKG_BUILDDEP:=		ncurses readline expat zlib
 PKG_NEEDS:=		c++
 
-PKG_ARCH_DEPENDS:=	!arc !cris !avr32 !nios2 !microblaze !or1k !riscv32 !riscv64
+PKG_ARCH_DEPENDS:=	!arc !cris !avr32 !nios2 !microblaze
 
 include ${ADK_TOPDIR}/mk/package.mk
 
diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile
index d0a9a7c57..ade93bcff 100644
--- a/package/gdbserver/Makefile
+++ b/package/gdbserver/Makefile
@@ -4,7 +4,7 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		gdbserver
-PKG_VERSION:=		8.2.1
+PKG_VERSION:=		8.3.1
 PKG_RELEASE:=		1
 PKG_HASH:=		0a6a432907a03c5c8eaad3c3cffd50c00a40c3a5e3c4039440624bae703f2202
 PKG_DESCR:=		remote programm debugger utility
diff --git a/target/config/Config.in.gdb b/target/config/Config.in.gdb
index d07a29ac1..bcac346ae 100644
--- a/target/config/Config.in.gdb
+++ b/target/config/Config.in.gdb
@@ -21,33 +21,23 @@ 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_RISCV_GIT if ADK_TARGET_ARCH_RISCV32
-default ADK_TOOLCHAIN_GDB_RISCV_GIT if ADK_TARGET_ARCH_RISCV64
-default ADK_TOOLCHAIN_GDB_8_2
+default ADK_TOOLCHAIN_GDB_8_3
 
 config ADK_TOOLCHAIN_GDB_GIT
 	bool "git"
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_H8300
 	depends on !ADK_TARGET_ARCH_NDS32
-	depends on !ADK_TARGET_ARCH_RISCV32
-	depends on !ADK_TARGET_ARCH_RISCV64
 
 config ADK_TOOLCHAIN_GDB_H8300_GIT
 	bool "h8300-git"
 	depends on ADK_TARGET_ARCH_H8300
 
-config ADK_TOOLCHAIN_GDB_RISCV_GIT
-	bool "riscv-git"
-	depends on ADK_TARGET_ARCH_RISCV32 || ADK_TARGET_ARCH_RISCV64
-
-config ADK_TOOLCHAIN_GDB_8_2
-	bool "8.2.1"
+config ADK_TOOLCHAIN_GDB_8_3
+	bool "8.3.1"
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_H8300
 	depends on !ADK_TARGET_ARCH_NDS32
-	depends on !ADK_TARGET_ARCH_RISCV32
-	depends on !ADK_TARGET_ARCH_RISCV64
 
 config ADK_TOOLCHAIN_GDB_6_7_1
 	bool "6.7.1"
diff --git a/toolchain/gdb/Makefile.inc b/toolchain/gdb/Makefile.inc
index 54d8f6202..c08c4c1b8 100644
--- a/toolchain/gdb/Makefile.inc
+++ b/toolchain/gdb/Makefile.inc
@@ -2,8 +2,8 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=		gdb
-ifeq ($(ADK_TOOLCHAIN_GDB_8_2),y)
-PKG_VERSION:=		8.2.1
+ifeq ($(ADK_TOOLCHAIN_GDB_8_3),y)
+PKG_VERSION:=		8.3.1
 PKG_RELEASE:=		1
 PKG_HASH:=		0a6a432907a03c5c8eaad3c3cffd50c00a40c3a5e3c4039440624bae703f2202
 PKG_SITES:=		${MASTER_SITE_GNU:=gdb/}
@@ -24,13 +24,6 @@ PKG_GIT:=		branch
 PKG_SITES:=		git://git.pf.osdn.jp/gitroot/y/ys/ysato/binutils_gdb.git
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 endif
-ifeq ($(ADK_TOOLCHAIN_GDB_RISCV_GIT),y)
-PKG_VERSION:=		riscv-gdb-8.1
-PKG_RELEASE:=		1
-PKG_GIT:=		branch
-PKG_SITES:=		https://github.com/riscv/riscv-binutils-gdb.git
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
-endif
 ifeq ($(ADK_TOOLCHAIN_GDB_GIT),y)
 PKG_VERSION:=		git
 PKG_RELEASE:=		1
-- 
cgit v1.2.3