X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fchunkeey.git;a=blobdiff_plain;f=toolchain%2Fgcc%2FConfig.in;h=019cd164b766f68ebdd0c842d6c2de0eb1493601;hp=cba0862d3d2abec9a9e9af5d51945c4a0d2a72a8;hb=50be0201f13e198250ae1eed9cf89fb138cf7028;hpb=cb4dcc9c0d6b79493da635410b75d32865b69914

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index cba0862d3d..019cd164b7 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,49 +2,27 @@
 
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
-	default GCC_VERSION_4_2_4 if avr32
-	default GCC_VERSION_4_3_3 if powerpc64
-	default GCC_VERSION_4_3_3 if TARGET_coldfire
-	default GCC_VERSION_4_3_3 if TARGET_etrax
-	default GCC_VERSION_4_3_3_CS if (arm || armeb) && !TARGET_gemini
+	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_3_4 if TARGET_gemini
-	default GCC_VERSION_4_4_1 if ubicom32
-	default GCC_VERSION_4_4_3 if powerpc
-	default GCC_VERSION_4_4_4 if (TARGET_octeon || TARGET_sibyte)
-	default GCC_VERSION_4_1_2
+	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
 	help
 	  Select the version of gcc you wish to use.
 
-	config GCC_VERSION_4_1_2
-		bool "gcc 4.1.2"
-
-	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_5
+		bool "gcc 4.4.5"
 
-	config GCC_VERSION_4_4_3
-		bool "gcc 4.4.3"
+	config GCC_VERSION_4_5_2
+		bool "gcc 4.5.2"
 
-	config GCC_VERSION_4_4_4
-		bool "gcc 4.4.4"
-
-	config GCC_VERSION_4_5_0
-		bool "gcc 4.5.0"
+	config GCC_VERSION_4_5_1_LINARO
+		bool "gcc 4.5.1 with Linaro enhancements"
 
 	config GCC_VERSION_LLVM
 		bool "llvm-gcc 4.2"
@@ -55,11 +33,6 @@ choice
 
 	config GCC_VERSION_4_4_1_CS
 		bool "gcc 4.4.1 with CodeSourcery enhancements"
-		depends BROKEN
-
-	config GCC_VERSION_4_4_3_CS
-		bool "gcc 4.4.3 with CodeSourcery enhancements"
-		depends BROKEN
 
 endchoice
 
@@ -83,7 +56,6 @@ config EXTRA_GCC_CONFIG_OPTIONS
 
 config SSP_SUPPORT
 	bool
-	depends !GCC_VERSION_3_4_6
 	prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS
 	default n
 	help
@@ -91,7 +63,7 @@ config SSP_SUPPORT
 
 config TLS_SUPPORT
 	bool
-	depends !GCC_VERSION_3_4_6 && UCLIBC_VERSION_NPTL
+	depends UCLIBC_VERSION_NPTL
 	prompt "Enable Thread-local storage (TLS) support" if TOOLCHAINOPTS
 	default n
 	help
@@ -106,6 +78,7 @@ config INSTALL_LIBSTDCPP
 
 config INSTALL_LIBGCJ
 	bool
+	depends on !GCC_VERSION_LLVM
 	prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS
 	default n
 	help