From: Stijn Tintel <stijn@linux-ipv6.be>
Date: Thu, 13 May 2021 16:45:48 +0000 (+0300)
Subject: toolchain/gcc: switch to version 10 by default
X-Git-Tag: v22.03.0-rc1~1953
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=6d0cefcf426724c1b0a6a9481a6596e9616122a6;p=openwrt%2Fstaging%2Fhauke.git

toolchain/gcc: switch to version 10 by default

Runtime-tested on:
* ath79
* bcm27xx/bcm2708
* bcm27xx/bcm2709
* bcm27xx/bcm2711
* mvebu/cortexa53
* octeon
* realtek
* x86/64

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 5ac93217f8..4b25c85016 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,7 +2,7 @@
 
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
-	default GCC_USE_VERSION_8
+	default GCC_USE_VERSION_10
 	help
 	  Select the version of gcc you wish to use.
 
diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index dd61d1e210..608de37317 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -2,12 +2,12 @@ config GCC_VERSION_7
 	default y if GCC_USE_VERSION_7
 	bool
 
-config GCC_VERSION_9
-	default y if GCC_USE_VERSION_9
+config GCC_VERSION_8
+	default y if GCC_USE_VERSION_8
 	bool
 
-config GCC_VERSION_10
-	default y if GCC_USE_VERSION_10
+config GCC_VERSION_9
+	default y if GCC_USE_VERSION_9
 	bool
 
 config GCC_VERSION_11
@@ -17,10 +17,10 @@ config GCC_VERSION_11
 config GCC_VERSION
 	string
 	default "7.5.0"		if GCC_VERSION_7
+	default "8.4.0"		if GCC_VERSION_8
 	default "9.3.0"		if GCC_VERSION_9
-	default "10.3.0"	if GCC_VERSION_10
 	default "11.2.0"	if GCC_VERSION_11
-	default "8.4.0"
+	default "10.3.0"
 
 config GCC_USE_IREMAP
 	bool