X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/d29d31cfa836fac8e2131ea00c17bd264489db63..bcbd4e904c994372483bf76abb8baf1b7e66067b:/openwrt/toolchain/gcc/Config.in

diff --git a/openwrt/toolchain/gcc/Config.in b/openwrt/toolchain/gcc/Config.in
index c6ea128f3..6ba0970b5 100644
--- a/openwrt/toolchain/gcc/Config.in
+++ b/openwrt/toolchain/gcc/Config.in
@@ -6,44 +6,36 @@ if CONFIG_DEVEL
 	comment "Gcc Options"
 endif
 
+
+config BR2_GCC_3_4
+	bool
+	default n
+	depends BR2_GCC_VERSION_3_4_3 || BR2_GCC_VERSION_4_0_0
+
 choice
 	prompt "GCC compiler Version" if CONFIG_DEVEL
-	default BR2_GCC_VERSION_3_3_5
+	default BR2_GCC_VERSION_3_4_3
 	help
 	  Select the version of gcc you wish to use.
 
-	config BR2_GCC_VERSION_3_3_3
-		bool "gcc 3.3.3"
-
-	config BR2_GCC_VERSION_3_3_4
-		bool "gcc 3.3.4"
-
 	config BR2_GCC_VERSION_3_3_5
 		bool "gcc 3.3.5"
 
-	config BR2_GCC_VERSION_3_4_0
-		bool "gcc 3.4.0"
-
-	config BR2_GCC_VERSION_3_4_1
-		bool "gcc 3.4.1"
-
-	config BR2_GCC_VERSION_3_4_2
-		bool "gcc 3.4.2"
-
 	config BR2_GCC_VERSION_3_4_3
 		bool "gcc 3.4.3"
+		select BR2_GCC_3_4
+
+	config BR2_GCC_VERSION_4_0_0
+		bool "gcc 4.0.0"
+		select BR2_GCC_3_4
 
 endchoice
 
 config BR2_GCC_VERSION
 	string
-	default "3.3.3"     if BR2_GCC_VERSION_3_3_3
-	default "3.3.4"     if BR2_GCC_VERSION_3_3_4
-	default "3.3.5"     if BR2_GCC_VERSION_3_3_5 || !CONFIG_DEVEL
-	default "3.4.0"     if BR2_GCC_VERSION_3_4_0
-	default "3.4.1"     if BR2_GCC_VERSION_3_4_1
-	default "3.4.2"     if BR2_GCC_VERSION_3_4_2
-	default "3.4.3"     if BR2_GCC_VERSION_3_4_3
+	default "3.3.5"     if BR2_GCC_VERSION_3_3_5 
+	default "3.4.3"     if BR2_GCC_VERSION_3_4_3 || !CONFIG_DEVEL
+	default "4.0.0"     if BR2_GCC_VERSION_4_0_0
 
 
 config BR2_GCC_USE_SJLJ_EXCEPTIONS