use gcc 4.1.1 for 2.6, 3.4.6 for 2.4 targets by default

[openwrt-10.03/.git] / toolchain / gcc / Config.version

diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index a7bc9f5d6fe71a9e85ce1b420ee2e580776aff7c..495c883c7f4a4ecc57f634f7b71e2de32355a175 100644 (file)
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -1,19 +1,22 @@
 config GCC_VERSION
        string
-       default "3.4.4"     if GCC_VERSION_3_4_4 || LINUX_2_4_BRCM
+       default "3.4.4"     if GCC_VERSION_3_4_4
        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.0.3"     if GCC_VERSION_4_0_3
        default "4.1.0"     if GCC_VERSION_4_1_0
        default "4.1.1"     if GCC_VERSION_4_1_1
-       default "3.4.6"
+       default "4.2"           if GCC_VERSION_4_2
+       default "3.4.6-nonmips"     if GCC_VERSION_3_4_6_nonmips
+       default "4.1.1"
 
 if !TOOLCHAINOPTS
-       config GCC_VERSION_3_4_4
-               
-       config GCC_VERSION_4_0_3
+       config GCC_VERSION_4_2
+               default n
 
+       config GCC_VERSION_3_4_6
+               default y if LINUX_2_4
 endif