aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2014-07-10 19:16:09 +0000
committerJohn Crispin <blogic@openwrt.org>2014-07-10 19:16:09 +0000
commit703311107836fb2887b517cdd375924e15f4cf31 (patch)
tree91b8c70608074736152dbc72e1e3bb77afd09c38 /toolchain
parent2d1acf1049142482bc70c084d0a0d06d367a47a0 (diff)
downloadmaster-187ad058-703311107836fb2887b517cdd375924e15f4cf31.tar.gz
master-187ad058-703311107836fb2887b517cdd375924e15f4cf31.tar.bz2
master-187ad058-703311107836fb2887b517cdd375924e15f4cf31.zip
toolchain: only default eglibc for octeon and not all of mips64
Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41559 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/Config.in6
-rw-r--r--toolchain/gcc/Config.in2
-rw-r--r--toolchain/gcc/Config.version4
3 files changed, 6 insertions, 6 deletions
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 7deda1e2c3..637d539452 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 0c07796c53..97c74dec4d 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 05b4f1a7a1..3e5bf7847e 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