aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain
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
commitd3d76fd7b991a7d9e620cf2123eb787f25d1eac7 (patch)
tree7f12d3dabeba059d3399301ca584a09257a943fb /toolchain
parent9f3f76e1d22043e42eb52973c3a3eee546271764 (diff)
downloadmaster-187ad058-d3d76fd7b991a7d9e620cf2123eb787f25d1eac7.tar.gz
master-187ad058-d3d76fd7b991a7d9e620cf2123eb787f25d1eac7.tar.bz2
master-187ad058-d3d76fd7b991a7d9e620cf2123eb787f25d1eac7.zip
[toolchain] fix gcc version selection for octeon
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18551 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain')
-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