[tolchain/gcc]: use Linaro GCC 4.6 by default

SVN-Revision: 30467

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 09d3813839b3d3f28c6399084807abd76f6adefe..b027953c1f43c65127f3da79917f33d804e56d3e 100644 (file)
--- 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 450d143cbf1690928b326383fa013e061bc38372..288ffa44956f39ea01ca7de30c8afc23bb30134a 100644 (file)
--- 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