From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 17 Nov 2015 12:38:41 +0000 (+0000)
Subject: gcc: switch to 5.2.0 by default
X-Git-Tag: reboot~1535
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=124b8a6dd668399bd3d636ed6c8888c2ff74b188;p=openwrt%2Fstaging%2Fpepe2k.git

gcc: switch to 5.2.0 by default

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 47492
---

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 249a01b509..a8c39d6a09 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,9 +2,8 @@
 
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
-	default GCC_USE_VERSION_5 if TARGET_octeon
 	default GCC_USE_VERSION_4_8_ARC if arc
-	default GCC_USE_VERSION_4_8_LINARO
+	default GCC_USE_VERSION_5
 	help
 	  Select the version of gcc you wish to use.
 
diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index a7354f84b2..efd8dc026d 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -1,5 +1,4 @@
 config GCC_VERSION_4_8_LINARO
-	default y if (!TOOLCHAINOPTS && !(TARGET_octeon || arc))
 	bool
 
 config GCC_VERSION_4_8_ARC
@@ -8,14 +7,14 @@ config GCC_VERSION_4_8_ARC
 
 config GCC_VERSION
 	string
-	default "5.2.0"	    if GCC_VERSION_5
 	default "4.8-linaro"    if GCC_VERSION_4_8_LINARO
 	default "arc-2015.06"   if GCC_VERSION_4_8_ARC
-	default "4.8-linaro"
+	default "5.2.0"
 
 config GCC_VERSION_4_8
 	bool
 	default y	if (GCC_VERSION_4_8_LINARO || GCC_VERSION_4_8_ARC)
 
 config GCC_VERSION_5
+	default y if (!TOOLCHAINOPTS && !arc)
 	bool