X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/37293060d4a32e098262b67f6fdfff57d81586af..7873df547d0423a7da9a3e6c7810b2fc4c30eb3a:/toolchain/gcc/Config.in

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 942bd3ce3..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)
@@ -19,36 +18,18 @@ choice
 	config GCC_VERSION_4_2_4
 		bool "gcc 4.2.4"
 
-	config GCC_VERSION_4_3_3
-		bool "gcc 4.3.3"
-
-	config GCC_VERSION_4_3_4
-		bool "gcc 4.3.4"
-
 	config GCC_VERSION_4_3_5
 		bool "gcc 4.3.5"
 
-	config GCC_VERSION_4_4_1
-		bool "gcc 4.4.1"
-
-	config GCC_VERSION_4_4_2
-		bool "gcc 4.4.2"
-
-	config GCC_VERSION_4_4_3
-		bool "gcc 4.4.3"
-
-	config GCC_VERSION_4_4_4
-		bool "gcc 4.4.4"
-
 	config GCC_VERSION_4_4_5
 		bool "gcc 4.4.5"
 
-	config GCC_VERSION_4_5_0
-		bool "gcc 4.5.0"
-
 	config GCC_VERSION_4_5_1
 		bool "gcc 4.5.1"
 
+	config GCC_VERSION_4_5_1_LINARO
+		bool "gcc 4.5.1 with Linaro enhancements"
+
 	config GCC_VERSION_LLVM
 		bool "llvm-gcc 4.2"
 		depends BROKEN
@@ -59,10 +40,6 @@ choice
 	config GCC_VERSION_4_4_1_CS
 		bool "gcc 4.4.1 with CodeSourcery enhancements"
 
-	config GCC_VERSION_4_4_3_CS
-		bool "gcc 4.4.3 with CodeSourcery enhancements"
-		depends BROKEN
-
 endchoice
 
 config GCC_USE_GRAPHITE