summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-11-26 18:44:00 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-11-26 18:44:00 +0000
commite5e83bf051bd6cc82c05a3abefe491771f20c75d (patch)
tree1471780131bcf3301e0db82b8cd92002c6fbeb87
parent3799b4c3f831f9dde220aa2916729fdd04c72b65 (diff)
downloadmaster-31e0f0ae-e5e83bf051bd6cc82c05a3abefe491771f20c75d.tar.gz
master-31e0f0ae-e5e83bf051bd6cc82c05a3abefe491771f20c75d.tar.bz2
master-31e0f0ae-e5e83bf051bd6cc82c05a3abefe491771f20c75d.zip
fix gcc version selection for octeon
SVN-Revision: 18551
-rw-r--r--toolchain/gcc/Config.in2
-rw-r--r--toolchain/gcc/Config.version2
2 files changed, 2 insertions, 2 deletions
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