X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/1ffbdd6858a4623eecafa28acde4356141ff62f2..feaf88f721ae706a43e144f7b7975d915aad4d7e:/toolchain/gcc/Config.in

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 3483e00b2..308054c2b 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,25 +2,20 @@
 
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
-	default GCC_VERSION_3_4_6 if LINUX_2_4
 	default GCC_VERSION_4_2_4 if avr32
 	default GCC_VERSION_4_3_3 if powerpc64
-	default GCC_VERSION_4_3_3 if TARGET_etrax
 	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_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_3_3_CS if (mips || mipsel) && !(TARGET_octeon || TARGET_sibyte)
-	default GCC_VERSION_4_3_3_CS if (arm || armeb) && !TARGET_gemini
 	default GCC_VERSION_4_4_3 if powerpc
-	default GCC_VERSION_4_4_3 if (TARGET_octeon || TARGET_sibyte)
+	default GCC_VERSION_4_4_4 if (TARGET_octeon || TARGET_sibyte)
 	default GCC_VERSION_4_1_2
 	help
 	  Select the version of gcc you wish to use.
 
-	config GCC_VERSION_3_4_6
-		bool "gcc 3.4.6"
-
-if !LINUX_2_4
 	config GCC_VERSION_4_1_2
 		bool "gcc 4.1.2"
 
@@ -33,6 +28,9 @@ if !LINUX_2_4
 	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"
 
@@ -42,9 +40,15 @@ if !LINUX_2_4
 	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_5_0
 		bool "gcc 4.5.0"
 
+	config GCC_VERSION_4_5_1
+		bool "gcc 4.5.1"
+
 	config GCC_VERSION_LLVM
 		bool "llvm-gcc 4.2"
 		depends BROKEN
@@ -60,8 +64,6 @@ if !LINUX_2_4
 		bool "gcc 4.4.3 with CodeSourcery enhancements"
 		depends BROKEN
 
-endif
-
 endchoice
 
 config GCC_USE_GRAPHITE
@@ -84,7 +86,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
@@ -92,7 +93,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
@@ -107,6 +108,7 @@ config INSTALL_LIBSTDCPP
 
 config INSTALL_LIBGCJ
 	bool
+	depends on !(GCC_VERSION_4_1||GCC_VERSION_4_2)
 	prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS
 	default n
 	help