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 <[email protected]>
AlexMcLellanIndra · Aug 28, 2022 · fac1f38 · fac1f38
1 parent f0adf25
commit fac1f38
Show file tree

Hide file tree

Showing 19 changed files with 9 additions and 9 deletions.
diff --git 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
@@ -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/...patches/12.1.0/002-case_insensitive.patch → ...patches/12.2.0/002-case_insensitive.patch b/...patches/12.1.0/002-case_insensitive.patch → ...patches/12.2.0/002-case_insensitive.patch
diff --git a/...cc/patches/12.1.0/010-documentation.patch → ...cc/patches/12.2.0/010-documentation.patch b/...cc/patches/12.1.0/010-documentation.patch → ...cc/patches/12.2.0/010-documentation.patch
diff --git a/...atches/12.1.0/110-Fix-MIPS-PR-84790.patch → ...atches/12.2.0/110-Fix-MIPS-PR-84790.patch b/...atches/12.1.0/110-Fix-MIPS-PR-84790.patch → ...atches/12.2.0/110-Fix-MIPS-PR-84790.patch
diff --git a/.../gcc/patches/12.1.0/230-musl_libssp.patch → .../gcc/patches/12.2.0/230-musl_libssp.patch b/.../gcc/patches/12.1.0/230-musl_libssp.patch → .../gcc/patches/12.2.0/230-musl_libssp.patch
diff --git a/....1.0/300-mips_Os_cpu_rtx_cost_model.patch → ....2.0/300-mips_Os_cpu_rtx_cost_model.patch b/....1.0/300-mips_Os_cpu_rtx_cost_model.patch → ....2.0/300-mips_Os_cpu_rtx_cost_model.patch
diff --git a/...hes/12.1.0/810-arm-softfloat-libgcc.patch → ...hes/12.2.0/810-arm-softfloat-libgcc.patch b/...hes/12.1.0/810-arm-softfloat-libgcc.patch → ...hes/12.2.0/810-arm-softfloat-libgcc.patch
diff --git a/...n/gcc/patches/12.1.0/820-libgcc_pic.patch → ...n/gcc/patches/12.2.0/820-libgcc_pic.patch b/...n/gcc/patches/12.1.0/820-libgcc_pic.patch → ...n/gcc/patches/12.2.0/820-libgcc_pic.patch
diff --git a/...2.1.0/840-armv4_pass_fix-v4bx_to_ld.patch → ...2.2.0/840-armv4_pass_fix-v4bx_to_ld.patch b/...2.1.0/840-armv4_pass_fix-v4bx_to_ld.patch → ...2.2.0/840-armv4_pass_fix-v4bx_to_ld.patch
diff --git a/...atches/12.1.0/850-use_shared_libgcc.patch → ...atches/12.2.0/850-use_shared_libgcc.patch b/...atches/12.1.0/850-use_shared_libgcc.patch → ...atches/12.2.0/850-use_shared_libgcc.patch
diff --git a/...patches/12.1.0/851-libgcc_no_compat.patch → ...patches/12.2.0/851-libgcc_no_compat.patch b/...patches/12.1.0/851-libgcc_no_compat.patch → ...patches/12.2.0/851-libgcc_no_compat.patch
diff --git a/...patches/12.1.0/870-ppc_no_crtsavres.patch → ...patches/12.2.0/870-ppc_no_crtsavres.patch b/...patches/12.1.0/870-ppc_no_crtsavres.patch → ...patches/12.2.0/870-ppc_no_crtsavres.patch
diff --git a/...cc/patches/12.1.0/881-no_tm_section.patch → ...cc/patches/12.2.0/881-no_tm_section.patch b/...cc/patches/12.1.0/881-no_tm_section.patch → ...cc/patches/12.2.0/881-no_tm_section.patch
diff --git a/...c/patches/12.1.0/900-bad-mips16-crt.patch → ...c/patches/12.2.0/900-bad-mips16-crt.patch b/...c/patches/12.1.0/900-bad-mips16-crt.patch → ...c/patches/12.2.0/900-bad-mips16-crt.patch
diff --git a/...n/gcc/patches/12.1.0/910-mbsd_multi.patch → ...n/gcc/patches/12.2.0/910-mbsd_multi.patch b/...n/gcc/patches/12.1.0/910-mbsd_multi.patch → ...n/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/...es/12.1.0/920-specs_nonfatal_getenv.patch → ...es/12.2.0/920-specs_nonfatal_getenv.patch b/...es/12.1.0/920-specs_nonfatal_getenv.patch → ...es/12.2.0/920-specs_nonfatal_getenv.patch
diff --git a/...pilation-when-making-cross-compiler.patch → ...pilation-when-making-cross-compiler.patch b/...pilation-when-making-cross-compiler.patch → ...pilation-when-making-cross-compiler.patch
diff --git a/...12.1.0/970-macos_arm64-building-fix.patch → ...12.2.0/970-macos_arm64-building-fix.patch b/...12.1.0/970-macos_arm64-building-fix.patch → ...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,18 +28,18 @@ 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"
 +#include "hosthooks-def.h"
  #include <errno.h>
 
  /* 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;