aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2010-11-04 14:18:04 +0000
committerImre Kaloz <kaloz@openwrt.org>2010-11-04 14:18:04 +0000
commitdeb93fbc33c07b6ff6628246045fa2531c3ac1d7 (patch)
treebe9179f56ee9cec86c6ad84ba94b9b49822f1c0e
parentb6539213ecc9c36eec5d155d456a8121ddb385d1 (diff)
downloadupstream-deb93fbc33c07b6ff6628246045fa2531c3ac1d7.tar.gz
upstream-deb93fbc33c07b6ff6628246045fa2531c3ac1d7.tar.bz2
upstream-deb93fbc33c07b6ff6628246045fa2531c3ac1d7.zip
[toolchain]: use gcc 4.3.5 for avr32
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23866 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--toolchain/gcc/Config.in3
-rw-r--r--toolchain/gcc/Config.version3
2 files changed, 2 insertions, 4 deletions
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 08c69de2d6..56416bd162 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,8 +2,7 @@
choice
prompt "GCC compiler Version" if TOOLCHAINOPTS
- default GCC_VERSION_4_2_4 if avr32
- default GCC_VERSION_4_3_5 if powerpc64
+ default GCC_VERSION_4_3_5 if (avr32 || powerpc64)
default GCC_VERSION_4_3_5 if (TARGET_coldfire || TARGET_etrax || TARGET_gemini)
default GCC_VERSION_4_3_3_CS if (arm || armeb) && !(TARGET_gemini || TARGET_omap35xx)
default GCC_VERSION_4_3_3_CS if (mips || mipsel) && !(TARGET_octeon || TARGET_sibyte)
diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index 731e247893..9229122ba4 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -44,14 +44,13 @@ config GCC_VERSION_4_5
default y if GCC_VERSION_4_5_1_LINARO
if !TOOLCHAINOPTS
- config GCC_VERSION_4_2_4
- default y if avr32
config GCC_VERSION_4_3_3_CS
default y if (mips || mipsel) && !(TARGET_octeon || TARGET_sibyte)
default y if (arm || armeb) && !(TARGET_gemini || TARGET_omap35xx)
config GCC_VERSION_4_3_5
+ default y if avr32
default y if powerpc64
default y if TARGET_etrax
default y if TARGET_coldfire