X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/447f925ff9e0bca059a62ca97a142da70a38f880..744a720a8f408dbab064bb1369c78b601fcb8dfb:/toolchain/gcc/Config.in

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 3eedaeb18..599bfddb5 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -10,11 +10,13 @@ endif
 config BR2_GCC_3_4
 	bool
 	default n
-	depends BR2_GCC_VERSION_3_4_4 || BR2_GCC_VERSION_3_4_5 || BR2_GCC_VERSION_4_0_1 || BR2_GCC_VERSION_4_0_2
+	depends BR2_GCC_VERSION_3_4_4 || BR2_GCC_VERSION_3_4_5 || BR2_GCC_VERSION_4_0_2 || BR2_GCC_VERSION_4_1_0
 
 choice
 	prompt "GCC compiler Version" if CONFIG_DEVEL
-	default BR2_GCC_VERSION_3_4_4
+	default BR2_GCC_VERSION_4_0_2 if BR2_LINUX_2_6_ARUBA
+	default BR2_GCC_VERSION_3_4_4 if BR2_LINUX_2_4_BRCM
+	default BR2_GCC_VERSION_3_4_5
 	help
 	  Select the version of gcc you wish to use.
 
@@ -26,22 +28,24 @@ choice
 		bool "gcc 3.4.5"
 		select BR2_GCC_3_4
 
-	config BR2_GCC_VERSION_4_0_1
-		bool "gcc 4.0.1"
-		select BR2_GCC_3_4
-		
 	config BR2_GCC_VERSION_4_0_2
 		bool "gcc 4.0.2"
 		select BR2_GCC_3_4
+		select BR2_PACKAGE_LIBGCC
+		
+	config BR2_GCC_VERSION_4_1_0
+		bool "gcc 4.1.0"
+		select BR2_GCC_3_4
+		select BR2_PACKAGE_LIBGCC
 
 endchoice
 
 config BR2_GCC_VERSION
 	string
-	default "3.4.4"     if BR2_GCC_VERSION_3_4_4 || !CONFIG_DEVEL
-	default "3.4.5"     if BR2_GCC_VERSION_3_4_5
-	default "4.0.1"     if BR2_GCC_VERSION_4_0_1
+	default "3.4.4"     if BR2_GCC_VERSION_3_4_4
+	default "3.4.5"     if BR2_GCC_VERSION_3_4_5 || !CONFIG_DEVEL
 	default "4.0.2"     if BR2_GCC_VERSION_4_0_2
+	default "4.1.0"     if BR2_GCC_VERSION_4_1_0
 
 
 config BR2_GCC_USE_SJLJ_EXCEPTIONS