Fix gcc version selection

[openwrt.git] / toolchain / gcc / Config.in

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index cee344a..5ea51a8 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,9 +2,8 @@
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
-       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
+       default GCC_VERSION_3_4_6 if LINUX_2_4
+       default GCC_VERSION_4_1_1
        help
          Select the version of gcc you wish to use.
 
@@ -18,6 +17,9 @@ 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"
 
@@ -30,6 +32,9 @@ choice
        config GCC_VERSION_4_1_1
                bool "gcc 4.1.1"
 
+       config GCC_VERSION_4_2
+               bool "gcc 4.2 (20060709)"
+
 endchoice
 
 config EXTRA_GCC_CONFIG_OPTIONS