toolchain: use different defaults for octeon

force eglibc and gcc4.6+linaro for octeon

Signed-off-by: Martin Fäcknitz <faecknitz@hotsplots.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41251 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 7c0e3ce..7deda1e 100644 (file)
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -203,6 +203,7 @@ comment "C Library"
 
 choice
        prompt "C Library implementation" if TOOLCHAINOPTS
+       default LIBC_USE_EGLIBC if mips64
        default LIBC_USE_UCLIBC
        help
          Select the C library implementation.
@@ -249,10 +250,11 @@ config INSIGHT
 
 config USE_EGLIBC
        bool
+       default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && mips64
 
 config USE_UCLIBC
        bool
-       default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+       default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && !mips64
 
 config USE_MUSL
        bool

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index e279bf2..0c07796 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -3,6 +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_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 e9aafcd..05b4f1a 100644 (file)
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -3,10 +3,11 @@ config GCC_VERSION_4_4_7
        bool
 
 config GCC_VERSION_4_6_LINARO
+       default y if (!TOOLCHAINOPTS && mips64)
        bool
 
 config GCC_VERSION_4_8_LINARO
-       default y if (!TOOLCHAINOPTS && !avr32)
+       default y if (!TOOLCHAINOPTS && !avr32 && !mips64)
        bool
 
 config GCC_VERSION_4_8_0