X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/4bf0263cf5498a0fc3b55324a8d2004b8fea072b..8d0ec8922c6a02dc55f993212c74c8ad0823fffb:/toolchain/gcc/Config.in

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 019cd164b..204219e7e 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,13 +2,10 @@
 
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
-	default GCC_VERSION_4_3_5 if (avr32 || powerpc64)
-	default GCC_VERSION_4_3_5 if (TARGET_coldfire || TARGET_etrax || TARGET_gemini || TARGET_cns21xx)
-	default GCC_VERSION_4_3_3_CS if (arm || armeb) && !(TARGET_gemini || TARGET_cns21xx || TARGET_omap35xx)
-	default GCC_VERSION_4_3_3_CS if (mips || mipsel) && !(TARGET_octeon || TARGET_sibyte)
-	default GCC_VERSION_4_4_5 if (powerpc || ubicom32)
-	default GCC_VERSION_4_4_5 if (TARGET_omap35xx || TARGET_octeon || TARGET_sibyte)
-	default GCC_VERSION_4_5_1_LINARO
+	default GCC_VERSION_4_3_3_CS if GCC_DEFAULT_VERSION_4_3_3_CS
+	default GCC_VERSION_4_3_5 if GCC_DEFAULT_VERSION_4_3_5
+	default GCC_VERSION_4_4_5 if GCC_DEFAULT_VERSION_4_4_5
+	default GCC_VERSION_LINARO
 	help
 	  Select the version of gcc you wish to use.
 
@@ -21,8 +18,8 @@ choice
 	config GCC_VERSION_4_5_2
 		bool "gcc 4.5.2"
 
-	config GCC_VERSION_4_5_1_LINARO
-		bool "gcc 4.5.1 with Linaro enhancements"
+	config GCC_VERSION_LINARO
+		bool "gcc 4.5.2 with Linaro enhancements"
 
 	config GCC_VERSION_LLVM
 		bool "llvm-gcc 4.2"