From: Imre Kaloz <kaloz@openwrt.org>
Date: Sun, 12 Feb 2012 09:14:18 +0000 (+0000)
Subject: use Linaro GCC 4.6 by default
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=909abe499921709e37cefbed4bd9932d803c36b0;p=openwrt%2Fstaging%2Fblocktrron.git

use Linaro GCC 4.6 by default

SVN-Revision: 30467
---

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 09d3813839..b027953c1f 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -3,7 +3,7 @@
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
 	default GCC_VERSION_4_4_6 if GCC_DEFAULT_VERSION_4_4_6
-	default GCC_VERSION_4_5_LINARO
+	default GCC_VERSION_4_6_LINARO
 	help
 	  Select the version of gcc you wish to use.
 
diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index 450d143cbf..288ffa4495 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -6,11 +6,8 @@ config GCC_DEFAULT_VERSION_4_4_6
 	default y if (avr32 || ubicom32)
 	bool
 
-config GCC_DEFAULT_VERSION_4_5_LINARO
-	default y if !(GCC_DEFAULT_VERSION)
-	bool
-
 config GCC_DEFAULT_VERSION_4_6_LINARO
+	default y if !(GCC_DEFAULT_VERSION)
 	bool
 
 
@@ -21,7 +18,7 @@ config GCC_VERSION
 	default "4.5-linaro"    if GCC_VERSION_4_5_LINARO
 	default "4.6-linaro"    if GCC_VERSION_4_6_LINARO
 	default "llvm"	    if GCC_VERSION_LLVM
-	default "4.5-linaro"
+	default "4.6-linaro"
 
 config GCC_VERSION_4_4
 	bool
@@ -41,8 +38,8 @@ if !TOOLCHAINOPTS
 		default y if GCC_DEFAULT_VERSION_4_4_6
 		bool
 
-	config GCC_VERSION_4_5_LINARO
-		default y if GCC_DEFAULT_VERSION_4_5_LINARO
+	config GCC_VERSION_4_6_LINARO
+		default y if GCC_DEFAULT_VERSION_4_6_LINARO
 		bool
 
 endif