aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain/gcc
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2012-02-12 09:14:18 +0000
committerImre Kaloz <kaloz@openwrt.org>2012-02-12 09:14:18 +0000
commit2a65a2340ee243f44fe8c845b96c9708b2b1f6d8 (patch)
treec3b518b853d8a98f39c58a249064ea7729b88491 /toolchain/gcc
parent1f355ba28341686deb52cf771c675f0f3f771e7f (diff)
downloadmaster-187ad058-2a65a2340ee243f44fe8c845b96c9708b2b1f6d8.tar.gz
master-187ad058-2a65a2340ee243f44fe8c845b96c9708b2b1f6d8.tar.bz2
master-187ad058-2a65a2340ee243f44fe8c845b96c9708b2b1f6d8.zip
[tolchain/gcc]: use Linaro GCC 4.6 by default
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30467 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/gcc')
-rw-r--r--toolchain/gcc/Config.in2
-rw-r--r--toolchain/gcc/Config.version11
2 files changed, 5 insertions, 8 deletions
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