X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/021e6aa5f3691fe6fdf04a406a642575f46f284a..be9200761382504a7ad0fad4c7a14f8b0f92ce49:/toolchain/gcc/Config.in

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 0835b5c8a..dd3184e86 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,7 +2,7 @@
 
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
-	default GCC_VERSION_4_0_3 if LINUX_2_6_ARUBA
+	default GCC_VERSION_4_1_1 if LINUX_2_6_ARUBA
 	default GCC_VERSION_3_4_4 if LINUX_2_4_BRCM
 	default GCC_VERSION_3_4_6
 	help
@@ -18,34 +18,22 @@ choice
 	config GCC_VERSION_3_4_6
 		bool "gcc 3.4.6"
 
+	config GCC_VERSION_3_4_6_nonmips
+		bool "gcc 3.4.6-nonmips"
+
 	config GCC_VERSION_4_0_2
 		bool "gcc 4.0.2"
 
 	config GCC_VERSION_4_0_3
 		bool "gcc 4.0.3"
-		
+
 	config GCC_VERSION_4_1_0
 		bool "gcc 4.1.0"
 
-endchoice
-
-config PACKAGE_LIBGCC
-	tristate
-	prompt "libgcc package" if TOOLCHAINOPTS
-	default y if GCC_VERSION_4_0_2 || GCC_VERSION_4_0_3 || GCC_VERSION_4_1_0
-	default m
-
-config GCC_VERSION
-	string
-	prompt "GCC compiler Version" if (TOOLCHAINOPTS && NULL)
-	default "3.4.4"     if GCC_VERSION_3_4_4 || LINUX_2_4_BRCM
-	default "3.4.5"     if GCC_VERSION_3_4_5
-	default "3.4.6"     if GCC_VERSION_3_4_6
-	default "4.0.2"     if GCC_VERSION_4_0_2
-	default "4.0.3"     if GCC_VERSION_4_0_3 || LINUX_2_6_ARUBA
-	default "4.1.0"     if GCC_VERSION_4_1_0
-	default "3.4.6"
+	config GCC_VERSION_4_1_1
+		bool "gcc 4.1.1"
 
+endchoice
 
 config EXTRA_GCC_CONFIG_OPTIONS
 	string
@@ -61,3 +49,4 @@ config INSTALL_LIBSTDCPP
 	help
 	    Build/install c++ compiler and libstdc++?
 
+