revert gcc to 4.1.1 for x86 to fix uclibc++ build (closes: #1056, #1202)

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

diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index b2d05eb3fe2fac180b8614936f366e875850fb26..397dfa49861bf64895201944a95988dad1996788 100644 (file)
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -7,12 +7,16 @@ config GCC_VERSION
        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 "4.2"           if GCC_VERSION_4_2
        default "3.4.6-nonmips"     if GCC_VERSION_3_4_6_nonmips
        default "3.4.6"
 
 if !TOOLCHAINOPTS
+       config GCC_VERSION_4_2
+               default n
+
        config GCC_VERSION_4_1_1
-               default y if LINUX_2_6_ARUBA || LINUX_2_6_X86 || LINUX_2_6_IXP4XX
+               default y if LINUX_2_6_ARUBA || LINUX_2_6_IXP4XX || LINUX_2_6_RB532 || LINUX_2_6_X86
 endif