From fac1f38d7559230eddbbab996c32b12b314fae15 Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Mon, 22 Aug 2022 10:17:33 +0200 Subject: [PATCH] toolchain: bump GCC 12 to 12.2.0 Refreshed patches: - 910-mbsd_multi.patch - 970-macos_arm64-building-fix.patch Signed-off-by: Nick Hainke --- toolchain/gcc/Config.version | 2 +- toolchain/gcc/common.mk | 4 ++-- .../{12.1.0 => 12.2.0}/002-case_insensitive.patch | 0 .../patches/{12.1.0 => 12.2.0}/010-documentation.patch | 0 .../{12.1.0 => 12.2.0}/110-Fix-MIPS-PR-84790.patch | 0 .../patches/{12.1.0 => 12.2.0}/230-musl_libssp.patch | 0 .../300-mips_Os_cpu_rtx_cost_model.patch | 0 .../{12.1.0 => 12.2.0}/810-arm-softfloat-libgcc.patch | 0 .../patches/{12.1.0 => 12.2.0}/820-libgcc_pic.patch | 0 .../840-armv4_pass_fix-v4bx_to_ld.patch | 0 .../{12.1.0 => 12.2.0}/850-use_shared_libgcc.patch | 0 .../{12.1.0 => 12.2.0}/851-libgcc_no_compat.patch | 0 .../{12.1.0 => 12.2.0}/870-ppc_no_crtsavres.patch | 0 .../patches/{12.1.0 => 12.2.0}/881-no_tm_section.patch | 0 .../{12.1.0 => 12.2.0}/900-bad-mips16-crt.patch | 0 .../patches/{12.1.0 => 12.2.0}/910-mbsd_multi.patch | 2 +- .../{12.1.0 => 12.2.0}/920-specs_nonfatal_getenv.patch | 0 ...ls-fix-compilation-when-making-cross-compiler.patch | 0 .../970-macos_arm64-building-fix.patch | 10 +++++----- 19 files changed, 9 insertions(+), 9 deletions(-) rename toolchain/gcc/patches/{12.1.0 => 12.2.0}/002-case_insensitive.patch (100%) rename toolchain/gcc/patches/{12.1.0 => 12.2.0}/010-documentation.patch (100%) rename toolchain/gcc/patches/{12.1.0 => 12.2.0}/110-Fix-MIPS-PR-84790.patch (100%) rename toolchain/gcc/patches/{12.1.0 => 12.2.0}/230-musl_libssp.patch (100%) rename toolchain/gcc/patches/{12.1.0 => 12.2.0}/300-mips_Os_cpu_rtx_cost_model.patch (100%) rename toolchain/gcc/patches/{12.1.0 => 12.2.0}/810-arm-softfloat-libgcc.patch (100%) rename toolchain/gcc/patches/{12.1.0 => 12.2.0}/820-libgcc_pic.patch (100%) rename toolchain/gcc/patches/{12.1.0 => 12.2.0}/840-armv4_pass_fix-v4bx_to_ld.patch (100%) rename toolchain/gcc/patches/{12.1.0 => 12.2.0}/850-use_shared_libgcc.patch (100%) rename toolchain/gcc/patches/{12.1.0 => 12.2.0}/851-libgcc_no_compat.patch (100%) rename toolchain/gcc/patches/{12.1.0 => 12.2.0}/870-ppc_no_crtsavres.patch (100%) rename toolchain/gcc/patches/{12.1.0 => 12.2.0}/881-no_tm_section.patch (100%) rename toolchain/gcc/patches/{12.1.0 => 12.2.0}/900-bad-mips16-crt.patch (100%) rename toolchain/gcc/patches/{12.1.0 => 12.2.0}/910-mbsd_multi.patch (98%) rename toolchain/gcc/patches/{12.1.0 => 12.2.0}/920-specs_nonfatal_getenv.patch (100%) rename toolchain/gcc/patches/{12.1.0 => 12.2.0}/960-gotools-fix-compilation-when-making-cross-compiler.patch (100%) rename toolchain/gcc/patches/{12.1.0 => 12.2.0}/970-macos_arm64-building-fix.patch (88%) diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version index 1caa51a2916..a909979cf66 100644 --- a/toolchain/gcc/Config.version +++ b/toolchain/gcc/Config.version @@ -14,5 +14,5 @@ config GCC_VERSION string default "8.4.0" if GCC_VERSION_8 default "10.3.0" if GCC_VERSION_10 - default "12.1.0" if GCC_VERSION_12 + default "12.2.0" if GCC_VERSION_12 default "11.3.0" diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk index 926418f4a77..f116af7e1ae 100644 --- a/toolchain/gcc/common.mk +++ b/toolchain/gcc/common.mk @@ -40,8 +40,8 @@ ifeq ($(PKG_VERSION),11.3.0) PKG_HASH:=b47cf2818691f5b1e21df2bb38c795fac2cfbd640ede2d0a5e1c89e338a3ac39 endif -ifeq ($(PKG_VERSION),12.1.0) - PKG_HASH:=62fd634889f31c02b64af2c468f064b47ad1ca78411c45abe6ac4b5f8dd19c7b +ifeq ($(PKG_VERSION),12.2.0) + PKG_HASH:=e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff endif PATCH_DIR=../patches/$(GCC_VERSION) diff --git a/toolchain/gcc/patches/12.1.0/002-case_insensitive.patch b/toolchain/gcc/patches/12.2.0/002-case_insensitive.patch similarity index 100% rename from toolchain/gcc/patches/12.1.0/002-case_insensitive.patch rename to toolchain/gcc/patches/12.2.0/002-case_insensitive.patch diff --git a/toolchain/gcc/patches/12.1.0/010-documentation.patch b/toolchain/gcc/patches/12.2.0/010-documentation.patch similarity index 100% rename from toolchain/gcc/patches/12.1.0/010-documentation.patch rename to toolchain/gcc/patches/12.2.0/010-documentation.patch diff --git a/toolchain/gcc/patches/12.1.0/110-Fix-MIPS-PR-84790.patch b/toolchain/gcc/patches/12.2.0/110-Fix-MIPS-PR-84790.patch similarity index 100% rename from toolchain/gcc/patches/12.1.0/110-Fix-MIPS-PR-84790.patch rename to toolchain/gcc/patches/12.2.0/110-Fix-MIPS-PR-84790.patch diff --git a/toolchain/gcc/patches/12.1.0/230-musl_libssp.patch b/toolchain/gcc/patches/12.2.0/230-musl_libssp.patch similarity index 100% rename from toolchain/gcc/patches/12.1.0/230-musl_libssp.patch rename to toolchain/gcc/patches/12.2.0/230-musl_libssp.patch diff --git a/toolchain/gcc/patches/12.1.0/300-mips_Os_cpu_rtx_cost_model.patch b/toolchain/gcc/patches/12.2.0/300-mips_Os_cpu_rtx_cost_model.patch similarity index 100% rename from toolchain/gcc/patches/12.1.0/300-mips_Os_cpu_rtx_cost_model.patch rename to toolchain/gcc/patches/12.2.0/300-mips_Os_cpu_rtx_cost_model.patch diff --git a/toolchain/gcc/patches/12.1.0/810-arm-softfloat-libgcc.patch b/toolchain/gcc/patches/12.2.0/810-arm-softfloat-libgcc.patch similarity index 100% rename from toolchain/gcc/patches/12.1.0/810-arm-softfloat-libgcc.patch rename to toolchain/gcc/patches/12.2.0/810-arm-softfloat-libgcc.patch diff --git a/toolchain/gcc/patches/12.1.0/820-libgcc_pic.patch b/toolchain/gcc/patches/12.2.0/820-libgcc_pic.patch similarity index 100% rename from toolchain/gcc/patches/12.1.0/820-libgcc_pic.patch rename to toolchain/gcc/patches/12.2.0/820-libgcc_pic.patch diff --git a/toolchain/gcc/patches/12.1.0/840-armv4_pass_fix-v4bx_to_ld.patch b/toolchain/gcc/patches/12.2.0/840-armv4_pass_fix-v4bx_to_ld.patch similarity index 100% rename from toolchain/gcc/patches/12.1.0/840-armv4_pass_fix-v4bx_to_ld.patch rename to toolchain/gcc/patches/12.2.0/840-armv4_pass_fix-v4bx_to_ld.patch diff --git a/toolchain/gcc/patches/12.1.0/850-use_shared_libgcc.patch b/toolchain/gcc/patches/12.2.0/850-use_shared_libgcc.patch similarity index 100% rename from toolchain/gcc/patches/12.1.0/850-use_shared_libgcc.patch rename to toolchain/gcc/patches/12.2.0/850-use_shared_libgcc.patch diff --git a/toolchain/gcc/patches/12.1.0/851-libgcc_no_compat.patch b/toolchain/gcc/patches/12.2.0/851-libgcc_no_compat.patch similarity index 100% rename from toolchain/gcc/patches/12.1.0/851-libgcc_no_compat.patch rename to toolchain/gcc/patches/12.2.0/851-libgcc_no_compat.patch diff --git a/toolchain/gcc/patches/12.1.0/870-ppc_no_crtsavres.patch b/toolchain/gcc/patches/12.2.0/870-ppc_no_crtsavres.patch similarity index 100% rename from toolchain/gcc/patches/12.1.0/870-ppc_no_crtsavres.patch rename to toolchain/gcc/patches/12.2.0/870-ppc_no_crtsavres.patch diff --git a/toolchain/gcc/patches/12.1.0/881-no_tm_section.patch b/toolchain/gcc/patches/12.2.0/881-no_tm_section.patch similarity index 100% rename from toolchain/gcc/patches/12.1.0/881-no_tm_section.patch rename to toolchain/gcc/patches/12.2.0/881-no_tm_section.patch diff --git a/toolchain/gcc/patches/12.1.0/900-bad-mips16-crt.patch b/toolchain/gcc/patches/12.2.0/900-bad-mips16-crt.patch similarity index 100% rename from toolchain/gcc/patches/12.1.0/900-bad-mips16-crt.patch rename to toolchain/gcc/patches/12.2.0/900-bad-mips16-crt.patch diff --git a/toolchain/gcc/patches/12.1.0/910-mbsd_multi.patch b/toolchain/gcc/patches/12.2.0/910-mbsd_multi.patch similarity index 98% rename from toolchain/gcc/patches/12.1.0/910-mbsd_multi.patch rename to toolchain/gcc/patches/12.2.0/910-mbsd_multi.patch index 37aba93b947..4033c5b23bc 100644 --- a/toolchain/gcc/patches/12.1.0/910-mbsd_multi.patch +++ b/toolchain/gcc/patches/12.2.0/910-mbsd_multi.patch @@ -134,7 +134,7 @@ Date: Tue Jul 31 00:52:27 2007 +0000 @opindex Wno-stack-protector --- a/gcc/opts.cc +++ b/gcc/opts.cc -@@ -2658,6 +2658,9 @@ common_handle_option (struct gcc_options +@@ -2692,6 +2692,9 @@ common_handle_option (struct gcc_options add_comma_separated_to_vector (&opts->x_flag_ignored_attributes, arg); break; diff --git a/toolchain/gcc/patches/12.1.0/920-specs_nonfatal_getenv.patch b/toolchain/gcc/patches/12.2.0/920-specs_nonfatal_getenv.patch similarity index 100% rename from toolchain/gcc/patches/12.1.0/920-specs_nonfatal_getenv.patch rename to toolchain/gcc/patches/12.2.0/920-specs_nonfatal_getenv.patch diff --git a/toolchain/gcc/patches/12.1.0/960-gotools-fix-compilation-when-making-cross-compiler.patch b/toolchain/gcc/patches/12.2.0/960-gotools-fix-compilation-when-making-cross-compiler.patch similarity index 100% rename from toolchain/gcc/patches/12.1.0/960-gotools-fix-compilation-when-making-cross-compiler.patch rename to toolchain/gcc/patches/12.2.0/960-gotools-fix-compilation-when-making-cross-compiler.patch diff --git a/toolchain/gcc/patches/12.1.0/970-macos_arm64-building-fix.patch b/toolchain/gcc/patches/12.2.0/970-macos_arm64-building-fix.patch similarity index 88% rename from toolchain/gcc/patches/12.1.0/970-macos_arm64-building-fix.patch rename to toolchain/gcc/patches/12.2.0/970-macos_arm64-building-fix.patch index d164d70e881..86fa68e1b10 100644 --- a/toolchain/gcc/patches/12.1.0/970-macos_arm64-building-fix.patch +++ b/toolchain/gcc/patches/12.2.0/970-macos_arm64-building-fix.patch @@ -17,7 +17,7 @@ Date: Mon Aug 16 13:16:21 2021 +0100 --- a/gcc/config/aarch64/aarch64.h +++ b/gcc/config/aarch64/aarch64.h -@@ -1236,7 +1236,7 @@ extern const char *aarch64_rewrite_mcpu +@@ -1290,7 +1290,7 @@ extern const char *aarch64_rewrite_mcpu #define MCPU_TO_MARCH_SPEC_FUNCTIONS \ { "rewrite_mcpu", aarch64_rewrite_mcpu }, @@ -28,8 +28,8 @@ Date: Mon Aug 16 13:16:21 2021 +0100 # define EXTRA_SPEC_FUNCTIONS \ --- a/gcc/config/host-darwin.cc +++ b/gcc/config/host-darwin.cc -@@ -22,6 +22,8 @@ - #include "coretypes.h" +@@ -23,6 +23,8 @@ + #include "options.h" #include "diagnostic-core.h" #include "config/host-darwin.h" +#include "hosthooks.h" @@ -37,9 +37,9 @@ Date: Mon Aug 16 13:16:21 2021 +0100 #include /* For Darwin (macOS only) platforms, without ASLR (PIE) enabled on the -@@ -79,3 +81,5 @@ darwin_gt_pch_use_address (void *addr, s +@@ -181,3 +183,5 @@ darwin_gt_pch_use_address (void *&addr, - return ret; + return 1; } + +const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER; -- 2.30.2