From 985cc94b092a8d00ffd7a1fad6e1297c5fea7c04 Mon Sep 17 00:00:00 2001 From: Beginner <70857188+Beginner-Go@users.noreply.github.com> Date: Sun, 11 Sep 2022 02:32:11 +0800 Subject: [PATCH] toolchain/gcc: GCC12 sync upstream (#10080) --- toolchain/gcc/common.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk index 572edfa6d..58a5d80c0 100644 --- a/toolchain/gcc/common.mk +++ b/toolchain/gcc/common.mk @@ -191,6 +191,12 @@ define Host/SetToolchainInfo $(SED) 's,GCC_VERSION=.*,GCC_VERSION=$(GCC_VERSION),' $(TOOLCHAIN_DIR)/info.mk endef +ifdef CONFIG_GCC_USE_VERSION_12 + GCC_VERSION_FILE:=gcc/genversion.cc +else + GCC_VERSION_FILE:=gcc/version.c +endif + ifneq ($(GCC_PREPARE),) define Host/Prepare $(call Host/SetToolchainInfo) @@ -199,8 +205,7 @@ ifneq ($(GCC_PREPARE),) $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(HOST_SOURCE_DIR)/ $(SED) 's,^MULTILIB_OSDIRNAMES,# MULTILIB_OSDIRNAMES,' $(HOST_SOURCE_DIR)/gcc/config/*/t-* $(SED) 'd' $(HOST_SOURCE_DIR)/gcc/DEV-PHASE - $(SED) 's, DATESTAMP,,' $(HOST_SOURCE_DIR)/gcc/version.c - #(cd $(HOST_SOURCE_DIR)/libstdc++-v3; autoconf;); + $(SED) 's, DATESTAMP,,' $(HOST_SOURCE_DIR)/$(GCC_VERSION_FILE) $(SED) 's,gcc_no_link=yes,gcc_no_link=no,' $(HOST_SOURCE_DIR)/libstdc++-v3/configure mkdir -p $(GCC_BUILD_DIR) endef