diff options
| author | John Crispin <blogic@openwrt.org> | 2014-06-18 10:07:53 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2014-06-18 10:07:53 +0000 |
| commit | f2126e7f192b9d7696e399374bc26b745579ffd7 (patch) | |
| tree | 5a17e3748585e5fa6cbc2697edea1d223e5b906e | |
| parent | dad6cd83d18cb5c7a1139f5737c67d299ab5c6ea (diff) | |
| download | upstream-f2126e7f192b9d7696e399374bc26b745579ffd7.tar.gz upstream-f2126e7f192b9d7696e399374bc26b745579ffd7.tar.bz2 upstream-f2126e7f192b9d7696e399374bc26b745579ffd7.zip | |
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
| -rw-r--r-- | toolchain/Config.in | 4 | ||||
| -rw-r--r-- | toolchain/gcc/Config.in | 1 | ||||
| -rw-r--r-- | toolchain/gcc/Config.version | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/toolchain/Config.in b/toolchain/Config.in index 7c0e3ce086..7deda1e2c3 100644 --- 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 e279bf2cf4..0c07796c53 100644 --- 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 e9aafcd7f3..05b4f1a7a1 100644 --- 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 |