aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-07-27 14:52:00 +0000
committerJohn Crispin <john@openwrt.org>2014-07-27 14:52:00 +0000
commit96a4d6fb54001f2c4bc8afa3ead5e662918531fd (patch)
tree2cfa7c2a497c0a2120de35bbed38ab01be06e389
parent694295e7be33dd8829724741f3913616d7206330 (diff)
downloadupstream-96a4d6fb54001f2c4bc8afa3ead5e662918531fd.tar.gz
upstream-96a4d6fb54001f2c4bc8afa3ead5e662918531fd.tar.bz2
upstream-96a4d6fb54001f2c4bc8afa3ead5e662918531fd.zip
octeon: select gcc 4.6 by default
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 41843
-rw-r--r--toolchain/gcc/Config.in2
-rw-r--r--toolchain/gcc/Config.version4
2 files changed, 3 insertions, 3 deletions
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 97c74dec4d..1ec6503097 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -3,7 +3,7 @@
choice
prompt "GCC compiler Version" if TOOLCHAINOPTS
default GCC_USE_VERSION_4_4_7 if avr32
- default GCC_USE_VERSION_4_6_LINARO if octeon
+ default GCC_USE_VERSION_4_6_LINARO if TARGET_octeon
default GCC_USE_VERSION_4_8_LINARO
help
Select the version of gcc you wish to use.
diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index 3e5bf7847e..417fd4d9c3 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -3,11 +3,11 @@ config GCC_VERSION_4_4_7
bool
config GCC_VERSION_4_6_LINARO
- default y if (!TOOLCHAINOPTS && octeon)
+ default y if (!TOOLCHAINOPTS && TARGET_octeon)
bool
config GCC_VERSION_4_8_LINARO
- default y if (!TOOLCHAINOPTS && !avr32 && !octeon)
+ default y if (!TOOLCHAINOPTS && !avr32 && !TARGET_octeon)
bool
config GCC_VERSION_4_8_0