octeon: select gcc 4.6 by default

Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 41843

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 97c74dec4d1b8918f4320923861cc74c56a29d33..1ec6503097c2ce1238d6bc6c3c1097a42ce8694b 100644 (file)
--- 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 octeon
+       default GCC_USE_VERSION_4_6_LINARO if TARGET_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 3e5bf7847e74c15ff88b99923ba44a8a8c6e99e5..417fd4d9c364a52e7d5f903fab44027a1d1e3fa4 100644 (file)
--- 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 && octeon)
+       default y if (!TOOLCHAINOPTS && TARGET_octeon)
        bool
 
 config GCC_VERSION_4_8_LINARO
-       default y if (!TOOLCHAINOPTS && !avr32 && !octeon)
+       default y if (!TOOLCHAINOPTS && !avr32 && !TARGET_octeon)
        bool
 
 config GCC_VERSION_4_8_0