From 1cc26c5e9acea505ddeada36f1dbef5668607e73 Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@gmail.com>
Date: Sun, 13 Oct 2019 11:48:30 +0800
Subject: [PATCH]  toolchain/gcc: switch to version 7 by default

---
 toolchain/gcc/Config.in      | 6 ------
 toolchain/gcc/Config.version | 9 ++++-----
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 6a013a8687..e16f5b1e71 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,16 +2,10 @@
 
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
-	default GCC_USE_VERSION_7_1_ARC if arc
 	default GCC_USE_VERSION_7
 	help
 	  Select the version of gcc you wish to use.
 
-	config GCC_USE_VERSION_7_1_ARC
-		select GCC_VERSION_7_1_ARC
-		bool "gcc 7.1.x with support of ARC cores"
-		depends on arc
-
 	config GCC_USE_VERSION_5
 		bool "gcc 5.x"
 		depends on !arc
diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index daa4fde698..16dd370ddd 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -6,8 +6,8 @@ config GCC_VERSION_5
 	default y if GCC_USE_VERSION_5
 	bool
 
-config GCC_VERSION_7
-	default y if GCC_USE_VERSION_7
+config GCC_VERSION_8
+	default y if GCC_USE_VERSION_8
 	bool
 
 config GCC_VERSION_9
@@ -17,10 +17,9 @@ config GCC_VERSION_9
 config GCC_VERSION
 	string
 	default "5.5.0"		if GCC_VERSION_5
-	default "arc-2017.09-release"   if GCC_VERSION_7_1_ARC
-	default "7.4.0"		if GCC_VERSION_7
 	default "9.2.0"		if GCC_VERSION_9
-	default "8.3.0"
+	default "8.3.0"		if GCC_VERSION_8
+	default "7.4.0"
 
 config GCC_USE_IREMAP
 	bool