From bc42e9e27d37fd9d8998a1a440f390e517ae90ed Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbrodkorb@conet.de>
Date: Fri, 1 Jun 2018 07:25:59 +0200
Subject: [PATCH] riscv: use github fork until upstream

---
 package/{gdb => gdb-riscv}/Makefile | 15 +++++----------
 package/gdb/Makefile                |  2 +-
 target/config/Config.in.gdb         | 10 ++++++++++
 toolchain/gdb/Makefile.inc          |  7 +++++++
 4 files changed, 23 insertions(+), 11 deletions(-)
 copy package/{gdb => gdb-riscv}/Makefile (75%)

diff --git a/package/gdb/Makefile b/package/gdb-riscv/Makefile
similarity index 75%
copy from package/gdb/Makefile
copy to package/gdb-riscv/Makefile
index 1a121c7e7..e73baf80b 100644
--- a/package/gdb/Makefile
+++ b/package/gdb-riscv/Makefile
@@ -4,25 +4,22 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		gdb
-PKG_VERSION:=		8.1
+PKG_VERSION:=		riscv-gdb-8.1
+PKG_GIT:=		branch
 PKG_RELEASE:=		1
-PKG_HASH:=		af61a0263858e69c5dce51eab26662ff3d2ad9aa68da9583e8143b5426be4b34
 PKG_DESCR:=		programm debugger
 PKG_SECTION:=		app/debug
-PKG_SITES:=		${MASTER_SITE_GNU:=gdb/}
+PKG_HASH:=		605954d5747d5f08ea4b7f48e958d1ebbf39265e18f7f36738deeabb83744485
 PKG_DEPENDS:=		libncurses zlib libexpat libthread-db
 PKG_BUILDDEP:=		ncurses readline expat zlib
-PKG_NEEDS:=		c++
+PKG_SITES:=		https://github.com/riscv/riscv-binutils-gdb.git
 
-PKG_ARCH_DEPENDS:=	!cris !avr32 !nios2 !microblaze !or1k
+PKG_ARCH_DEPENDS:=	riscv32 riscv64
 
 include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-XAKE_FLAGS+=		MAKEINFO=true
-
-# --enable-static is required to build libbfd.a
 CONFIGURE_ARGS+=	--enable-static \
 			--without-uiout \
 			--disable-tui \
@@ -30,14 +27,12 @@ CONFIGURE_ARGS+=	--enable-static \
 			--disable-gdbserver \
 			--without-x \
 			--disable-sim \
-			--disable-plugins \
 			--disable-werror \
 			--without-python \
 			--without-included-gettext \
 			--without-auto-load-safe-path \
 			--disable-install-libiberty \
 			--disable-install-libbfd \
-			--with-system-zlib \
 			--with-curses \
 			--enable-gdbmi
 
diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index 1a121c7e7..c739e2472 100644
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -14,7 +14,7 @@ PKG_DEPENDS:=		libncurses zlib libexpat libthread-db
 PKG_BUILDDEP:=		ncurses readline expat zlib
 PKG_NEEDS:=		c++
 
-PKG_ARCH_DEPENDS:=	!cris !avr32 !nios2 !microblaze !or1k
+PKG_ARCH_DEPENDS:=	!cris !avr32 !nios2 !microblaze !or1k !riscv32 !riscv64
 
 include ${ADK_TOPDIR}/mk/package.mk
 
diff --git a/target/config/Config.in.gdb b/target/config/Config.in.gdb
index bdc7c462e..00e12c62a 100644
--- a/target/config/Config.in.gdb
+++ b/target/config/Config.in.gdb
@@ -21,6 +21,8 @@ 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_1
 
 config ADK_TOOLCHAIN_GDB_GIT
@@ -28,16 +30,24 @@ config ADK_TOOLCHAIN_GDB_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_1
 	bool "8.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 7fc31eea2..ca3a57f3e 100644
--- a/toolchain/gdb/Makefile.inc
+++ b/toolchain/gdb/Makefile.inc
@@ -24,6 +24,13 @@ 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
-- 
2.11.4.GIT