From 70cdfe3a983037ad955aeb36134b6cee14b4f9ca Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Sat, 3 Feb 2018 20:09:20 +0000
Subject: [PATCH] newlib: update to 3.0.0

---
 target/config/Config.in.libc  | 14 ++++----------
 toolchain/newlib/Makefile.inc | 13 +++----------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc
index 2463d6bd9..05113204e 100644
--- a/target/config/Config.in.libc
+++ b/target/config/Config.in.libc
@@ -168,18 +168,13 @@ config ADK_TARGET_LIB_MUSL_GIT
 	bool "git"
 	depends on ADK_TARGET_LIB_MUSL
 
-config ADK_TARGET_LIB_NEWLIB_2_5_0
-	bool "2.5.0"
+config ADK_TARGET_LIB_NEWLIB_3_0_0
+	bool "3.0.0"
 	depends on ADK_TARGET_LIB_NEWLIB \
-		&& !ADK_TARGET_ARCH_RISCV \
 		&& !ADK_TARGET_ARCH_XTENSA \
 		&& !ADK_TARGET_OS_FROSTED \
 		&& !ADK_TARGET_OS_RTEMS
 
-config ADK_TARGET_LIB_NEWLIB_RISCV
-	bool "2.4.0-riscv"
-	depends on ADK_TARGET_LIB_NEWLIB && ADK_TARGET_ARCH_RISCV
-
 config ADK_TARGET_LIB_NEWLIB_XTENSA
 	bool "xtensa"
 	depends on ADK_TARGET_LIB_NEWLIB && ADK_TARGET_ARCH_XTENSA
@@ -190,7 +185,7 @@ config ADK_TARGET_LIB_NEWLIB_FROSTED
 
 config ADK_TARGET_LIB_NEWLIB_GIT
 	bool "git"
-	depends on ADK_TARGET_LIB_NEWLIB && !ADK_TARGET_ARCH_RISCV && !ADK_TARGET_OS_FROSTED
+	depends on ADK_TARGET_LIB_NEWLIB && !ADK_TARGET_OS_FROSTED
 
 endchoice
 
@@ -239,8 +234,7 @@ config ADK_LIBC_VERSION
 	default "1.0.28" if ADK_TARGET_LIB_UCLIBC_NG_1_0_28
 	default "1.1.18" if ADK_TARGET_LIB_MUSL_1_1_18
 	default "2.27" if ADK_TARGET_LIB_GLIBC_2_27
-	default "2.4.0" if ADK_TARGET_LIB_NEWLIB_2_4_0
-	default "2.4.0-riscv" if ADK_TARGET_LIB_NEWLIB_RISCV
+	default "3.0.0" if ADK_TARGET_LIB_NEWLIB_2_4_0
 	default "git" if ADK_TARGET_LIB_UCLIBC_NG_GIT || \
 		         ADK_TARGET_LIB_MUSL_GIT || \
 		         ADK_TARGET_LIB_GLIBC_GIT || \
diff --git a/toolchain/newlib/Makefile.inc b/toolchain/newlib/Makefile.inc
index ca97e5660..fb74b9f73 100644
--- a/toolchain/newlib/Makefile.inc
+++ b/toolchain/newlib/Makefile.inc
@@ -8,20 +8,13 @@ PKG_RELEASE:=		1
 PKG_SITES:=		git://sourceware.org/git/newlib-cygwin.git
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 endif
-ifeq ($(ADK_TARGET_LIB_NEWLIB_2_5_0),y)
-PKG_VERSION:=		2.5.0
+ifeq ($(ADK_TARGET_LIB_NEWLIB_3_0_0),y)
+PKG_VERSION:=		3.0.0
 PKG_RELEASE:=		1
-PKG_HASH:=		5b76a9b97c9464209772ed25ce55181a7bb144a66e5669aaec945aa64da3189b
+PKG_HASH:=		c8566335ee74e5fcaeb8595b4ebd0400c4b043d6acb3263ecb1314f8f5501332
 PKG_SITES:=		ftp://sourceware.org/pub/newlib/
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 endif
-ifeq ($(ADK_TARGET_LIB_NEWLIB_RISCV),y)
-PKG_VERSION:=		riscv-newlib-2.4.0
-PKG_GIT:=		branch
-PKG_RELEASE:=		1
-PKG_SITES:=		https://github.com/riscv/riscv-newlib.git
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
-endif
 ifeq ($(ADK_TARGET_LIB_NEWLIB_XTENSA),y)
 PKG_VERSION:=		xtensa
 PKG_GIT:=		branch
-- 
2.11.4.GIT