Author: blogic Date: 2014-06-18 12:07:53 +0200 (Wed, 18 Jun 2014) New Revision: 41251
Modified: trunk/toolchain/Config.in trunk/toolchain/gcc/Config.in trunk/toolchain/gcc/Config.version Log: toolchain: use different defaults for octeon force eglibc and gcc4.6+linaro for octeon Signed-off-by: Martin F?\195?\164cknitz <[email protected]> Modified: trunk/toolchain/Config.in =================================================================== --- trunk/toolchain/Config.in 2014-06-18 10:07:49 UTC (rev 41250) +++ trunk/toolchain/Config.in 2014-06-18 10:07:53 UTC (rev 41251) @@ -203,6 +203,7 @@ 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 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 Modified: trunk/toolchain/gcc/Config.in =================================================================== --- trunk/toolchain/gcc/Config.in 2014-06-18 10:07:49 UTC (rev 41250) +++ trunk/toolchain/gcc/Config.in 2014-06-18 10:07:53 UTC (rev 41251) @@ -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. Modified: trunk/toolchain/gcc/Config.version =================================================================== --- trunk/toolchain/gcc/Config.version 2014-06-18 10:07:49 UTC (rev 41250) +++ trunk/toolchain/gcc/Config.version 2014-06-18 10:07:53 UTC (rev 41251) @@ -3,10 +3,11 @@ 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 _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
