From: Florian Fainelli <florian@openwrt.org>
Date: Thu, 26 Nov 2009 18:44:00 +0000 (+0000)
Subject: fix gcc version selection for octeon
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e5e83bf051bd6cc82c05a3abefe491771f20c75d;p=openwrt%2Fstaging%2Fzorun.git

fix gcc version selection for octeon

SVN-Revision: 18551
---

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index b19427be0a..ccaccaf002 100644
--- 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 9c1125dd78..f4e7017846 100644
--- 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