X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c6f25fa29d325d118f13cbdc94f130c174344390..600f114c01e3324d296879632b53b3e1fdcec9e3:/toolchain/gcc/Config.version?ds=inline

diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index a7bc9f5d6..3ff5bbf30 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -1,19 +1,20 @@
 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_3_4_6
+		default y if LINUX_2_4
+		default y if LINUX_2_6_BRCM
 endif