X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=toolchain%2Fgcc%2FConfig.in;h=1188dba047e53f1c31775f8405a292ea7fbe2f70;hb=06c2f90c4f490a375eeabc35c875233a18d10f52;hp=c6ea128f31adb391dffadb829c17a1fac811fd99;hpb=4ca7b0fd9f15d786159538afb367a3b618567123;p=openwrt-10.03%2F.git

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index c6ea128f3..1188dba04 100644
--- a/toolchain/gcc/Config.in
+++ b/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
 	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 "4.0.0"     if BR2_GCC_VERSION_4_0_0
 
 
 config BR2_GCC_USE_SJLJ_EXCEPTIONS