From d7382cc0e4446d4db1978055b0ba59259ac66751 Mon Sep 17 00:00:00 2001
From: Nick Hainke <vincent@systemli.org>
Date: Sat, 10 Sep 2022 23:41:55 +0200
Subject: [PATCH] toolchain: gcc: improve patch handling by introducing major
 version

Every minor version bump of a major version will result in a huge patch
diff because of the moving of all the patches from version e.g. 11.2.0 to
11.3.0. This commit only use the major version for the patch folders to
differentiate between the different gcc versions. This will significantly
improve the reviewing of the smaller version bump patches and help to see
what really changed in a minor version bump.

Signed-off-by: Nick Hainke <vincent@systemli.org>
---
 toolchain/gcc/common.mk                                        | 3 ++-
 .../10.3.0 => patches-10.x}/002-case_insensitive.patch         | 0
 .../{patches/10.3.0 => patches-10.x}/010-documentation.patch   | 0
 .../10.3.0 => patches-10.x}/110-Fix-MIPS-PR-84790.patch        | 0
 .../gcc/{patches/10.3.0 => patches-10.x}/230-musl_libssp.patch | 0
 .../300-mips_Os_cpu_rtx_cost_model.patch                       | 0
 .../10.3.0 => patches-10.x}/810-arm-softfloat-libgcc.patch     | 0
 .../gcc/{patches/10.3.0 => patches-10.x}/820-libgcc_pic.patch  | 0
 .../840-armv4_pass_fix-v4bx_to_ld.patch                        | 0
 .../10.3.0 => patches-10.x}/850-use_shared_libgcc.patch        | 0
 .../10.3.0 => patches-10.x}/851-libgcc_no_compat.patch         | 0
 .../10.3.0 => patches-10.x}/870-ppc_no_crtsavres.patch         | 0
 .../{patches/10.3.0 => patches-10.x}/881-no_tm_section.patch   | 0
 .../{patches/10.3.0 => patches-10.x}/900-bad-mips16-crt.patch  | 0
 .../gcc/{patches/10.3.0 => patches-10.x}/910-mbsd_multi.patch  | 0
 .../10.3.0 => patches-10.x}/920-specs_nonfatal_getenv.patch    | 0
 .../10.3.0 => patches-10.x}/930-fix-mips-noexecstack.patch     | 0
 .../931-libffi-fix-MIPS-softfloat-build-issue.patch            | 0
 ...60-gotools-fix-compilation-when-making-cross-compiler.patch | 0
 .../11.3.0 => patches-11.x}/002-case_insensitive.patch         | 0
 .../{patches/11.3.0 => patches-11.x}/010-documentation.patch   | 0
 ...011-v12-configure-define-TARGET_LIBC_GNUSTACK-on-musl.patch | 0
 .../11.3.0 => patches-11.x}/110-Fix-MIPS-PR-84790.patch        | 0
 .../gcc/{patches/11.3.0 => patches-11.x}/230-musl_libssp.patch | 0
 .../300-mips_Os_cpu_rtx_cost_model.patch                       | 0
 .../11.3.0 => patches-11.x}/810-arm-softfloat-libgcc.patch     | 0
 .../gcc/{patches/11.3.0 => patches-11.x}/820-libgcc_pic.patch  | 0
 .../840-armv4_pass_fix-v4bx_to_ld.patch                        | 0
 .../11.3.0 => patches-11.x}/850-use_shared_libgcc.patch        | 0
 .../11.3.0 => patches-11.x}/851-libgcc_no_compat.patch         | 0
 .../11.3.0 => patches-11.x}/870-ppc_no_crtsavres.patch         | 0
 .../{patches/11.3.0 => patches-11.x}/881-no_tm_section.patch   | 0
 .../{patches/11.3.0 => patches-11.x}/900-bad-mips16-crt.patch  | 0
 .../gcc/{patches/11.3.0 => patches-11.x}/910-mbsd_multi.patch  | 0
 .../11.3.0 => patches-11.x}/920-specs_nonfatal_getenv.patch    | 0
 .../931-libffi-fix-MIPS-softfloat-build-issue.patch            | 0
 ...60-gotools-fix-compilation-when-making-cross-compiler.patch | 0
 .../11.3.0 => patches-11.x}/970-macos_arm64-building-fix.patch | 0
 .../12.2.0 => patches-12.x}/002-case_insensitive.patch         | 0
 .../{patches/12.2.0 => patches-12.x}/010-documentation.patch   | 0
 .../12.2.0 => patches-12.x}/110-Fix-MIPS-PR-84790.patch        | 0
 .../gcc/{patches/12.2.0 => patches-12.x}/230-musl_libssp.patch | 0
 .../300-mips_Os_cpu_rtx_cost_model.patch                       | 0
 .../12.2.0 => patches-12.x}/810-arm-softfloat-libgcc.patch     | 0
 .../gcc/{patches/12.2.0 => patches-12.x}/820-libgcc_pic.patch  | 0
 .../840-armv4_pass_fix-v4bx_to_ld.patch                        | 0
 .../12.2.0 => patches-12.x}/850-use_shared_libgcc.patch        | 0
 .../12.2.0 => patches-12.x}/851-libgcc_no_compat.patch         | 0
 .../12.2.0 => patches-12.x}/870-ppc_no_crtsavres.patch         | 0
 .../{patches/12.2.0 => patches-12.x}/881-no_tm_section.patch   | 0
 .../{patches/12.2.0 => patches-12.x}/900-bad-mips16-crt.patch  | 0
 .../gcc/{patches/12.2.0 => patches-12.x}/910-mbsd_multi.patch  | 0
 .../12.2.0 => patches-12.x}/920-specs_nonfatal_getenv.patch    | 0
 ...60-gotools-fix-compilation-when-making-cross-compiler.patch | 0
 .../12.2.0 => patches-12.x}/970-macos_arm64-building-fix.patch | 0
 .../{patches/8.4.0 => patches-8.x}/002-case_insensitive.patch  | 0
 .../gcc/{patches/8.4.0 => patches-8.x}/010-documentation.patch | 0
 .../{patches/8.4.0 => patches-8.x}/110-Fix-MIPS-PR-84790.patch | 0
 .../gcc/{patches/8.4.0 => patches-8.x}/230-musl_libssp.patch   | 0
 .../8.4.0 => patches-8.x}/300-mips_Os_cpu_rtx_cost_model.patch | 0
 .../8.4.0 => patches-8.x}/800-arm_v5te_no_ldrd_strd.patch      | 0
 .../8.4.0 => patches-8.x}/810-arm-softfloat-libgcc.patch       | 0
 .../gcc/{patches/8.4.0 => patches-8.x}/820-libgcc_pic.patch    | 0
 .../8.4.0 => patches-8.x}/840-armv4_pass_fix-v4bx_to_ld.patch  | 0
 .../{patches/8.4.0 => patches-8.x}/850-use_shared_libgcc.patch | 0
 .../{patches/8.4.0 => patches-8.x}/851-libgcc_no_compat.patch  | 0
 .../{patches/8.4.0 => patches-8.x}/870-ppc_no_crtsavres.patch  | 0
 .../gcc/{patches/8.4.0 => patches-8.x}/881-no_tm_section.patch | 0
 .../{patches/8.4.0 => patches-8.x}/900-bad-mips16-crt.patch    | 0
 .../gcc/{patches/8.4.0 => patches-8.x}/910-mbsd_multi.patch    | 0
 .../8.4.0 => patches-8.x}/920-specs_nonfatal_getenv.patch      | 0
 .../8.4.0 => patches-8.x}/930-fix-mips-noexecstack.patch       | 0
 .../931-libffi-fix-MIPS-softfloat-build-issue.patch            | 0
 ...60-gotools-fix-compilation-when-making-cross-compiler.patch | 0
 74 files changed, 2 insertions(+), 1 deletion(-)
 rename toolchain/gcc/{patches/10.3.0 => patches-10.x}/002-case_insensitive.patch (100%)
 rename toolchain/gcc/{patches/10.3.0 => patches-10.x}/010-documentation.patch (100%)
 rename toolchain/gcc/{patches/10.3.0 => patches-10.x}/110-Fix-MIPS-PR-84790.patch (100%)
 rename toolchain/gcc/{patches/10.3.0 => patches-10.x}/230-musl_libssp.patch (100%)
 rename toolchain/gcc/{patches/10.3.0 => patches-10.x}/300-mips_Os_cpu_rtx_cost_model.patch (100%)
 rename toolchain/gcc/{patches/10.3.0 => patches-10.x}/810-arm-softfloat-libgcc.patch (100%)
 rename toolchain/gcc/{patches/10.3.0 => patches-10.x}/820-libgcc_pic.patch (100%)
 rename toolchain/gcc/{patches/10.3.0 => patches-10.x}/840-armv4_pass_fix-v4bx_to_ld.patch (100%)
 rename toolchain/gcc/{patches/10.3.0 => patches-10.x}/850-use_shared_libgcc.patch (100%)
 rename toolchain/gcc/{patches/10.3.0 => patches-10.x}/851-libgcc_no_compat.patch (100%)
 rename toolchain/gcc/{patches/10.3.0 => patches-10.x}/870-ppc_no_crtsavres.patch (100%)
 rename toolchain/gcc/{patches/10.3.0 => patches-10.x}/881-no_tm_section.patch (100%)
 rename toolchain/gcc/{patches/10.3.0 => patches-10.x}/900-bad-mips16-crt.patch (100%)
 rename toolchain/gcc/{patches/10.3.0 => patches-10.x}/910-mbsd_multi.patch (100%)
 rename toolchain/gcc/{patches/10.3.0 => patches-10.x}/920-specs_nonfatal_getenv.patch (100%)
 rename toolchain/gcc/{patches/10.3.0 => patches-10.x}/930-fix-mips-noexecstack.patch (100%)
 rename toolchain/gcc/{patches/10.3.0 => patches-10.x}/931-libffi-fix-MIPS-softfloat-build-issue.patch (100%)
 rename toolchain/gcc/{patches/10.3.0 => patches-10.x}/960-gotools-fix-compilation-when-making-cross-compiler.patch (100%)
 rename toolchain/gcc/{patches/11.3.0 => patches-11.x}/002-case_insensitive.patch (100%)
 rename toolchain/gcc/{patches/11.3.0 => patches-11.x}/010-documentation.patch (100%)
 rename toolchain/gcc/{patches/11.3.0 => patches-11.x}/011-v12-configure-define-TARGET_LIBC_GNUSTACK-on-musl.patch (100%)
 rename toolchain/gcc/{patches/11.3.0 => patches-11.x}/110-Fix-MIPS-PR-84790.patch (100%)
 rename toolchain/gcc/{patches/11.3.0 => patches-11.x}/230-musl_libssp.patch (100%)
 rename toolchain/gcc/{patches/11.3.0 => patches-11.x}/300-mips_Os_cpu_rtx_cost_model.patch (100%)
 rename toolchain/gcc/{patches/11.3.0 => patches-11.x}/810-arm-softfloat-libgcc.patch (100%)
 rename toolchain/gcc/{patches/11.3.0 => patches-11.x}/820-libgcc_pic.patch (100%)
 rename toolchain/gcc/{patches/11.3.0 => patches-11.x}/840-armv4_pass_fix-v4bx_to_ld.patch (100%)
 rename toolchain/gcc/{patches/11.3.0 => patches-11.x}/850-use_shared_libgcc.patch (100%)
 rename toolchain/gcc/{patches/11.3.0 => patches-11.x}/851-libgcc_no_compat.patch (100%)
 rename toolchain/gcc/{patches/11.3.0 => patches-11.x}/870-ppc_no_crtsavres.patch (100%)
 rename toolchain/gcc/{patches/11.3.0 => patches-11.x}/881-no_tm_section.patch (100%)
 rename toolchain/gcc/{patches/11.3.0 => patches-11.x}/900-bad-mips16-crt.patch (100%)
 rename toolchain/gcc/{patches/11.3.0 => patches-11.x}/910-mbsd_multi.patch (100%)
 rename toolchain/gcc/{patches/11.3.0 => patches-11.x}/920-specs_nonfatal_getenv.patch (100%)
 rename toolchain/gcc/{patches/11.3.0 => patches-11.x}/931-libffi-fix-MIPS-softfloat-build-issue.patch (100%)
 rename toolchain/gcc/{patches/11.3.0 => patches-11.x}/960-gotools-fix-compilation-when-making-cross-compiler.patch (100%)
 rename toolchain/gcc/{patches/11.3.0 => patches-11.x}/970-macos_arm64-building-fix.patch (100%)
 rename toolchain/gcc/{patches/12.2.0 => patches-12.x}/002-case_insensitive.patch (100%)
 rename toolchain/gcc/{patches/12.2.0 => patches-12.x}/010-documentation.patch (100%)
 rename toolchain/gcc/{patches/12.2.0 => patches-12.x}/110-Fix-MIPS-PR-84790.patch (100%)
 rename toolchain/gcc/{patches/12.2.0 => patches-12.x}/230-musl_libssp.patch (100%)
 rename toolchain/gcc/{patches/12.2.0 => patches-12.x}/300-mips_Os_cpu_rtx_cost_model.patch (100%)
 rename toolchain/gcc/{patches/12.2.0 => patches-12.x}/810-arm-softfloat-libgcc.patch (100%)
 rename toolchain/gcc/{patches/12.2.0 => patches-12.x}/820-libgcc_pic.patch (100%)
 rename toolchain/gcc/{patches/12.2.0 => patches-12.x}/840-armv4_pass_fix-v4bx_to_ld.patch (100%)
 rename toolchain/gcc/{patches/12.2.0 => patches-12.x}/850-use_shared_libgcc.patch (100%)
 rename toolchain/gcc/{patches/12.2.0 => patches-12.x}/851-libgcc_no_compat.patch (100%)
 rename toolchain/gcc/{patches/12.2.0 => patches-12.x}/870-ppc_no_crtsavres.patch (100%)
 rename toolchain/gcc/{patches/12.2.0 => patches-12.x}/881-no_tm_section.patch (100%)
 rename toolchain/gcc/{patches/12.2.0 => patches-12.x}/900-bad-mips16-crt.patch (100%)
 rename toolchain/gcc/{patches/12.2.0 => patches-12.x}/910-mbsd_multi.patch (100%)
 rename toolchain/gcc/{patches/12.2.0 => patches-12.x}/920-specs_nonfatal_getenv.patch (100%)
 rename toolchain/gcc/{patches/12.2.0 => patches-12.x}/960-gotools-fix-compilation-when-making-cross-compiler.patch (100%)
 rename toolchain/gcc/{patches/12.2.0 => patches-12.x}/970-macos_arm64-building-fix.patch (100%)
 rename toolchain/gcc/{patches/8.4.0 => patches-8.x}/002-case_insensitive.patch (100%)
 rename toolchain/gcc/{patches/8.4.0 => patches-8.x}/010-documentation.patch (100%)
 rename toolchain/gcc/{patches/8.4.0 => patches-8.x}/110-Fix-MIPS-PR-84790.patch (100%)
 rename toolchain/gcc/{patches/8.4.0 => patches-8.x}/230-musl_libssp.patch (100%)
 rename toolchain/gcc/{patches/8.4.0 => patches-8.x}/300-mips_Os_cpu_rtx_cost_model.patch (100%)
 rename toolchain/gcc/{patches/8.4.0 => patches-8.x}/800-arm_v5te_no_ldrd_strd.patch (100%)
 rename toolchain/gcc/{patches/8.4.0 => patches-8.x}/810-arm-softfloat-libgcc.patch (100%)
 rename toolchain/gcc/{patches/8.4.0 => patches-8.x}/820-libgcc_pic.patch (100%)
 rename toolchain/gcc/{patches/8.4.0 => patches-8.x}/840-armv4_pass_fix-v4bx_to_ld.patch (100%)
 rename toolchain/gcc/{patches/8.4.0 => patches-8.x}/850-use_shared_libgcc.patch (100%)
 rename toolchain/gcc/{patches/8.4.0 => patches-8.x}/851-libgcc_no_compat.patch (100%)
 rename toolchain/gcc/{patches/8.4.0 => patches-8.x}/870-ppc_no_crtsavres.patch (100%)
 rename toolchain/gcc/{patches/8.4.0 => patches-8.x}/881-no_tm_section.patch (100%)
 rename toolchain/gcc/{patches/8.4.0 => patches-8.x}/900-bad-mips16-crt.patch (100%)
 rename toolchain/gcc/{patches/8.4.0 => patches-8.x}/910-mbsd_multi.patch (100%)
 rename toolchain/gcc/{patches/8.4.0 => patches-8.x}/920-specs_nonfatal_getenv.patch (100%)
 rename toolchain/gcc/{patches/8.4.0 => patches-8.x}/930-fix-mips-noexecstack.patch (100%)
 rename toolchain/gcc/{patches/8.4.0 => patches-8.x}/931-libffi-fix-MIPS-softfloat-build-issue.patch (100%)
 rename toolchain/gcc/{patches/8.4.0 => patches-8.x}/960-gotools-fix-compilation-when-making-cross-compiler.patch (100%)

diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk
index f116af7e1a..83884dd54c 100644
--- a/toolchain/gcc/common.mk
+++ b/toolchain/gcc/common.mk
@@ -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)))
 GCC_DIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_SOURCE_URL:=@GNU/gcc/gcc-$(PKG_VERSION)
@@ -44,7 +45,7 @@ ifeq ($(PKG_VERSION),12.2.0)
   PKG_HASH:=e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
 endif
 
-PATCH_DIR=../patches/$(GCC_VERSION)
+PATCH_DIR=../patches-$(GCC_MAJOR_VERSION).x
 
 BUGURL=http://bugs.openwrt.org/
 PKGVERSION=OpenWrt GCC $(PKG_VERSION) $(REVISION)
diff --git a/toolchain/gcc/patches/10.3.0/002-case_insensitive.patch b/toolchain/gcc/patches-10.x/002-case_insensitive.patch
similarity index 100%
rename from toolchain/gcc/patches/10.3.0/002-case_insensitive.patch
rename to toolchain/gcc/patches-10.x/002-case_insensitive.patch
diff --git a/toolchain/gcc/patches/10.3.0/010-documentation.patch b/toolchain/gcc/patches-10.x/010-documentation.patch
similarity index 100%
rename from toolchain/gcc/patches/10.3.0/010-documentation.patch
rename to toolchain/gcc/patches-10.x/010-documentation.patch
diff --git a/toolchain/gcc/patches/10.3.0/110-Fix-MIPS-PR-84790.patch b/toolchain/gcc/patches-10.x/110-Fix-MIPS-PR-84790.patch
similarity index 100%
rename from toolchain/gcc/patches/10.3.0/110-Fix-MIPS-PR-84790.patch
rename to toolchain/gcc/patches-10.x/110-Fix-MIPS-PR-84790.patch
diff --git a/toolchain/gcc/patches/10.3.0/230-musl_libssp.patch b/toolchain/gcc/patches-10.x/230-musl_libssp.patch
similarity index 100%
rename from toolchain/gcc/patches/10.3.0/230-musl_libssp.patch
rename to toolchain/gcc/patches-10.x/230-musl_libssp.patch
diff --git a/toolchain/gcc/patches/10.3.0/300-mips_Os_cpu_rtx_cost_model.patch b/toolchain/gcc/patches-10.x/300-mips_Os_cpu_rtx_cost_model.patch
similarity index 100%
rename from toolchain/gcc/patches/10.3.0/300-mips_Os_cpu_rtx_cost_model.patch
rename to toolchain/gcc/patches-10.x/300-mips_Os_cpu_rtx_cost_model.patch
diff --git a/toolchain/gcc/patches/10.3.0/810-arm-softfloat-libgcc.patch b/toolchain/gcc/patches-10.x/810-arm-softfloat-libgcc.patch
similarity index 100%
rename from toolchain/gcc/patches/10.3.0/810-arm-softfloat-libgcc.patch
rename to toolchain/gcc/patches-10.x/810-arm-softfloat-libgcc.patch
diff --git a/toolchain/gcc/patches/10.3.0/820-libgcc_pic.patch b/toolchain/gcc/patches-10.x/820-libgcc_pic.patch
similarity index 100%
rename from toolchain/gcc/patches/10.3.0/820-libgcc_pic.patch
rename to toolchain/gcc/patches-10.x/820-libgcc_pic.patch
diff --git a/toolchain/gcc/patches/10.3.0/840-armv4_pass_fix-v4bx_to_ld.patch b/toolchain/gcc/patches-10.x/840-armv4_pass_fix-v4bx_to_ld.patch
similarity index 100%
rename from toolchain/gcc/patches/10.3.0/840-armv4_pass_fix-v4bx_to_ld.patch
rename to toolchain/gcc/patches-10.x/840-armv4_pass_fix-v4bx_to_ld.patch
diff --git a/toolchain/gcc/patches/10.3.0/850-use_shared_libgcc.patch b/toolchain/gcc/patches-10.x/850-use_shared_libgcc.patch
similarity index 100%
rename from toolchain/gcc/patches/10.3.0/850-use_shared_libgcc.patch
rename to toolchain/gcc/patches-10.x/850-use_shared_libgcc.patch
diff --git a/toolchain/gcc/patches/10.3.0/851-libgcc_no_compat.patch b/toolchain/gcc/patches-10.x/851-libgcc_no_compat.patch
similarity index 100%
rename from toolchain/gcc/patches/10.3.0/851-libgcc_no_compat.patch
rename to toolchain/gcc/patches-10.x/851-libgcc_no_compat.patch
diff --git a/toolchain/gcc/patches/10.3.0/870-ppc_no_crtsavres.patch b/toolchain/gcc/patches-10.x/870-ppc_no_crtsavres.patch
similarity index 100%
rename from toolchain/gcc/patches/10.3.0/870-ppc_no_crtsavres.patch
rename to toolchain/gcc/patches-10.x/870-ppc_no_crtsavres.patch
diff --git a/toolchain/gcc/patches/10.3.0/881-no_tm_section.patch b/toolchain/gcc/patches-10.x/881-no_tm_section.patch
similarity index 100%
rename from toolchain/gcc/patches/10.3.0/881-no_tm_section.patch
rename to toolchain/gcc/patches-10.x/881-no_tm_section.patch
diff --git a/toolchain/gcc/patches/10.3.0/900-bad-mips16-crt.patch b/toolchain/gcc/patches-10.x/900-bad-mips16-crt.patch
similarity index 100%
rename from toolchain/gcc/patches/10.3.0/900-bad-mips16-crt.patch
rename to toolchain/gcc/patches-10.x/900-bad-mips16-crt.patch
diff --git a/toolchain/gcc/patches/10.3.0/910-mbsd_multi.patch b/toolchain/gcc/patches-10.x/910-mbsd_multi.patch
similarity index 100%
rename from toolchain/gcc/patches/10.3.0/910-mbsd_multi.patch
rename to toolchain/gcc/patches-10.x/910-mbsd_multi.patch
diff --git a/toolchain/gcc/patches/10.3.0/920-specs_nonfatal_getenv.patch b/toolchain/gcc/patches-10.x/920-specs_nonfatal_getenv.patch
similarity index 100%
rename from toolchain/gcc/patches/10.3.0/920-specs_nonfatal_getenv.patch
rename to toolchain/gcc/patches-10.x/920-specs_nonfatal_getenv.patch
diff --git a/toolchain/gcc/patches/10.3.0/930-fix-mips-noexecstack.patch b/toolchain/gcc/patches-10.x/930-fix-mips-noexecstack.patch
similarity index 100%
rename from toolchain/gcc/patches/10.3.0/930-fix-mips-noexecstack.patch
rename to toolchain/gcc/patches-10.x/930-fix-mips-noexecstack.patch
diff --git a/toolchain/gcc/patches/10.3.0/931-libffi-fix-MIPS-softfloat-build-issue.patch b/toolchain/gcc/patches-10.x/931-libffi-fix-MIPS-softfloat-build-issue.patch
similarity index 100%
rename from toolchain/gcc/patches/10.3.0/931-libffi-fix-MIPS-softfloat-build-issue.patch
rename to toolchain/gcc/patches-10.x/931-libffi-fix-MIPS-softfloat-build-issue.patch
diff --git a/toolchain/gcc/patches/10.3.0/960-gotools-fix-compilation-when-making-cross-compiler.patch b/toolchain/gcc/patches-10.x/960-gotools-fix-compilation-when-making-cross-compiler.patch
similarity index 100%
rename from toolchain/gcc/patches/10.3.0/960-gotools-fix-compilation-when-making-cross-compiler.patch
rename to toolchain/gcc/patches-10.x/960-gotools-fix-compilation-when-making-cross-compiler.patch
diff --git a/toolchain/gcc/patches/11.3.0/002-case_insensitive.patch b/toolchain/gcc/patches-11.x/002-case_insensitive.patch
similarity index 100%
rename from toolchain/gcc/patches/11.3.0/002-case_insensitive.patch
rename to toolchain/gcc/patches-11.x/002-case_insensitive.patch
diff --git a/toolchain/gcc/patches/11.3.0/010-documentation.patch b/toolchain/gcc/patches-11.x/010-documentation.patch
similarity index 100%
rename from toolchain/gcc/patches/11.3.0/010-documentation.patch
rename to toolchain/gcc/patches-11.x/010-documentation.patch
diff --git a/toolchain/gcc/patches/11.3.0/011-v12-configure-define-TARGET_LIBC_GNUSTACK-on-musl.patch b/toolchain/gcc/patches-11.x/011-v12-configure-define-TARGET_LIBC_GNUSTACK-on-musl.patch
similarity index 100%
rename from toolchain/gcc/patches/11.3.0/011-v12-configure-define-TARGET_LIBC_GNUSTACK-on-musl.patch
rename to toolchain/gcc/patches-11.x/011-v12-configure-define-TARGET_LIBC_GNUSTACK-on-musl.patch
diff --git a/toolchain/gcc/patches/11.3.0/110-Fix-MIPS-PR-84790.patch b/toolchain/gcc/patches-11.x/110-Fix-MIPS-PR-84790.patch
similarity index 100%
rename from toolchain/gcc/patches/11.3.0/110-Fix-MIPS-PR-84790.patch
rename to toolchain/gcc/patches-11.x/110-Fix-MIPS-PR-84790.patch
diff --git a/toolchain/gcc/patches/11.3.0/230-musl_libssp.patch b/toolchain/gcc/patches-11.x/230-musl_libssp.patch
similarity index 100%
rename from toolchain/gcc/patches/11.3.0/230-musl_libssp.patch
rename to toolchain/gcc/patches-11.x/230-musl_libssp.patch
diff --git a/toolchain/gcc/patches/11.3.0/300-mips_Os_cpu_rtx_cost_model.patch b/toolchain/gcc/patches-11.x/300-mips_Os_cpu_rtx_cost_model.patch
similarity index 100%
rename from toolchain/gcc/patches/11.3.0/300-mips_Os_cpu_rtx_cost_model.patch
rename to toolchain/gcc/patches-11.x/300-mips_Os_cpu_rtx_cost_model.patch
diff --git a/toolchain/gcc/patches/11.3.0/810-arm-softfloat-libgcc.patch b/toolchain/gcc/patches-11.x/810-arm-softfloat-libgcc.patch
similarity index 100%
rename from toolchain/gcc/patches/11.3.0/810-arm-softfloat-libgcc.patch
rename to toolchain/gcc/patches-11.x/810-arm-softfloat-libgcc.patch
diff --git a/toolchain/gcc/patches/11.3.0/820-libgcc_pic.patch b/toolchain/gcc/patches-11.x/820-libgcc_pic.patch
similarity index 100%
rename from toolchain/gcc/patches/11.3.0/820-libgcc_pic.patch
rename to toolchain/gcc/patches-11.x/820-libgcc_pic.patch
diff --git a/toolchain/gcc/patches/11.3.0/840-armv4_pass_fix-v4bx_to_ld.patch b/toolchain/gcc/patches-11.x/840-armv4_pass_fix-v4bx_to_ld.patch
similarity index 100%
rename from toolchain/gcc/patches/11.3.0/840-armv4_pass_fix-v4bx_to_ld.patch
rename to toolchain/gcc/patches-11.x/840-armv4_pass_fix-v4bx_to_ld.patch
diff --git a/toolchain/gcc/patches/11.3.0/850-use_shared_libgcc.patch b/toolchain/gcc/patches-11.x/850-use_shared_libgcc.patch
similarity index 100%
rename from toolchain/gcc/patches/11.3.0/850-use_shared_libgcc.patch
rename to toolchain/gcc/patches-11.x/850-use_shared_libgcc.patch
diff --git a/toolchain/gcc/patches/11.3.0/851-libgcc_no_compat.patch b/toolchain/gcc/patches-11.x/851-libgcc_no_compat.patch
similarity index 100%
rename from toolchain/gcc/patches/11.3.0/851-libgcc_no_compat.patch
rename to toolchain/gcc/patches-11.x/851-libgcc_no_compat.patch
diff --git a/toolchain/gcc/patches/11.3.0/870-ppc_no_crtsavres.patch b/toolchain/gcc/patches-11.x/870-ppc_no_crtsavres.patch
similarity index 100%
rename from toolchain/gcc/patches/11.3.0/870-ppc_no_crtsavres.patch
rename to toolchain/gcc/patches-11.x/870-ppc_no_crtsavres.patch
diff --git a/toolchain/gcc/patches/11.3.0/881-no_tm_section.patch b/toolchain/gcc/patches-11.x/881-no_tm_section.patch
similarity index 100%
rename from toolchain/gcc/patches/11.3.0/881-no_tm_section.patch
rename to toolchain/gcc/patches-11.x/881-no_tm_section.patch
diff --git a/toolchain/gcc/patches/11.3.0/900-bad-mips16-crt.patch b/toolchain/gcc/patches-11.x/900-bad-mips16-crt.patch
similarity index 100%
rename from toolchain/gcc/patches/11.3.0/900-bad-mips16-crt.patch
rename to toolchain/gcc/patches-11.x/900-bad-mips16-crt.patch
diff --git a/toolchain/gcc/patches/11.3.0/910-mbsd_multi.patch b/toolchain/gcc/patches-11.x/910-mbsd_multi.patch
similarity index 100%
rename from toolchain/gcc/patches/11.3.0/910-mbsd_multi.patch
rename to toolchain/gcc/patches-11.x/910-mbsd_multi.patch
diff --git a/toolchain/gcc/patches/11.3.0/920-specs_nonfatal_getenv.patch b/toolchain/gcc/patches-11.x/920-specs_nonfatal_getenv.patch
similarity index 100%
rename from toolchain/gcc/patches/11.3.0/920-specs_nonfatal_getenv.patch
rename to toolchain/gcc/patches-11.x/920-specs_nonfatal_getenv.patch
diff --git a/toolchain/gcc/patches/11.3.0/931-libffi-fix-MIPS-softfloat-build-issue.patch b/toolchain/gcc/patches-11.x/931-libffi-fix-MIPS-softfloat-build-issue.patch
similarity index 100%
rename from toolchain/gcc/patches/11.3.0/931-libffi-fix-MIPS-softfloat-build-issue.patch
rename to toolchain/gcc/patches-11.x/931-libffi-fix-MIPS-softfloat-build-issue.patch
diff --git a/toolchain/gcc/patches/11.3.0/960-gotools-fix-compilation-when-making-cross-compiler.patch b/toolchain/gcc/patches-11.x/960-gotools-fix-compilation-when-making-cross-compiler.patch
similarity index 100%
rename from toolchain/gcc/patches/11.3.0/960-gotools-fix-compilation-when-making-cross-compiler.patch
rename to toolchain/gcc/patches-11.x/960-gotools-fix-compilation-when-making-cross-compiler.patch
diff --git a/toolchain/gcc/patches/11.3.0/970-macos_arm64-building-fix.patch b/toolchain/gcc/patches-11.x/970-macos_arm64-building-fix.patch
similarity index 100%
rename from toolchain/gcc/patches/11.3.0/970-macos_arm64-building-fix.patch
rename to toolchain/gcc/patches-11.x/970-macos_arm64-building-fix.patch
diff --git a/toolchain/gcc/patches/12.2.0/002-case_insensitive.patch b/toolchain/gcc/patches-12.x/002-case_insensitive.patch
similarity index 100%
rename from toolchain/gcc/patches/12.2.0/002-case_insensitive.patch
rename to toolchain/gcc/patches-12.x/002-case_insensitive.patch
diff --git a/toolchain/gcc/patches/12.2.0/010-documentation.patch b/toolchain/gcc/patches-12.x/010-documentation.patch
similarity index 100%
rename from toolchain/gcc/patches/12.2.0/010-documentation.patch
rename to toolchain/gcc/patches-12.x/010-documentation.patch
diff --git a/toolchain/gcc/patches/12.2.0/110-Fix-MIPS-PR-84790.patch b/toolchain/gcc/patches-12.x/110-Fix-MIPS-PR-84790.patch
similarity index 100%
rename from toolchain/gcc/patches/12.2.0/110-Fix-MIPS-PR-84790.patch
rename to toolchain/gcc/patches-12.x/110-Fix-MIPS-PR-84790.patch
diff --git a/toolchain/gcc/patches/12.2.0/230-musl_libssp.patch b/toolchain/gcc/patches-12.x/230-musl_libssp.patch
similarity index 100%
rename from toolchain/gcc/patches/12.2.0/230-musl_libssp.patch
rename to toolchain/gcc/patches-12.x/230-musl_libssp.patch
diff --git a/toolchain/gcc/patches/12.2.0/300-mips_Os_cpu_rtx_cost_model.patch b/toolchain/gcc/patches-12.x/300-mips_Os_cpu_rtx_cost_model.patch
similarity index 100%
rename from toolchain/gcc/patches/12.2.0/300-mips_Os_cpu_rtx_cost_model.patch
rename to toolchain/gcc/patches-12.x/300-mips_Os_cpu_rtx_cost_model.patch
diff --git a/toolchain/gcc/patches/12.2.0/810-arm-softfloat-libgcc.patch b/toolchain/gcc/patches-12.x/810-arm-softfloat-libgcc.patch
similarity index 100%
rename from toolchain/gcc/patches/12.2.0/810-arm-softfloat-libgcc.patch
rename to toolchain/gcc/patches-12.x/810-arm-softfloat-libgcc.patch
diff --git a/toolchain/gcc/patches/12.2.0/820-libgcc_pic.patch b/toolchain/gcc/patches-12.x/820-libgcc_pic.patch
similarity index 100%
rename from toolchain/gcc/patches/12.2.0/820-libgcc_pic.patch
rename to toolchain/gcc/patches-12.x/820-libgcc_pic.patch
diff --git a/toolchain/gcc/patches/12.2.0/840-armv4_pass_fix-v4bx_to_ld.patch b/toolchain/gcc/patches-12.x/840-armv4_pass_fix-v4bx_to_ld.patch
similarity index 100%
rename from toolchain/gcc/patches/12.2.0/840-armv4_pass_fix-v4bx_to_ld.patch
rename to toolchain/gcc/patches-12.x/840-armv4_pass_fix-v4bx_to_ld.patch
diff --git a/toolchain/gcc/patches/12.2.0/850-use_shared_libgcc.patch b/toolchain/gcc/patches-12.x/850-use_shared_libgcc.patch
similarity index 100%
rename from toolchain/gcc/patches/12.2.0/850-use_shared_libgcc.patch
rename to toolchain/gcc/patches-12.x/850-use_shared_libgcc.patch
diff --git a/toolchain/gcc/patches/12.2.0/851-libgcc_no_compat.patch b/toolchain/gcc/patches-12.x/851-libgcc_no_compat.patch
similarity index 100%
rename from toolchain/gcc/patches/12.2.0/851-libgcc_no_compat.patch
rename to toolchain/gcc/patches-12.x/851-libgcc_no_compat.patch
diff --git a/toolchain/gcc/patches/12.2.0/870-ppc_no_crtsavres.patch b/toolchain/gcc/patches-12.x/870-ppc_no_crtsavres.patch
similarity index 100%
rename from toolchain/gcc/patches/12.2.0/870-ppc_no_crtsavres.patch
rename to toolchain/gcc/patches-12.x/870-ppc_no_crtsavres.patch
diff --git a/toolchain/gcc/patches/12.2.0/881-no_tm_section.patch b/toolchain/gcc/patches-12.x/881-no_tm_section.patch
similarity index 100%
rename from toolchain/gcc/patches/12.2.0/881-no_tm_section.patch
rename to toolchain/gcc/patches-12.x/881-no_tm_section.patch
diff --git a/toolchain/gcc/patches/12.2.0/900-bad-mips16-crt.patch b/toolchain/gcc/patches-12.x/900-bad-mips16-crt.patch
similarity index 100%
rename from toolchain/gcc/patches/12.2.0/900-bad-mips16-crt.patch
rename to toolchain/gcc/patches-12.x/900-bad-mips16-crt.patch
diff --git a/toolchain/gcc/patches/12.2.0/910-mbsd_multi.patch b/toolchain/gcc/patches-12.x/910-mbsd_multi.patch
similarity index 100%
rename from toolchain/gcc/patches/12.2.0/910-mbsd_multi.patch
rename to toolchain/gcc/patches-12.x/910-mbsd_multi.patch
diff --git a/toolchain/gcc/patches/12.2.0/920-specs_nonfatal_getenv.patch b/toolchain/gcc/patches-12.x/920-specs_nonfatal_getenv.patch
similarity index 100%
rename from toolchain/gcc/patches/12.2.0/920-specs_nonfatal_getenv.patch
rename to toolchain/gcc/patches-12.x/920-specs_nonfatal_getenv.patch
diff --git a/toolchain/gcc/patches/12.2.0/960-gotools-fix-compilation-when-making-cross-compiler.patch b/toolchain/gcc/patches-12.x/960-gotools-fix-compilation-when-making-cross-compiler.patch
similarity index 100%
rename from toolchain/gcc/patches/12.2.0/960-gotools-fix-compilation-when-making-cross-compiler.patch
rename to toolchain/gcc/patches-12.x/960-gotools-fix-compilation-when-making-cross-compiler.patch
diff --git a/toolchain/gcc/patches/12.2.0/970-macos_arm64-building-fix.patch b/toolchain/gcc/patches-12.x/970-macos_arm64-building-fix.patch
similarity index 100%
rename from toolchain/gcc/patches/12.2.0/970-macos_arm64-building-fix.patch
rename to toolchain/gcc/patches-12.x/970-macos_arm64-building-fix.patch
diff --git a/toolchain/gcc/patches/8.4.0/002-case_insensitive.patch b/toolchain/gcc/patches-8.x/002-case_insensitive.patch
similarity index 100%
rename from toolchain/gcc/patches/8.4.0/002-case_insensitive.patch
rename to toolchain/gcc/patches-8.x/002-case_insensitive.patch
diff --git a/toolchain/gcc/patches/8.4.0/010-documentation.patch b/toolchain/gcc/patches-8.x/010-documentation.patch
similarity index 100%
rename from toolchain/gcc/patches/8.4.0/010-documentation.patch
rename to toolchain/gcc/patches-8.x/010-documentation.patch
diff --git a/toolchain/gcc/patches/8.4.0/110-Fix-MIPS-PR-84790.patch b/toolchain/gcc/patches-8.x/110-Fix-MIPS-PR-84790.patch
similarity index 100%
rename from toolchain/gcc/patches/8.4.0/110-Fix-MIPS-PR-84790.patch
rename to toolchain/gcc/patches-8.x/110-Fix-MIPS-PR-84790.patch
diff --git a/toolchain/gcc/patches/8.4.0/230-musl_libssp.patch b/toolchain/gcc/patches-8.x/230-musl_libssp.patch
similarity index 100%
rename from toolchain/gcc/patches/8.4.0/230-musl_libssp.patch
rename to toolchain/gcc/patches-8.x/230-musl_libssp.patch
diff --git a/toolchain/gcc/patches/8.4.0/300-mips_Os_cpu_rtx_cost_model.patch b/toolchain/gcc/patches-8.x/300-mips_Os_cpu_rtx_cost_model.patch
similarity index 100%
rename from toolchain/gcc/patches/8.4.0/300-mips_Os_cpu_rtx_cost_model.patch
rename to toolchain/gcc/patches-8.x/300-mips_Os_cpu_rtx_cost_model.patch
diff --git a/toolchain/gcc/patches/8.4.0/800-arm_v5te_no_ldrd_strd.patch b/toolchain/gcc/patches-8.x/800-arm_v5te_no_ldrd_strd.patch
similarity index 100%
rename from toolchain/gcc/patches/8.4.0/800-arm_v5te_no_ldrd_strd.patch
rename to toolchain/gcc/patches-8.x/800-arm_v5te_no_ldrd_strd.patch
diff --git a/toolchain/gcc/patches/8.4.0/810-arm-softfloat-libgcc.patch b/toolchain/gcc/patches-8.x/810-arm-softfloat-libgcc.patch
similarity index 100%
rename from toolchain/gcc/patches/8.4.0/810-arm-softfloat-libgcc.patch
rename to toolchain/gcc/patches-8.x/810-arm-softfloat-libgcc.patch
diff --git a/toolchain/gcc/patches/8.4.0/820-libgcc_pic.patch b/toolchain/gcc/patches-8.x/820-libgcc_pic.patch
similarity index 100%
rename from toolchain/gcc/patches/8.4.0/820-libgcc_pic.patch
rename to toolchain/gcc/patches-8.x/820-libgcc_pic.patch
diff --git a/toolchain/gcc/patches/8.4.0/840-armv4_pass_fix-v4bx_to_ld.patch b/toolchain/gcc/patches-8.x/840-armv4_pass_fix-v4bx_to_ld.patch
similarity index 100%
rename from toolchain/gcc/patches/8.4.0/840-armv4_pass_fix-v4bx_to_ld.patch
rename to toolchain/gcc/patches-8.x/840-armv4_pass_fix-v4bx_to_ld.patch
diff --git a/toolchain/gcc/patches/8.4.0/850-use_shared_libgcc.patch b/toolchain/gcc/patches-8.x/850-use_shared_libgcc.patch
similarity index 100%
rename from toolchain/gcc/patches/8.4.0/850-use_shared_libgcc.patch
rename to toolchain/gcc/patches-8.x/850-use_shared_libgcc.patch
diff --git a/toolchain/gcc/patches/8.4.0/851-libgcc_no_compat.patch b/toolchain/gcc/patches-8.x/851-libgcc_no_compat.patch
similarity index 100%
rename from toolchain/gcc/patches/8.4.0/851-libgcc_no_compat.patch
rename to toolchain/gcc/patches-8.x/851-libgcc_no_compat.patch
diff --git a/toolchain/gcc/patches/8.4.0/870-ppc_no_crtsavres.patch b/toolchain/gcc/patches-8.x/870-ppc_no_crtsavres.patch
similarity index 100%
rename from toolchain/gcc/patches/8.4.0/870-ppc_no_crtsavres.patch
rename to toolchain/gcc/patches-8.x/870-ppc_no_crtsavres.patch
diff --git a/toolchain/gcc/patches/8.4.0/881-no_tm_section.patch b/toolchain/gcc/patches-8.x/881-no_tm_section.patch
similarity index 100%
rename from toolchain/gcc/patches/8.4.0/881-no_tm_section.patch
rename to toolchain/gcc/patches-8.x/881-no_tm_section.patch
diff --git a/toolchain/gcc/patches/8.4.0/900-bad-mips16-crt.patch b/toolchain/gcc/patches-8.x/900-bad-mips16-crt.patch
similarity index 100%
rename from toolchain/gcc/patches/8.4.0/900-bad-mips16-crt.patch
rename to toolchain/gcc/patches-8.x/900-bad-mips16-crt.patch
diff --git a/toolchain/gcc/patches/8.4.0/910-mbsd_multi.patch b/toolchain/gcc/patches-8.x/910-mbsd_multi.patch
similarity index 100%
rename from toolchain/gcc/patches/8.4.0/910-mbsd_multi.patch
rename to toolchain/gcc/patches-8.x/910-mbsd_multi.patch
diff --git a/toolchain/gcc/patches/8.4.0/920-specs_nonfatal_getenv.patch b/toolchain/gcc/patches-8.x/920-specs_nonfatal_getenv.patch
similarity index 100%
rename from toolchain/gcc/patches/8.4.0/920-specs_nonfatal_getenv.patch
rename to toolchain/gcc/patches-8.x/920-specs_nonfatal_getenv.patch
diff --git a/toolchain/gcc/patches/8.4.0/930-fix-mips-noexecstack.patch b/toolchain/gcc/patches-8.x/930-fix-mips-noexecstack.patch
similarity index 100%
rename from toolchain/gcc/patches/8.4.0/930-fix-mips-noexecstack.patch
rename to toolchain/gcc/patches-8.x/930-fix-mips-noexecstack.patch
diff --git a/toolchain/gcc/patches/8.4.0/931-libffi-fix-MIPS-softfloat-build-issue.patch b/toolchain/gcc/patches-8.x/931-libffi-fix-MIPS-softfloat-build-issue.patch
similarity index 100%
rename from toolchain/gcc/patches/8.4.0/931-libffi-fix-MIPS-softfloat-build-issue.patch
rename to toolchain/gcc/patches-8.x/931-libffi-fix-MIPS-softfloat-build-issue.patch
diff --git a/toolchain/gcc/patches/8.4.0/960-gotools-fix-compilation-when-making-cross-compiler.patch b/toolchain/gcc/patches-8.x/960-gotools-fix-compilation-when-making-cross-compiler.patch
similarity index 100%
rename from toolchain/gcc/patches/8.4.0/960-gotools-fix-compilation-when-making-cross-compiler.patch
rename to toolchain/gcc/patches-8.x/960-gotools-fix-compilation-when-making-cross-compiler.patch
-- 
2.30.2