From: Imre Kaloz <kaloz@openwrt.org>
Date: Thu, 4 Nov 2010 14:18:04 +0000 (+0000)
Subject: use gcc 4.3.5 for avr32
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=d917b7d1ef2d6cae78263e9715084f54493afff4;p=openwrt%2Fstaging%2Fjow.git

use gcc 4.3.5 for avr32

SVN-Revision: 23866
---

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