From 1aeb77b9ee8c0843f194aee66a9aa387eeee4235 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 10 Jul 2014 19:16:09 +0000 Subject: [PATCH] toolchain: only default eglibc for octeon and not all of mips64 Signed-off-by: John Crispin SVN-Revision: 41559 --- toolchain/Config.in | 6 +++--- toolchain/gcc/Config.in | 2 +- toolchain/gcc/Config.version | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index 7deda1e2c309..637d539452ad 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -203,7 +203,7 @@ comment "C Library" choice prompt "C Library implementation" if TOOLCHAINOPTS - default LIBC_USE_EGLIBC if mips64 + default LIBC_USE_EGLIBC if octeon default LIBC_USE_UCLIBC help Select the C library implementation. @@ -250,11 +250,11 @@ config INSIGHT config USE_EGLIBC bool - default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && mips64 + default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && octeon config USE_UCLIBC bool - default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && !mips64 + default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && !octeon config USE_MUSL bool diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index 0c07796c532f..97c74dec4d1b 100644 --- a/toolchain/gcc/Config.in +++ b/toolchain/gcc/Config.in @@ -3,7 +3,7 @@ choice prompt "GCC compiler Version" if TOOLCHAINOPTS default GCC_USE_VERSION_4_4_7 if avr32 - default GCC_USE_VERSION_4_6_LINARO if mips64 + default GCC_USE_VERSION_4_6_LINARO if octeon default GCC_USE_VERSION_4_8_LINARO help Select the version of gcc you wish to use. diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version index 05b4f1a7a13f..3e5bf7847e74 100644 --- a/toolchain/gcc/Config.version +++ b/toolchain/gcc/Config.version @@ -3,11 +3,11 @@ config GCC_VERSION_4_4_7 bool config GCC_VERSION_4_6_LINARO - default y if (!TOOLCHAINOPTS && mips64) + default y if (!TOOLCHAINOPTS && octeon) bool config GCC_VERSION_4_8_LINARO - default y if (!TOOLCHAINOPTS && !avr32 && !mips64) + default y if (!TOOLCHAINOPTS && !avr32 && !octeon) bool config GCC_VERSION_4_8_0 -- 2.30.2