remove obsolete BR2_GCC_3_4 config symbol

[openwrt/svn-archive/archive.git] / openwrt / toolchain / gcc / Config.in

diff --git a/openwrt/toolchain/gcc/Config.in b/openwrt/toolchain/gcc/Config.in
index 1188dba047e53f1c31775f8405a292ea7fbe2f70..58f91ddbab8eaeaede3559e40d228937187355f3 100644 (file)
--- a/openwrt/toolchain/gcc/Config.in
+++ b/openwrt/toolchain/gcc/Config.in
@@ -6,36 +6,49 @@ if CONFIG_DEVEL
        comment "Gcc Options"
 endif
 
+config BR2_GCC_VERSION_3_4_4
+       bool
+       default y if BR2_LINUX_2_4_BRCM
 
-config BR2_GCC_3_4
+config BR2_GCC_VERSION_4_0_2
        bool
-       default n
-       depends BR2_GCC_VERSION_3_4_3 || BR2_GCC_VERSION_4_0_0
+       default y if BR2_LINUX_2_6_ARUBA
 
 choice
        prompt "GCC compiler Version" if CONFIG_DEVEL
-       default BR2_GCC_VERSION_3_3_5
+       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_6
        help
          Select the version of gcc you wish to use.
 
-       config BR2_GCC_VERSION_3_3_5
-               bool "gcc 3.3.5"
+       config BR2_GCC_VERSION_3_4_4
+               bool "gcc 3.4.4"
+
+       config BR2_GCC_VERSION_3_4_5
+               bool "gcc 3.4.5"
 
-       config BR2_GCC_VERSION_3_4_3
-               bool "gcc 3.4.3"
-               select BR2_GCC_3_4
+       config BR2_GCC_VERSION_3_4_6
+               bool "gcc 3.4.6"
 
-       config BR2_GCC_VERSION_4_0_0
-               bool "gcc 4.0.0"
-               select BR2_GCC_3_4
+       config BR2_GCC_VERSION_4_0_2
+               bool "gcc 4.0.2"
+               select BR2_PACKAGE_LIBGCC
+               
+       config BR2_GCC_VERSION_4_1_0
+               bool "gcc 4.1.0"
+               select BR2_PACKAGE_LIBGCC
 
 endchoice
 
 config BR2_GCC_VERSION
        string
-       default "3.3.5"     if BR2_GCC_VERSION_3_3_5 || !CONFIG_DEVEL
-       default "3.4.3"     if BR2_GCC_VERSION_3_4_3
-       default "4.0.0"     if BR2_GCC_VERSION_4_0_0
+       default "3.4.4"     if BR2_GCC_VERSION_3_4_4
+       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.1.0"     if BR2_GCC_VERSION_4_1_0
+       default "3.4.6"
 
 
 config BR2_GCC_USE_SJLJ_EXCEPTIONS