devel: gcc: align patches structure to openwrt toolchain GCC

Align patches structure to openwrt toolchain GCC to make it easier to
maintain them and reduce patch delta on GCC update.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

78 files changed, 2 insertions, 1 deletions

diff --git a/devel/gcc/Makefile b/devel/gcc/Makefile
index e45372e4f..583ce15bc 100644
--- a/devel/gcc/Makefile
+++ b/devel/gcc/Makefile
@@ -23,6 +23,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=gcc
 GCC_VERSION:=$(call qstrip,$(CONFIG_GCC_VERSION))
 PKG_VERSION:=$(firstword $(subst +, ,$(GCC_VERSION)))
+GCC_MAJOR_VERSION:=$(word 1,$(subst ., ,$(PKG_VERSION)))
 PKG_RELEASE:=5
 GCC_DIR:=$(PKG_NAME)-$(PKG_VERSION)
 
@@ -50,7 +51,7 @@ ifeq ($(PKG_VERSION),12.3.0)
 	PKG_HASH:=949a5d4f99e786421a93b532b22ffab5578de7321369975b91aec97adfda8c3b
 endif
 
-PATCH_DIR=./patches/$(GCC_VERSION)
+PATCH_DIR:=patches-$(GCC_MAJOR_VERSION).x
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/devel/gcc/patches/10.3.0/002-case_insensitive.patch b/devel/gcc/patches-10.x/002-case_insensitive.patch
index 409497e5a..409497e5a 100644
--- a/devel/gcc/patches/10.3.0/002-case_insensitive.patch
+++ b/devel/gcc/patches-10.x/002-case_insensitive.patch
diff --git a/devel/gcc/patches/10.3.0/003-dont-choke-when-building-32bit-on-64bit.patch b/devel/gcc/patches-10.x/003-dont-choke-when-building-32bit-on-64bit.patch
index 4b91f49a0..4b91f49a0 100644
--- a/devel/gcc/patches/10.3.0/003-dont-choke-when-building-32bit-on-64bit.patch
+++ b/devel/gcc/patches-10.x/003-dont-choke-when-building-32bit-on-64bit.patch
diff --git a/devel/gcc/patches/10.3.0/010-documentation.patch b/devel/gcc/patches-10.x/010-documentation.patch
index 85990e5ac..85990e5ac 100644
--- a/devel/gcc/patches/10.3.0/010-documentation.patch
+++ b/devel/gcc/patches-10.x/010-documentation.patch
diff --git a/devel/gcc/patches/10.3.0/110-Fix-MIPS-PR-84790.patch b/devel/gcc/patches-10.x/110-Fix-MIPS-PR-84790.patch
index 82ac013d3..82ac013d3 100644
--- a/devel/gcc/patches/10.3.0/110-Fix-MIPS-PR-84790.patch
+++ b/devel/gcc/patches-10.x/110-Fix-MIPS-PR-84790.patch
diff --git a/devel/gcc/patches/10.3.0/230-musl_libssp.patch b/devel/gcc/patches-10.x/230-musl_libssp.patch
index 63f37662f..63f37662f 100644
--- a/devel/gcc/patches/10.3.0/230-musl_libssp.patch
+++ b/devel/gcc/patches-10.x/230-musl_libssp.patch
diff --git a/devel/gcc/patches/10.3.0/300-mips_Os_cpu_rtx_cost_model.patch b/devel/gcc/patches-10.x/300-mips_Os_cpu_rtx_cost_model.patch
index 8c4a5fce1..8c4a5fce1 100644
--- a/devel/gcc/patches/10.3.0/300-mips_Os_cpu_rtx_cost_model.patch
+++ b/devel/gcc/patches-10.x/300-mips_Os_cpu_rtx_cost_model.patch
diff --git a/devel/gcc/patches/10.3.0/810-arm-softfloat-libgcc.patch b/devel/gcc/patches-10.x/810-arm-softfloat-libgcc.patch
index 5c9d86aea..5c9d86aea 100644
--- a/devel/gcc/patches/10.3.0/810-arm-softfloat-libgcc.patch
+++ b/devel/gcc/patches-10.x/810-arm-softfloat-libgcc.patch
diff --git a/devel/gcc/patches/10.3.0/820-libgcc_pic.patch b/devel/gcc/patches-10.x/820-libgcc_pic.patch
index ddd6cf873..ddd6cf873 100644
--- a/devel/gcc/patches/10.3.0/820-libgcc_pic.patch
+++ b/devel/gcc/patches-10.x/820-libgcc_pic.patch
diff --git a/devel/gcc/patches/10.3.0/840-armv4_pass_fix-v4bx_to_ld.patch b/devel/gcc/patches-10.x/840-armv4_pass_fix-v4bx_to_ld.patch
index e3cb616c4..e3cb616c4 100644
--- a/devel/gcc/patches/10.3.0/840-armv4_pass_fix-v4bx_to_ld.patch
+++ b/devel/gcc/patches-10.x/840-armv4_pass_fix-v4bx_to_ld.patch
diff --git a/devel/gcc/patches/10.3.0/850-use_shared_libgcc.patch b/devel/gcc/patches-10.x/850-use_shared_libgcc.patch
index 8b17f1374..8b17f1374 100644
--- a/devel/gcc/patches/10.3.0/850-use_shared_libgcc.patch
+++ b/devel/gcc/patches-10.x/850-use_shared_libgcc.patch
diff --git a/devel/gcc/patches/10.3.0/851-libgcc_no_compat.patch b/devel/gcc/patches-10.x/851-libgcc_no_compat.patch
index d710e4071..d710e4071 100644
--- a/devel/gcc/patches/10.3.0/851-libgcc_no_compat.patch
+++ b/devel/gcc/patches-10.x/851-libgcc_no_compat.patch
diff --git a/devel/gcc/patches/10.3.0/870-ppc_no_crtsavres.patch b/devel/gcc/patches-10.x/870-ppc_no_crtsavres.patch
index bc182f0ce..bc182f0ce 100644
--- a/devel/gcc/patches/10.3.0/870-ppc_no_crtsavres.patch
+++ b/devel/gcc/patches-10.x/870-ppc_no_crtsavres.patch
diff --git a/devel/gcc/patches/10.3.0/881-no_tm_section.patch b/devel/gcc/patches-10.x/881-no_tm_section.patch
index 2029910fd..2029910fd 100644
--- a/devel/gcc/patches/10.3.0/881-no_tm_section.patch
+++ b/devel/gcc/patches-10.x/881-no_tm_section.patch
diff --git a/devel/gcc/patches/10.3.0/900-bad-mips16-crt.patch b/devel/gcc/patches-10.x/900-bad-mips16-crt.patch
index dd6e9dc88..dd6e9dc88 100644
--- a/devel/gcc/patches/10.3.0/900-bad-mips16-crt.patch
+++ b/devel/gcc/patches-10.x/900-bad-mips16-crt.patch
diff --git a/devel/gcc/patches/10.3.0/910-mbsd_multi.patch b/devel/gcc/patches-10.x/910-mbsd_multi.patch
index 3ed623831..3ed623831 100644
--- a/devel/gcc/patches/10.3.0/910-mbsd_multi.patch
+++ b/devel/gcc/patches-10.x/910-mbsd_multi.patch
diff --git a/devel/gcc/patches/10.3.0/920-specs_nonfatal_getenv.patch b/devel/gcc/patches-10.x/920-specs_nonfatal_getenv.patch
index 487b9e47c..487b9e47c 100644
--- a/devel/gcc/patches/10.3.0/920-specs_nonfatal_getenv.patch
+++ b/devel/gcc/patches-10.x/920-specs_nonfatal_getenv.patch
diff --git a/devel/gcc/patches/10.3.0/930-fix-mips-noexecstack.patch b/devel/gcc/patches-10.x/930-fix-mips-noexecstack.patch
index e795acd1d..e795acd1d 100644
--- a/devel/gcc/patches/10.3.0/930-fix-mips-noexecstack.patch
+++ b/devel/gcc/patches-10.x/930-fix-mips-noexecstack.patch
diff --git a/devel/gcc/patches/10.3.0/931-libffi-fix-MIPS-softfloat-build-issue.patch b/devel/gcc/patches-10.x/931-libffi-fix-MIPS-softfloat-build-issue.patch
index fb4cb1533..fb4cb1533 100644
--- a/devel/gcc/patches/10.3.0/931-libffi-fix-MIPS-softfloat-build-issue.patch
+++ b/devel/gcc/patches-10.x/931-libffi-fix-MIPS-softfloat-build-issue.patch
diff --git a/devel/gcc/patches/10.3.0/960-gotools-fix-compilation-when-making-cross-compiler.patch b/devel/gcc/patches-10.x/960-gotools-fix-compilation-when-making-cross-compiler.patch
index b1d757632..b1d757632 100644
--- a/devel/gcc/patches/10.3.0/960-gotools-fix-compilation-when-making-cross-compiler.patch
+++ b/devel/gcc/patches-10.x/960-gotools-fix-compilation-when-making-cross-compiler.patch
diff --git a/devel/gcc/patches/11.3.0/002-case_insensitive.patch b/devel/gcc/patches-11.x/002-case_insensitive.patch
index 409497e5a..409497e5a 100644
--- a/devel/gcc/patches/11.3.0/002-case_insensitive.patch
+++ b/devel/gcc/patches-11.x/002-case_insensitive.patch
diff --git a/devel/gcc/patches/11.3.0/003-dont-choke-when-building-32bit-on-64bit.patch b/devel/gcc/patches-11.x/003-dont-choke-when-building-32bit-on-64bit.patch
index c41f35e33..c41f35e33 100644
--- a/devel/gcc/patches/11.3.0/003-dont-choke-when-building-32bit-on-64bit.patch
+++ b/devel/gcc/patches-11.x/003-dont-choke-when-building-32bit-on-64bit.patch
diff --git a/devel/gcc/patches/11.3.0/010-documentation.patch b/devel/gcc/patches-11.x/010-documentation.patch
index 25a5e1e99..25a5e1e99 100644
--- a/devel/gcc/patches/11.3.0/010-documentation.patch
+++ b/devel/gcc/patches-11.x/010-documentation.patch
diff --git a/devel/gcc/patches/11.3.0/011-v12-configure-define-TARGET_LIBC_GNUSTACK-on-musl.patch b/devel/gcc/patches-11.x/011-v12-configure-define-TARGET_LIBC_GNUSTACK-on-musl.patch
index 423def600..423def600 100644
--- a/devel/gcc/patches/11.3.0/011-v12-configure-define-TARGET_LIBC_GNUSTACK-on-musl.patch
+++ b/devel/gcc/patches-11.x/011-v12-configure-define-TARGET_LIBC_GNUSTACK-on-musl.patch
diff --git a/devel/gcc/patches/11.3.0/110-Fix-MIPS-PR-84790.patch b/devel/gcc/patches-11.x/110-Fix-MIPS-PR-84790.patch
index 82ac013d3..82ac013d3 100644
--- a/devel/gcc/patches/11.3.0/110-Fix-MIPS-PR-84790.patch
+++ b/devel/gcc/patches-11.x/110-Fix-MIPS-PR-84790.patch
diff --git a/devel/gcc/patches/11.3.0/230-musl_libssp.patch b/devel/gcc/patches-11.x/230-musl_libssp.patch
index 66b88bc9e..66b88bc9e 100644
--- a/devel/gcc/patches/11.3.0/230-musl_libssp.patch
+++ b/devel/gcc/patches-11.x/230-musl_libssp.patch
diff --git a/devel/gcc/patches/11.3.0/300-mips_Os_cpu_rtx_cost_model.patch b/devel/gcc/patches-11.x/300-mips_Os_cpu_rtx_cost_model.patch
index 8c4a5fce1..8c4a5fce1 100644
--- a/devel/gcc/patches/11.3.0/300-mips_Os_cpu_rtx_cost_model.patch
+++ b/devel/gcc/patches-11.x/300-mips_Os_cpu_rtx_cost_model.patch
diff --git a/devel/gcc/patches/11.3.0/810-arm-softfloat-libgcc.patch b/devel/gcc/patches-11.x/810-arm-softfloat-libgcc.patch
index 5c9d86aea..5c9d86aea 100644
--- a/devel/gcc/patches/11.3.0/810-arm-softfloat-libgcc.patch
+++ b/devel/gcc/patches-11.x/810-arm-softfloat-libgcc.patch
diff --git a/devel/gcc/patches/11.3.0/820-libgcc_pic.patch b/devel/gcc/patches-11.x/820-libgcc_pic.patch
index 525a95b56..525a95b56 100644
--- a/devel/gcc/patches/11.3.0/820-libgcc_pic.patch
+++ b/devel/gcc/patches-11.x/820-libgcc_pic.patch
diff --git a/devel/gcc/patches/11.3.0/840-armv4_pass_fix-v4bx_to_ld.patch b/devel/gcc/patches-11.x/840-armv4_pass_fix-v4bx_to_ld.patch
index e3cb616c4..e3cb616c4 100644
--- a/devel/gcc/patches/11.3.0/840-armv4_pass_fix-v4bx_to_ld.patch
+++ b/devel/gcc/patches-11.x/840-armv4_pass_fix-v4bx_to_ld.patch
diff --git a/devel/gcc/patches/11.3.0/850-use_shared_libgcc.patch b/devel/gcc/patches-11.x/850-use_shared_libgcc.patch
index 8b17f1374..8b17f1374 100644
--- a/devel/gcc/patches/11.3.0/850-use_shared_libgcc.patch
+++ b/devel/gcc/patches-11.x/850-use_shared_libgcc.patch
diff --git a/devel/gcc/patches/11.3.0/851-libgcc_no_compat.patch b/devel/gcc/patches-11.x/851-libgcc_no_compat.patch
index d710e4071..d710e4071 100644
--- a/devel/gcc/patches/11.3.0/851-libgcc_no_compat.patch
+++ b/devel/gcc/patches-11.x/851-libgcc_no_compat.patch
diff --git a/devel/gcc/patches/11.3.0/870-ppc_no_crtsavres.patch b/devel/gcc/patches-11.x/870-ppc_no_crtsavres.patch
index bc182f0ce..bc182f0ce 100644
--- a/devel/gcc/patches/11.3.0/870-ppc_no_crtsavres.patch
+++ b/devel/gcc/patches-11.x/870-ppc_no_crtsavres.patch
diff --git a/devel/gcc/patches/11.3.0/881-no_tm_section.patch b/devel/gcc/patches-11.x/881-no_tm_section.patch
index 2029910fd..2029910fd 100644
--- a/devel/gcc/patches/11.3.0/881-no_tm_section.patch
+++ b/devel/gcc/patches-11.x/881-no_tm_section.patch
diff --git a/devel/gcc/patches/11.3.0/900-bad-mips16-crt.patch b/devel/gcc/patches-11.x/900-bad-mips16-crt.patch
index dd6e9dc88..dd6e9dc88 100644
--- a/devel/gcc/patches/11.3.0/900-bad-mips16-crt.patch
+++ b/devel/gcc/patches-11.x/900-bad-mips16-crt.patch
diff --git a/devel/gcc/patches/11.3.0/910-mbsd_multi.patch b/devel/gcc/patches-11.x/910-mbsd_multi.patch
index 21f532043..21f532043 100644
--- a/devel/gcc/patches/11.3.0/910-mbsd_multi.patch
+++ b/devel/gcc/patches-11.x/910-mbsd_multi.patch
diff --git a/devel/gcc/patches/11.3.0/920-specs_nonfatal_getenv.patch b/devel/gcc/patches-11.x/920-specs_nonfatal_getenv.patch
index 83bcb25a8..83bcb25a8 100644
--- a/devel/gcc/patches/11.3.0/920-specs_nonfatal_getenv.patch
+++ b/devel/gcc/patches-11.x/920-specs_nonfatal_getenv.patch
diff --git a/devel/gcc/patches/11.3.0/931-libffi-fix-MIPS-softfloat-build-issue.patch b/devel/gcc/patches-11.x/931-libffi-fix-MIPS-softfloat-build-issue.patch
index fb4cb1533..fb4cb1533 100644
--- a/devel/gcc/patches/11.3.0/931-libffi-fix-MIPS-softfloat-build-issue.patch
+++ b/devel/gcc/patches-11.x/931-libffi-fix-MIPS-softfloat-build-issue.patch
diff --git a/devel/gcc/patches/11.3.0/960-gotools-fix-compilation-when-making-cross-compiler.patch b/devel/gcc/patches-11.x/960-gotools-fix-compilation-when-making-cross-compiler.patch
index b1d757632..b1d757632 100644
--- a/devel/gcc/patches/11.3.0/960-gotools-fix-compilation-when-making-cross-compiler.patch
+++ b/devel/gcc/patches-11.x/960-gotools-fix-compilation-when-making-cross-compiler.patch
diff --git a/devel/gcc/patches/11.3.0/970-macos_arm64-building-fix.patch b/devel/gcc/patches-11.x/970-macos_arm64-building-fix.patch
index 424899eb9..424899eb9 100644
--- a/devel/gcc/patches/11.3.0/970-macos_arm64-building-fix.patch
+++ b/devel/gcc/patches-11.x/970-macos_arm64-building-fix.patch
diff --git a/devel/gcc/patches/12.3.0/002-case_insensitive.patch b/devel/gcc/patches-12.x/002-case_insensitive.patch
index 409497e5a..409497e5a 100644
--- a/devel/gcc/patches/12.3.0/002-case_insensitive.patch
+++ b/devel/gcc/patches-12.x/002-case_insensitive.patch
diff --git a/devel/gcc/patches/12.3.0/003-dont-choke-when-building-32bit-on-64bit.patch b/devel/gcc/patches-12.x/003-dont-choke-when-building-32bit-on-64bit.patch
index c41f35e33..c41f35e33 100644
--- a/devel/gcc/patches/12.3.0/003-dont-choke-when-building-32bit-on-64bit.patch
+++ b/devel/gcc/patches-12.x/003-dont-choke-when-building-32bit-on-64bit.patch
diff --git a/devel/gcc/patches/12.3.0/010-documentation.patch b/devel/gcc/patches-12.x/010-documentation.patch
index 39ee48ed6..39ee48ed6 100644
--- a/devel/gcc/patches/12.3.0/010-documentation.patch
+++ b/devel/gcc/patches-12.x/010-documentation.patch
diff --git a/devel/gcc/patches/12.3.0/110-Fix-MIPS-PR-84790.patch b/devel/gcc/patches-12.x/110-Fix-MIPS-PR-84790.patch
index 856fd6a46..856fd6a46 100644
--- a/devel/gcc/patches/12.3.0/110-Fix-MIPS-PR-84790.patch
+++ b/devel/gcc/patches-12.x/110-Fix-MIPS-PR-84790.patch
diff --git a/devel/gcc/patches/12.3.0/230-musl_libssp.patch b/devel/gcc/patches-12.x/230-musl_libssp.patch
index a909d6387..a909d6387 100644
--- a/devel/gcc/patches/12.3.0/230-musl_libssp.patch
+++ b/devel/gcc/patches-12.x/230-musl_libssp.patch
diff --git a/devel/gcc/patches/12.3.0/300-mips_Os_cpu_rtx_cost_model.patch b/devel/gcc/patches-12.x/300-mips_Os_cpu_rtx_cost_model.patch
index 1d223f2a0..1d223f2a0 100644
--- a/devel/gcc/patches/12.3.0/300-mips_Os_cpu_rtx_cost_model.patch
+++ b/devel/gcc/patches-12.x/300-mips_Os_cpu_rtx_cost_model.patch
diff --git a/devel/gcc/patches/12.3.0/810-arm-softfloat-libgcc.patch b/devel/gcc/patches-12.x/810-arm-softfloat-libgcc.patch
index 5c9d86aea..5c9d86aea 100644
--- a/devel/gcc/patches/12.3.0/810-arm-softfloat-libgcc.patch
+++ b/devel/gcc/patches-12.x/810-arm-softfloat-libgcc.patch
diff --git a/devel/gcc/patches/12.3.0/820-libgcc_pic.patch b/devel/gcc/patches-12.x/820-libgcc_pic.patch
index 525a95b56..525a95b56 100644
--- a/devel/gcc/patches/12.3.0/820-libgcc_pic.patch
+++ b/devel/gcc/patches-12.x/820-libgcc_pic.patch
diff --git a/devel/gcc/patches/12.3.0/840-armv4_pass_fix-v4bx_to_ld.patch b/devel/gcc/patches-12.x/840-armv4_pass_fix-v4bx_to_ld.patch
index e3cb616c4..e3cb616c4 100644
--- a/devel/gcc/patches/12.3.0/840-armv4_pass_fix-v4bx_to_ld.patch
+++ b/devel/gcc/patches-12.x/840-armv4_pass_fix-v4bx_to_ld.patch
diff --git a/devel/gcc/patches/12.3.0/850-use_shared_libgcc.patch b/devel/gcc/patches-12.x/850-use_shared_libgcc.patch
index 7be30f328..7be30f328 100644
--- a/devel/gcc/patches/12.3.0/850-use_shared_libgcc.patch
+++ b/devel/gcc/patches-12.x/850-use_shared_libgcc.patch
diff --git a/devel/gcc/patches/12.3.0/851-libgcc_no_compat.patch b/devel/gcc/patches-12.x/851-libgcc_no_compat.patch
index d710e4071..d710e4071 100644
--- a/devel/gcc/patches/12.3.0/851-libgcc_no_compat.patch
+++ b/devel/gcc/patches-12.x/851-libgcc_no_compat.patch
diff --git a/devel/gcc/patches/12.3.0/870-ppc_no_crtsavres.patch b/devel/gcc/patches-12.x/870-ppc_no_crtsavres.patch
index e51079dc1..e51079dc1 100644
--- a/devel/gcc/patches/12.3.0/870-ppc_no_crtsavres.patch
+++ b/devel/gcc/patches-12.x/870-ppc_no_crtsavres.patch
diff --git a/devel/gcc/patches/12.3.0/881-no_tm_section.patch b/devel/gcc/patches-12.x/881-no_tm_section.patch
index 2029910fd..2029910fd 100644
--- a/devel/gcc/patches/12.3.0/881-no_tm_section.patch
+++ b/devel/gcc/patches-12.x/881-no_tm_section.patch
diff --git a/devel/gcc/patches/12.3.0/900-bad-mips16-crt.patch b/devel/gcc/patches-12.x/900-bad-mips16-crt.patch
index dd6e9dc88..dd6e9dc88 100644
--- a/devel/gcc/patches/12.3.0/900-bad-mips16-crt.patch
+++ b/devel/gcc/patches-12.x/900-bad-mips16-crt.patch
diff --git a/devel/gcc/patches/12.3.0/910-mbsd_multi.patch b/devel/gcc/patches-12.x/910-mbsd_multi.patch
index 0f75d0ce0..0f75d0ce0 100644
--- a/devel/gcc/patches/12.3.0/910-mbsd_multi.patch
+++ b/devel/gcc/patches-12.x/910-mbsd_multi.patch
diff --git a/devel/gcc/patches/12.3.0/920-specs_nonfatal_getenv.patch b/devel/gcc/patches-12.x/920-specs_nonfatal_getenv.patch
index 59bd35004..59bd35004 100644
--- a/devel/gcc/patches/12.3.0/920-specs_nonfatal_getenv.patch
+++ b/devel/gcc/patches-12.x/920-specs_nonfatal_getenv.patch
diff --git a/devel/gcc/patches/12.3.0/960-gotools-fix-compilation-when-making-cross-compiler.patch b/devel/gcc/patches-12.x/960-gotools-fix-compilation-when-making-cross-compiler.patch
index b1d757632..b1d757632 100644
--- a/devel/gcc/patches/12.3.0/960-gotools-fix-compilation-when-making-cross-compiler.patch
+++ b/devel/gcc/patches-12.x/960-gotools-fix-compilation-when-making-cross-compiler.patch
diff --git a/devel/gcc/patches/12.3.0/970-macos_arm64-building-fix.patch b/devel/gcc/patches-12.x/970-macos_arm64-building-fix.patch
index 89730449f..89730449f 100644
--- a/devel/gcc/patches/12.3.0/970-macos_arm64-building-fix.patch
+++ b/devel/gcc/patches-12.x/970-macos_arm64-building-fix.patch
diff --git a/devel/gcc/patches/8.4.0/002-case_insensitive.patch b/devel/gcc/patches-8.x/002-case_insensitive.patch
index 3442076d7..3442076d7 100644
--- a/devel/gcc/patches/8.4.0/002-case_insensitive.patch
+++ b/devel/gcc/patches-8.x/002-case_insensitive.patch
diff --git a/devel/gcc/patches/8.4.0/003-dont-choke-when-building-32bit-on-64bit.patch b/devel/gcc/patches-8.x/003-dont-choke-when-building-32bit-on-64bit.patch
index 85b6744df..85b6744df 100644
--- a/devel/gcc/patches/8.4.0/003-dont-choke-when-building-32bit-on-64bit.patch
+++ b/devel/gcc/patches-8.x/003-dont-choke-when-building-32bit-on-64bit.patch
diff --git a/devel/gcc/patches/8.4.0/010-documentation.patch b/devel/gcc/patches-8.x/010-documentation.patch
index c7e3d4ad5..c7e3d4ad5 100644
--- a/devel/gcc/patches/8.4.0/010-documentation.patch
+++ b/devel/gcc/patches-8.x/010-documentation.patch
diff --git a/devel/gcc/patches/8.4.0/110-Fix-MIPS-PR-84790.patch b/devel/gcc/patches-8.x/110-Fix-MIPS-PR-84790.patch
index b89eca2fa..b89eca2fa 100644
--- a/devel/gcc/patches/8.4.0/110-Fix-MIPS-PR-84790.patch
+++ b/devel/gcc/patches-8.x/110-Fix-MIPS-PR-84790.patch
diff --git a/devel/gcc/patches/8.4.0/230-musl_libssp.patch b/devel/gcc/patches-8.x/230-musl_libssp.patch
index b3ab79caf..b3ab79caf 100644
--- a/devel/gcc/patches/8.4.0/230-musl_libssp.patch
+++ b/devel/gcc/patches-8.x/230-musl_libssp.patch
diff --git a/devel/gcc/patches/8.4.0/300-mips_Os_cpu_rtx_cost_model.patch b/devel/gcc/patches-8.x/300-mips_Os_cpu_rtx_cost_model.patch
index 2e2c609e4..2e2c609e4 100644
--- a/devel/gcc/patches/8.4.0/300-mips_Os_cpu_rtx_cost_model.patch
+++ b/devel/gcc/patches-8.x/300-mips_Os_cpu_rtx_cost_model.patch
diff --git a/devel/gcc/patches/8.4.0/800-arm_v5te_no_ldrd_strd.patch b/devel/gcc/patches-8.x/800-arm_v5te_no_ldrd_strd.patch
index 172295f28..172295f28 100644
--- a/devel/gcc/patches/8.4.0/800-arm_v5te_no_ldrd_strd.patch
+++ b/devel/gcc/patches-8.x/800-arm_v5te_no_ldrd_strd.patch
diff --git a/devel/gcc/patches/8.4.0/810-arm-softfloat-libgcc.patch b/devel/gcc/patches-8.x/810-arm-softfloat-libgcc.patch
index 5c9d86aea..5c9d86aea 100644
--- a/devel/gcc/patches/8.4.0/810-arm-softfloat-libgcc.patch
+++ b/devel/gcc/patches-8.x/810-arm-softfloat-libgcc.patch
diff --git a/devel/gcc/patches/8.4.0/820-libgcc_pic.patch b/devel/gcc/patches-8.x/820-libgcc_pic.patch
index 1a9678d48..1a9678d48 100644
--- a/devel/gcc/patches/8.4.0/820-libgcc_pic.patch
+++ b/devel/gcc/patches-8.x/820-libgcc_pic.patch
diff --git a/devel/gcc/patches/8.4.0/840-armv4_pass_fix-v4bx_to_ld.patch b/devel/gcc/patches-8.x/840-armv4_pass_fix-v4bx_to_ld.patch
index b9c9b161a..b9c9b161a 100644
--- a/devel/gcc/patches/8.4.0/840-armv4_pass_fix-v4bx_to_ld.patch
+++ b/devel/gcc/patches-8.x/840-armv4_pass_fix-v4bx_to_ld.patch
diff --git a/devel/gcc/patches/8.4.0/850-use_shared_libgcc.patch b/devel/gcc/patches-8.x/850-use_shared_libgcc.patch
index f619f0e6a..f619f0e6a 100644
--- a/devel/gcc/patches/8.4.0/850-use_shared_libgcc.patch
+++ b/devel/gcc/patches-8.x/850-use_shared_libgcc.patch
diff --git a/devel/gcc/patches/8.4.0/851-libgcc_no_compat.patch b/devel/gcc/patches-8.x/851-libgcc_no_compat.patch
index d710e4071..d710e4071 100644
--- a/devel/gcc/patches/8.4.0/851-libgcc_no_compat.patch
+++ b/devel/gcc/patches-8.x/851-libgcc_no_compat.patch
diff --git a/devel/gcc/patches/8.4.0/870-ppc_no_crtsavres.patch b/devel/gcc/patches-8.x/870-ppc_no_crtsavres.patch
index 51d11c3d8..51d11c3d8 100644
--- a/devel/gcc/patches/8.4.0/870-ppc_no_crtsavres.patch
+++ b/devel/gcc/patches-8.x/870-ppc_no_crtsavres.patch
diff --git a/devel/gcc/patches/8.4.0/881-no_tm_section.patch b/devel/gcc/patches-8.x/881-no_tm_section.patch
index fab5db3be..fab5db3be 100644
--- a/devel/gcc/patches/8.4.0/881-no_tm_section.patch
+++ b/devel/gcc/patches-8.x/881-no_tm_section.patch
diff --git a/devel/gcc/patches/8.4.0/900-bad-mips16-crt.patch b/devel/gcc/patches-8.x/900-bad-mips16-crt.patch
index dd6e9dc88..dd6e9dc88 100644
--- a/devel/gcc/patches/8.4.0/900-bad-mips16-crt.patch
+++ b/devel/gcc/patches-8.x/900-bad-mips16-crt.patch
diff --git a/devel/gcc/patches/8.4.0/910-mbsd_multi.patch b/devel/gcc/patches-8.x/910-mbsd_multi.patch
index c566ea35e..c566ea35e 100644
--- a/devel/gcc/patches/8.4.0/910-mbsd_multi.patch
+++ b/devel/gcc/patches-8.x/910-mbsd_multi.patch
diff --git a/devel/gcc/patches/8.4.0/920-specs_nonfatal_getenv.patch b/devel/gcc/patches-8.x/920-specs_nonfatal_getenv.patch
index c3836e63a..c3836e63a 100644
--- a/devel/gcc/patches/8.4.0/920-specs_nonfatal_getenv.patch
+++ b/devel/gcc/patches-8.x/920-specs_nonfatal_getenv.patch
diff --git a/devel/gcc/patches/8.4.0/930-fix-mips-noexecstack.patch b/devel/gcc/patches-8.x/930-fix-mips-noexecstack.patch
index ed8ada22a..ed8ada22a 100644
--- a/devel/gcc/patches/8.4.0/930-fix-mips-noexecstack.patch
+++ b/devel/gcc/patches-8.x/930-fix-mips-noexecstack.patch
diff --git a/devel/gcc/patches/8.4.0/931-libffi-fix-MIPS-softfloat-build-issue.patch b/devel/gcc/patches-8.x/931-libffi-fix-MIPS-softfloat-build-issue.patch
index fb4cb1533..fb4cb1533 100644
--- a/devel/gcc/patches/8.4.0/931-libffi-fix-MIPS-softfloat-build-issue.patch
+++ b/devel/gcc/patches-8.x/931-libffi-fix-MIPS-softfloat-build-issue.patch
diff --git a/devel/gcc/patches/8.4.0/960-gotools-fix-compilation-when-making-cross-compiler.patch b/devel/gcc/patches-8.x/960-gotools-fix-compilation-when-making-cross-compiler.patch
index 1dd05080d..1dd05080d 100644
--- a/devel/gcc/patches/8.4.0/960-gotools-fix-compilation-when-making-cross-compiler.patch
+++ b/devel/gcc/patches-8.x/960-gotools-fix-compilation-when-making-cross-compiler.patch