X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/aaba8c7383c215d89939010bbe1d7c5ed43d0639..18d730efee1d845f99f53f001b4f39b6311aa5f3:/openwrt/toolchain/gcc/Config.in

diff --git a/openwrt/toolchain/gcc/Config.in b/openwrt/toolchain/gcc/Config.in
index 9e65aad59..356e9ebdf 100644
--- a/openwrt/toolchain/gcc/Config.in
+++ b/openwrt/toolchain/gcc/Config.in
@@ -7,50 +7,65 @@ if CONFIG_DEVEL
 endif
 
 
-config BR2_GCC_3_4
+# the choice option below is completely ignored
+# if CONFIG_DEVEL isn't set, so we have to set
+# these manually ... annoying.
+config BR2_GCC_VERSION_3_4_4
+	bool
+	default y if BR2_LINUX_2_4_BRCM
+
+config BR2_GCC_VERSION_4_0_3
+	bool
+	default y if BR2_LINUX_2_6_ARUBA || BR2_LINUX_2_6_XSCALE
+
+config BR2_GCC_VERSION_4_1_0
 	bool
-	default n
-	depends BR2_GCC_VERSION_3_4_4 || BR2_GCC_VERSION_3_4_5 || BR2_GCC_VERSION_3_4_6 || BR2_GCC_VERSION_4_0_2 || BR2_GCC_VERSION_4_1_0
 
 choice
 	prompt "GCC compiler Version" if CONFIG_DEVEL
-	default BR2_GCC_VERSION_4_0_2 if BR2_LINUX_2_6_ARUBA
+	default BR2_GCC_VERSION_4_0_3 if BR2_LINUX_2_6_ARUBA || BR2_LINUX_2_6_XSCALE
 	default BR2_GCC_VERSION_3_4_4 if BR2_LINUX_2_4_BRCM
-	default BR2_GCC_VERSION_3_4_5
+	default BR2_GCC_VERSION_3_4_6
 	help
 	  Select the version of gcc you wish to use.
 
+
 	config BR2_GCC_VERSION_3_4_4
 		bool "gcc 3.4.4"
-		select BR2_GCC_3_4
 
 	config BR2_GCC_VERSION_3_4_5
 		bool "gcc 3.4.5"
-		select BR2_GCC_3_4
 
 	config BR2_GCC_VERSION_3_4_6
 		bool "gcc 3.4.6"
-		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_0_3
+		bool "gcc 4.0.3"
 		
 	config BR2_GCC_VERSION_4_1_0
 		bool "gcc 4.1.0"
-		select BR2_GCC_3_4
-		select BR2_PACKAGE_LIBGCC
 
 endchoice
 
+# more nasty hacks
+config BR2_PACKAGE_LIBGCC
+	tristate
+	default y if BR2_GCC_VERSION_4_0_2 || BR2_GCC_VERSION_4_0_3 || BR2_GCC_VERSION_4_1_0
+	default m if CONFIG_DEVEL
+	default n
+
 config BR2_GCC_VERSION
 	string
 	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 "3.4.5"     if BR2_GCC_VERSION_3_4_5
 	default "3.4.6"     if BR2_GCC_VERSION_3_4_6
 	default "4.0.2"     if BR2_GCC_VERSION_4_0_2
+	default "4.0.3"     if BR2_GCC_VERSION_4_0_3
 	default "4.1.0"     if BR2_GCC_VERSION_4_1_0
+	default "3.4.6"
 
 
 config BR2_GCC_USE_SJLJ_EXCEPTIONS