X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=toolchain%2Fgcc%2FConfig.version;h=d640c04d927fbf6103b76a7f068288ecdb377c16;hb=0bea0f77c92d0d5cbc7244f8ba74d9fb193358cc;hp=30c5c29a320d76584dbd0d0a5c3d260d08e441f4;hpb=641dd59df95301cc5bdca05aecf8a1c87d1e441a;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index 30c5c29a32..d640c04d92 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -1,16 +1,39 @@
+config GCC_VERSION_4_4_7
+	default y if (!TOOLCHAINOPTS && avr32)
+	bool
+
+config GCC_VERSION_4_6_LINARO
+	default y if (!TOOLCHAINOPTS && TARGET_octeon)
+	bool
+
+config GCC_VERSION_4_8_LINARO
+	default y if (!TOOLCHAINOPTS && !avr32 && !TARGET_octeon)
+	bool
+
+config GCC_VERSION_4_9_LINARO
+	bool
+
 config GCC_VERSION
 	string
-	default "3.4.6"     if GCC_VERSION_3_4_6
-	default "4.1.2"     if GCC_VERSION_4_1_2
-	default "4.2.4"     if GCC_VERSION_4_2_4
-	default "4.1.2"
-
-if !TOOLCHAINOPTS
-	config GCC_VERSION_3_4_6
-		default y if LINUX_2_4
-
-	config GCC_VERSION_4_2_4
-		default y if TARGET_avr32
-		default y if TARGET_ppc40x
-		default y if TARGET_ppc44x
-endif
+	default "4.4.7"	    if GCC_VERSION_4_4_7
+	default "4.6.3"	    if GCC_VERSION_4_6_3
+	default "4.6-linaro"    if GCC_VERSION_4_6_LINARO
+	default "4.8-linaro"    if GCC_VERSION_4_8_LINARO
+	default "4.9-linaro"    if GCC_VERSION_4_9_LINARO
+	default "4.6-linaro"
+
+config GCC_VERSION_4_4
+	bool
+	default y	if GCC_VERSION_4_4_7
+
+config GCC_VERSION_4_6
+	bool
+	default y       if GCC_VERSION_4_6_LINARO
+
+config GCC_VERSION_4_8
+	bool
+	default y	if GCC_VERSION_4_8_LINARO
+
+config GCC_VERSION_4_9
+	bool
+	default y	if GCC_VERSION_4_9_LINARO