add patch from #196

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

diff --git a/openwrt/toolchain/gcc/Config.in b/openwrt/toolchain/gcc/Config.in
index 0edcf3e..5a6a691 100644 (file)
--- a/openwrt/toolchain/gcc/Config.in
+++ b/openwrt/toolchain/gcc/Config.in
@@ -10,11 +10,12 @@ endif
 config BR2_GCC_3_4
        bool
        default n
 config BR2_GCC_3_4
        bool
        default n

-       depends BR2_GCC_VERSION_3_4_4 || 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

 
 choice
        prompt "GCC compiler Version" if CONFIG_DEVEL
 
 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_5

        help
          Select the version of gcc you wish to use.
 
        help
          Select the version of gcc you wish to use.
 


@@ -22,20 +23,21 @@ choice
                bool "gcc 3.4.4"
                select BR2_GCC_3_4
 
                bool "gcc 3.4.4"
                select BR2_GCC_3_4
 

-       config BR2_GCC_VERSION_4_0_1
-               bool "gcc 4.0.1"
+       config BR2_GCC_VERSION_3_4_5
+               bool "gcc 3.4.5"

                select BR2_GCC_3_4
                select BR2_GCC_3_4

-               
+

        config BR2_GCC_VERSION_4_0_2
                bool "gcc 4.0.2"
                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

 
 endchoice
 
 config BR2_GCC_VERSION
        string
 
 endchoice
 
 config BR2_GCC_VERSION
        string

-       default "3.4.4"     if BR2_GCC_VERSION_3_4_4 || !CONFIG_DEVEL
-       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.0.2"     if BR2_GCC_VERSION_4_0_2