diff options
| author | Rui Salvaterra <rsalvaterra@gmail.com> | 2022-05-06 15:42:06 +0100 |
|---|---|---|
| committer | Paul Spooren <mail@aparcar.org> | 2022-06-01 14:59:49 +0200 |
| commit | c4bd303086012afe2aebd213c892363512138bb7 (patch) | |
| tree | b8d78ba52ead2356d7af766d802f1524a73d0c08 /toolchain/gcc/common.mk | |
| parent | 8885cf88279fd131c163d0ac34aeeef0bbff0ceb (diff) | |
| download | upstream-c4bd303086012afe2aebd213c892363512138bb7.tar.gz upstream-c4bd303086012afe2aebd213c892363512138bb7.tar.bz2 upstream-c4bd303086012afe2aebd213c892363512138bb7.zip | |
toolchain: add support for GCC 12
GCC 12.1 is out. Add support for it.
Deleted (upstreamed):
011-v12-configure-define-TARGET_LIBC_GNUSTACK-on-musl.patch
931-libffi-fix-MIPS-softfloat-build-issue.patch
Deleted (unneeded?)
970-macos_arm64-building-fix.patch
Other patches manually rebased due to C++ conversion and consequent file name
changing (.c to .cc).
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'toolchain/gcc/common.mk')
| -rw-r--r-- | toolchain/gcc/common.mk | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk index c1aff7dc40..8fa9459f50 100644 --- a/toolchain/gcc/common.mk +++ b/toolchain/gcc/common.mk @@ -40,6 +40,10 @@ ifeq ($(PKG_VERSION),11.3.0) PKG_HASH:=b47cf2818691f5b1e21df2bb38c795fac2cfbd640ede2d0a5e1c89e338a3ac39 endif +ifeq ($(PKG_VERSION),12.1.0) + PKG_HASH:=62fd634889f31c02b64af2c468f064b47ad1ca78411c45abe6ac4b5f8dd19c7b +endif + PATCH_DIR=../patches/$(GCC_VERSION) BUGURL=http://bugs.openwrt.org/ @@ -180,6 +184,13 @@ 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) @@ -188,8 +199,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 |