disable bcm43xx packages, checking the 2.6.16 all-in-one patches, packages does not...

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

diff --git a/openwrt/toolchain/gcc/Config.in b/openwrt/toolchain/gcc/Config.in
index e618bc6..5d525bd 100644 (file)
--- a/openwrt/toolchain/gcc/Config.in
+++ b/openwrt/toolchain/gcc/Config.in
@@ -7,52 +7,62 @@ if CONFIG_DEVEL
 endif
 
 
 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
        bool

-       default n
+       default y if BR2_LINUX_2_4_BRCM
+
+config BR2_GCC_VERSION_4_0_3
+       bool
+       default y if BR2_LINUX_2_6_ARUBA

 
 choice
        prompt "GCC compiler Version" if CONFIG_DEVEL
 
 choice
        prompt "GCC compiler Version" if CONFIG_DEVEL

-       default BR2_GCC_VERSION_3_3_5
+       default BR2_GCC_VERSION_4_0_3 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.
 
        help
          Select the version of gcc you wish to use.
 

-       config BR2_GCC_VERSION_3_3_3
-               bool "gcc 3.3.3"

 
 

-       config BR2_GCC_VERSION_3_3_4
-               bool "gcc 3.3.4"
+       config BR2_GCC_VERSION_3_4_4
+               bool "gcc 3.4.4"

 
 

-       config BR2_GCC_VERSION_3_3_5
-               bool "gcc 3.3.5"
+       config BR2_GCC_VERSION_3_4_5
+               bool "gcc 3.4.5"

 
 

-       config BR2_GCC_VERSION_3_4_0
-               bool "gcc 3.4.0"
-               select BR2_GCC_3_4
+       config BR2_GCC_VERSION_3_4_6
+               bool "gcc 3.4.6"

 
 

-       config BR2_GCC_VERSION_3_4_1
-               bool "gcc 3.4.1"
-               select BR2_GCC_3_4
+       config BR2_GCC_VERSION_4_0_2
+               bool "gcc 4.0.2"

 
 

-       config BR2_GCC_VERSION_3_4_2
-               bool "gcc 3.4.2"
-               select BR2_GCC_3_4
-
-       config BR2_GCC_VERSION_3_4_3
-               bool "gcc 3.4.3"
-               select BR2_GCC_3_4
+       config BR2_GCC_VERSION_4_0_3
+               bool "gcc 4.0.3"
+               
+       config BR2_GCC_VERSION_4_1_0
+               bool "gcc 4.1.0"

 
 endchoice
 
 
 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
 config BR2_GCC_VERSION
        string

-       default "3.3.3"     if BR2_GCC_VERSION_3_3_3
-       default "3.3.4"     if BR2_GCC_VERSION_3_3_4
-       default "3.3.5"     if BR2_GCC_VERSION_3_3_5 || !CONFIG_DEVEL
-       default "3.4.0"     if BR2_GCC_VERSION_3_4_0
-       default "3.4.1"     if BR2_GCC_VERSION_3_4_1
-       default "3.4.2"     if BR2_GCC_VERSION_3_4_2
-       default "3.4.3"     if BR2_GCC_VERSION_3_4_3
+       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.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
 
 
 config BR2_GCC_USE_SJLJ_EXCEPTIONS