[toolchain] fix gcc version selection for octeon

SVN-Revision: 18551

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index b19427be0a0c5fa5167760683150877927fb4581..ccaccaf0022487bff7a8f308a5a3fdb8dcf2b423 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -11,7 +11,7 @@ choice
        default GCC_VERSION_4_3_3 if TARGET_coldfire
        default GCC_VERSION_4_4_1 if ubicom32
        default GCC_VERSION_4_4_1 if TARGET_octeon
-       default GCC_VERSION_4_3_3_CS if mips || mipsel
+       default GCC_VERSION_4_3_3_CS if (mips || mipsel) && !TARGET_octeon
        default GCC_VERSION_4_3_3_CS if arm || armeb
        default GCC_VERSION_4_1_2
        help

diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index 9c1125dd782433aea8a90bd20527e53ccd3aafc9..f4e70178462015ace5fb0e692786bd2421cfcb51 100644 (file)
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -66,7 +66,7 @@ if !LINUX_2_4
                default y if TARGET_coldfire
 
        config GCC_VERSION_4_3_3_CS
-               default y if mips || mipsel
+               default y if (mips || mipsel) && !TARGET_octeon
                default y if arm || armeb
 
        config GCC_VERSION_4_4_1