diff --git a/package/libs/elfutils/Makefile b/package/libs/elfutils/Makefile
index 1e41e296b..d4e5d994e 100644
--- a/package/libs/elfutils/Makefile
+++ b/package/libs/elfutils/Makefile
@@ -81,7 +81,7 @@ HOST_CONFIGURE_VARS += \
 CONFIGURE_VARS += \
 	ac_cv_search__obstack_free=yes
 
-TARGET_CFLAGS += -D_GNU_SOURCE -Wno-unused-result -Wno-format-nonliteral -Wno-error=use-after-free
+TARGET_CFLAGS += -D_GNU_SOURCE -Wno-unused-result -Wno-format-nonliteral
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 921e84067..8a31bf0d2 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_8 if mips || mipsel || mips64 || mips64el
-	default GCC_USE_VERSION_12
+	default GCC_USE_VERSION_11
 	help
 	  Select the version of gcc you wish to use.
 
diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index 50af279d8..da915851a 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -3,12 +3,12 @@ config GCC_VERSION_8
 	default y if mips || mipsel || mips64 || mips64el
 	bool
 
-config GCC_VERSION_11
-	default y if GCC_USE_VERSION_11
+config GCC_VERSION_12
+	default y if GCC_USE_VERSION_12
 	bool
 
 config GCC_VERSION
 	string
 	default "8.4.0"		if GCC_VERSION_8
-	default "11.3.0"	if GCC_VERSION_11
-	default "12.2.0"
+	default "12.2.0"	if GCC_VERSION_12
+	default "11.3.0"