From 1e35f1ce285c06d339158cb6ce87dbfa87b1d374 Mon Sep 17 00:00:00 2001
From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 26 Nov 2009 18:44:00 +0000
Subject: [PATCH] [toolchain] fix gcc version selection for octeon

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18551 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 toolchain/gcc/Config.in      | 2 +-
 toolchain/gcc/Config.version | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index b19427be0..ccaccaf00 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 9c1125dd7..f4e701784 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