From b1ac6c44c1cebaba46dbc9f2d1f2d9a373aa0f2a Mon Sep 17 00:00:00 2001
From: unknown <461872470@qq.com>
Date: Thu, 5 Dec 2024 21:31:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=BF=9B=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 toolchain/gcc/Config.in | 5 -----
 toolchain/gcc/common.mk | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index aa78235fcc6464..714620dbbd0c61 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -3,12 +3,7 @@
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
 	default GCC_USE_VERSION_8 if mips || mipsel || mips64 || mips64el
-<<<<<<< HEAD
-	default GCC_USE_VERSION_13 if loongarch64
-	default GCC_USE_VERSION_12
-=======
 	default GCC_USE_VERSION_13
->>>>>>> 8cf7400a822b8501401e2e4b38a854d9eb610cc5
 	help
 	  Select the version of gcc you wish to use.
 
diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk
index abcd6feba3facd..55be62280de206 100644
--- a/toolchain/gcc/common.mk
+++ b/toolchain/gcc/common.mk
@@ -37,8 +37,8 @@ ifeq ($(PKG_VERSION),11.3.0)
   PKG_HASH:=b47cf2818691f5b1e21df2bb38c795fac2cfbd640ede2d0a5e1c89e338a3ac39
 endif
 
-ifeq ($(PKG_VERSION),12.3.0)
-  PKG_HASH:=949a5d4f99e786421a93b532b22ffab5578de7321369975b91aec97adfda8c3b
+ifeq ($(PKG_VERSION),12.2.0)
+  PKG_HASH:=e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
 endif
 
 ifeq ($(PKG_VERSION),13.3.0)