From ed23e96f4ae438ed35e342345c6294e66c40a899 Mon Sep 17 00:00:00 2001
From: kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 4 Nov 2010 14:18:04 +0000
Subject: [PATCH] [toolchain]: use gcc 4.3.5 for avr32

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 08c69de2d..56416bd16 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 731e24789..9229122ba 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