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

SVN-Revision: 6208
18 years ago · f1f2af6ddf
parent bbb09a72ca
commit f1f2af6ddf
2 changed files with 5 additions and 5 deletions
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@ -2,8 +2,8 @@

 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
-	default GCC_VERSION_4_1_1 if LINUX_2_6_ARUBA
-	default GCC_VERSION_3_4_6
+	default GCC_VERSION_4_1_1
+	default GCC_VERSION_3_4_6 if LINUX_2_4
 	help
 	  Select the version of gcc you wish to use.

--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@ -9,14 +9,14 @@ config GCC_VERSION
 	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"
+	default "4.1.1"

 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_IXP4XX || LINUX_2_6_RB532 || LINUX_2_6_X86
+	config GCC_VERSION_3_4_6
+		default y if LINUX_2_4
 endif