diff options
-rw-r--r-- | target/config/Config.in.libc | 7 | ||||
-rw-r--r-- | toolchain/newlib/Makefile.inc | 7 | ||||
-rw-r--r-- | toolchain/newlib/patches/3.1.0/fix-tooldir.patch | 12 | ||||
-rw-r--r-- | toolchain/newlib/patches/git/fix-tooldir.patch | 12 | ||||
-rw-r--r-- | toolchain/newlib/patches/newlib-xtensa/fix-tooldir.patch | 12 |
5 files changed, 1 insertions, 49 deletions
diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc index ef851089a..ce244eac2 100644 --- a/target/config/Config.in.libc +++ b/target/config/Config.in.libc @@ -174,12 +174,7 @@ config ADK_TARGET_LIB_MUSL_GIT config ADK_TARGET_LIB_NEWLIB_4_4_0 bool "4.4.0" - depends on ADK_TARGET_LIB_NEWLIB \ - && !ADK_TARGET_ARCH_XTENSA - -config ADK_TARGET_LIB_NEWLIB_XTENSA - bool "xtensa" - depends on ADK_TARGET_LIB_NEWLIB && ADK_TARGET_ARCH_XTENSA + depends on ADK_TARGET_LIB_NEWLIB config ADK_TARGET_LIB_NEWLIB_GIT bool "git" diff --git a/toolchain/newlib/Makefile.inc b/toolchain/newlib/Makefile.inc index 889c6f9b5..c9ce3a2ad 100644 --- a/toolchain/newlib/Makefile.inc +++ b/toolchain/newlib/Makefile.inc @@ -15,10 +15,3 @@ PKG_HASH:= 0c166a39e1bf0951dfafcd68949fe0e4b6d3658081d6282f39aeefc6310f2f13 PKG_SITES:= ftp://sourceware.org/pub/newlib/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz endif -ifeq ($(ADK_TARGET_LIB_NEWLIB_XTENSA),y) -PKG_VERSION:= xtensa -PKG_GIT:= branch -PKG_RELEASE:= 1 -PKG_SITES:= https://github.com/jcmvbkbc/newlib-xtensa.git -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz -endif diff --git a/toolchain/newlib/patches/3.1.0/fix-tooldir.patch b/toolchain/newlib/patches/3.1.0/fix-tooldir.patch deleted file mode 100644 index 652f7494b..000000000 --- a/toolchain/newlib/patches/3.1.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 diff --git a/toolchain/newlib/patches/git/fix-tooldir.patch b/toolchain/newlib/patches/git/fix-tooldir.patch deleted file mode 100644 index 652f7494b..000000000 --- a/toolchain/newlib/patches/git/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 diff --git a/toolchain/newlib/patches/newlib-xtensa/fix-tooldir.patch b/toolchain/newlib/patches/newlib-xtensa/fix-tooldir.patch deleted file mode 100644 index 1ad0f373d..000000000 --- a/toolchain/newlib/patches/newlib-xtensa/fix-tooldir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur newlib-xtensa.orig/configure newlib-xtensa/configure ---- newlib-xtensa.orig/configure 2017-12-29 15:26:12.000000000 +0100 -+++ newlib-xtensa/configure 2017-12-29 15:35:01.420208845 +0100 -@@ -6847,7 +6847,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 |