diff options
| -rw-r--r-- | target/config/Config.in.libc | 6 | ||||
| -rw-r--r-- | toolchain/newlib/Makefile.inc | 6 | ||||
| -rw-r--r-- | toolchain/newlib/patches/3.1.0/fix-tooldir.patch (renamed from toolchain/newlib/patches/3.0.0/fix-tooldir.patch) | 0 | ||||
| -rw-r--r-- | toolchain/newlib/patches/riscv-newlib-2.4.0/fix-tooldir.patch | 12 |
4 files changed, 6 insertions, 18 deletions
diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc index fe9a8135a..6287a6e22 100644 --- a/target/config/Config.in.libc +++ b/target/config/Config.in.libc @@ -167,8 +167,8 @@ config ADK_TARGET_LIB_MUSL_GIT bool "git" depends on ADK_TARGET_LIB_MUSL && ADK_EXPERIMENTAL -config ADK_TARGET_LIB_NEWLIB_3_0_0 - bool "3.0.0" +config ADK_TARGET_LIB_NEWLIB_3_1_0 + bool "3.1.0" depends on ADK_TARGET_LIB_NEWLIB \ && !ADK_TARGET_ARCH_XTENSA @@ -201,7 +201,7 @@ config ADK_LIBC_VERSION default "1.0.32" if ADK_TARGET_LIB_UCLIBC_NG_1_0_32 default "1.1.23" if ADK_TARGET_LIB_MUSL_1_1_23 default "2.30" if ADK_TARGET_LIB_GLIBC_2_30 - default "3.0.0" if ADK_TARGET_LIB_NEWLIB_3_0_0 + default "3.1.0" if ADK_TARGET_LIB_NEWLIB_3_1_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 d01745a93..8d8c3ff00 100644 --- a/toolchain/newlib/Makefile.inc +++ b/toolchain/newlib/Makefile.inc @@ -8,10 +8,10 @@ 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_3_0_0),y) -PKG_VERSION:= 3.0.0 +ifeq ($(ADK_TARGET_LIB_NEWLIB_3_1_0),y) +PKG_VERSION:= 3.1.0 PKG_RELEASE:= 1 -PKG_HASH:= c8566335ee74e5fcaeb8595b4ebd0400c4b043d6acb3263ecb1314f8f5501332 +PKG_HASH:= fb4fa1cc21e9060719208300a61420e4089d6de6ef59cf533b57fe74801d102a PKG_SITES:= ftp://sourceware.org/pub/newlib/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz endif diff --git a/toolchain/newlib/patches/3.0.0/fix-tooldir.patch b/toolchain/newlib/patches/3.1.0/fix-tooldir.patch index 652f7494b..652f7494b 100644 --- a/toolchain/newlib/patches/3.0.0/fix-tooldir.patch +++ b/toolchain/newlib/patches/3.1.0/fix-tooldir.patch diff --git a/toolchain/newlib/patches/riscv-newlib-2.4.0/fix-tooldir.patch b/toolchain/newlib/patches/riscv-newlib-2.4.0/fix-tooldir.patch deleted file mode 100644 index 652f7494b..000000000 --- a/toolchain/newlib/patches/riscv-newlib-2.4.0/fix-tooldir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur newlib-2.2.0-1.orig/configure newlib-2.2.0-1/configure ---- newlib-2.2.0-1.orig/configure 2014-07-05 23:09:07.000000000 +0200 -+++ newlib-2.2.0-1/configure 2015-11-25 06:33:11.461178398 +0100 -@@ -6985,7 +6985,7 @@ - - # Some systems (e.g., one of the i386-aix systems the gas testers are - # using) don't handle "\$" correctly, so don't use it here. --tooldir='${exec_prefix}'/${target_noncanonical} -+tooldir='${exec_prefix}' - build_tooldir=${tooldir} - - # Create a .gdbinit file which runs the one in srcdir |