Revert "Revert "toolchain: gcc: improve patch handling by introducing major version""

This reverts commit 779ed7d9a0.
2025-04-15 18:03:30 +00:00 · 2022-10-24 14:29:05 +08:00 · 2022-10-24 14:29:05 +08:00 · 92bdfb61ce
commit 92bdfb61ce
parent c86da866ca
75 changed files with 2 additions and 1 deletions
--- 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)
--- a/toolchain/gcc/patches/10.3.0/002-case_insensitive.patch
+++ b/toolchain/gcc/patches/10.3.0/002-case_insensitive.patch
--- a/toolchain/gcc/patches/10.3.0/010-documentation.patch
+++ b/toolchain/gcc/patches/10.3.0/010-documentation.patch
--- a/toolchain/gcc/patches/10.3.0/110-Fix-MIPS-PR-84790.patch
+++ b/toolchain/gcc/patches/10.3.0/110-Fix-MIPS-PR-84790.patch
--- a/toolchain/gcc/patches/10.3.0/230-musl_libssp.patch
+++ b/toolchain/gcc/patches/10.3.0/230-musl_libssp.patch
--- a/toolchain/gcc/patches/10.3.0/300-mips_Os_cpu_rtx_cost_model.patch
+++ b/toolchain/gcc/patches/10.3.0/300-mips_Os_cpu_rtx_cost_model.patch
--- a/toolchain/gcc/patches/10.3.0/810-arm-softfloat-libgcc.patch
+++ b/toolchain/gcc/patches/10.3.0/810-arm-softfloat-libgcc.patch
--- a/toolchain/gcc/patches/10.3.0/820-libgcc_pic.patch
+++ b/toolchain/gcc/patches/10.3.0/820-libgcc_pic.patch
--- a/toolchain/gcc/patches/10.3.0/840-armv4_pass_fix-v4bx_to_ld.patch
+++ b/toolchain/gcc/patches/10.3.0/840-armv4_pass_fix-v4bx_to_ld.patch
--- a/toolchain/gcc/patches/10.3.0/850-use_shared_libgcc.patch
+++ b/toolchain/gcc/patches/10.3.0/850-use_shared_libgcc.patch
--- a/toolchain/gcc/patches/10.3.0/851-libgcc_no_compat.patch
+++ b/toolchain/gcc/patches/10.3.0/851-libgcc_no_compat.patch
--- a/toolchain/gcc/patches/10.3.0/870-ppc_no_crtsavres.patch
+++ b/toolchain/gcc/patches/10.3.0/870-ppc_no_crtsavres.patch
--- a/toolchain/gcc/patches/10.3.0/881-no_tm_section.patch
+++ b/toolchain/gcc/patches/10.3.0/881-no_tm_section.patch
--- a/toolchain/gcc/patches/10.3.0/900-bad-mips16-crt.patch
+++ b/toolchain/gcc/patches/10.3.0/900-bad-mips16-crt.patch
--- a/toolchain/gcc/patches/10.3.0/910-mbsd_multi.patch
+++ b/toolchain/gcc/patches/10.3.0/910-mbsd_multi.patch
--- a/toolchain/gcc/patches/10.3.0/920-specs_nonfatal_getenv.patch
+++ b/toolchain/gcc/patches/10.3.0/920-specs_nonfatal_getenv.patch
--- a/toolchain/gcc/patches/10.3.0/930-fix-mips-noexecstack.patch
+++ b/toolchain/gcc/patches/10.3.0/930-fix-mips-noexecstack.patch
--- a/toolchain/gcc/patches/10.3.0/931-libffi-fix-MIPS-softfloat-build-issue.patch
+++ b/toolchain/gcc/patches/10.3.0/931-libffi-fix-MIPS-softfloat-build-issue.patch
--- a/toolchain/gcc/patches/10.3.0/960-gotools-fix-compilation-when-making-cross-compiler.patch
+++ b/toolchain/gcc/patches/10.3.0/960-gotools-fix-compilation-when-making-cross-compiler.patch
--- a/toolchain/gcc/patches/11.3.0/002-case_insensitive.patch
+++ b/toolchain/gcc/patches/11.3.0/002-case_insensitive.patch
--- a/toolchain/gcc/patches/11.3.0/010-documentation.patch
+++ b/toolchain/gcc/patches/11.3.0/010-documentation.patch
--- a/toolchain/gcc/patches/11.3.0/011-v12-configure-define-TARGET_LIBC_GNUSTACK-on-musl.patch
+++ b/toolchain/gcc/patches/11.3.0/011-v12-configure-define-TARGET_LIBC_GNUSTACK-on-musl.patch
--- a/toolchain/gcc/patches/11.3.0/110-Fix-MIPS-PR-84790.patch
+++ b/toolchain/gcc/patches/11.3.0/110-Fix-MIPS-PR-84790.patch
--- a/toolchain/gcc/patches/11.3.0/230-musl_libssp.patch
+++ b/toolchain/gcc/patches/11.3.0/230-musl_libssp.patch
--- a/toolchain/gcc/patches/11.3.0/300-mips_Os_cpu_rtx_cost_model.patch
+++ b/toolchain/gcc/patches/11.3.0/300-mips_Os_cpu_rtx_cost_model.patch
--- a/toolchain/gcc/patches/11.3.0/810-arm-softfloat-libgcc.patch
+++ b/toolchain/gcc/patches/11.3.0/810-arm-softfloat-libgcc.patch
--- a/toolchain/gcc/patches/11.3.0/820-libgcc_pic.patch
+++ b/toolchain/gcc/patches/11.3.0/820-libgcc_pic.patch
--- a/toolchain/gcc/patches/11.3.0/840-armv4_pass_fix-v4bx_to_ld.patch
+++ b/toolchain/gcc/patches/11.3.0/840-armv4_pass_fix-v4bx_to_ld.patch
--- a/toolchain/gcc/patches/11.3.0/850-use_shared_libgcc.patch
+++ b/toolchain/gcc/patches/11.3.0/850-use_shared_libgcc.patch
--- a/toolchain/gcc/patches/11.3.0/851-libgcc_no_compat.patch
+++ b/toolchain/gcc/patches/11.3.0/851-libgcc_no_compat.patch
--- a/toolchain/gcc/patches/11.3.0/870-ppc_no_crtsavres.patch
+++ b/toolchain/gcc/patches/11.3.0/870-ppc_no_crtsavres.patch
--- a/toolchain/gcc/patches/11.3.0/881-no_tm_section.patch
+++ b/toolchain/gcc/patches/11.3.0/881-no_tm_section.patch
--- a/toolchain/gcc/patches/11.3.0/900-bad-mips16-crt.patch
+++ b/toolchain/gcc/patches/11.3.0/900-bad-mips16-crt.patch
--- a/toolchain/gcc/patches/11.3.0/910-mbsd_multi.patch
+++ b/toolchain/gcc/patches/11.3.0/910-mbsd_multi.patch
--- a/toolchain/gcc/patches/11.3.0/920-specs_nonfatal_getenv.patch
+++ b/toolchain/gcc/patches/11.3.0/920-specs_nonfatal_getenv.patch
--- a/toolchain/gcc/patches/11.3.0/931-libffi-fix-MIPS-softfloat-build-issue.patch
+++ b/toolchain/gcc/patches/11.3.0/931-libffi-fix-MIPS-softfloat-build-issue.patch
--- a/toolchain/gcc/patches/11.3.0/960-gotools-fix-compilation-when-making-cross-compiler.patch
+++ b/toolchain/gcc/patches/11.3.0/960-gotools-fix-compilation-when-making-cross-compiler.patch
--- a/toolchain/gcc/patches/11.3.0/970-macos_arm64-building-fix.patch
+++ b/toolchain/gcc/patches/11.3.0/970-macos_arm64-building-fix.patch
--- a/toolchain/gcc/patches/12.2.0/002-case_insensitive.patch
+++ b/toolchain/gcc/patches/12.2.0/002-case_insensitive.patch
--- a/toolchain/gcc/patches/12.2.0/010-documentation.patch
+++ b/toolchain/gcc/patches/12.2.0/010-documentation.patch
--- a/toolchain/gcc/patches/12.2.0/110-Fix-MIPS-PR-84790.patch
+++ b/toolchain/gcc/patches/12.2.0/110-Fix-MIPS-PR-84790.patch
--- a/toolchain/gcc/patches/12.2.0/230-musl_libssp.patch
+++ b/toolchain/gcc/patches/12.2.0/230-musl_libssp.patch
--- a/toolchain/gcc/patches/12.2.0/300-mips_Os_cpu_rtx_cost_model.patch
+++ b/toolchain/gcc/patches/12.2.0/300-mips_Os_cpu_rtx_cost_model.patch
--- a/toolchain/gcc/patches/12.2.0/810-arm-softfloat-libgcc.patch
+++ b/toolchain/gcc/patches/12.2.0/810-arm-softfloat-libgcc.patch
--- a/toolchain/gcc/patches/12.2.0/820-libgcc_pic.patch
+++ b/toolchain/gcc/patches/12.2.0/820-libgcc_pic.patch
--- a/toolchain/gcc/patches/12.2.0/840-armv4_pass_fix-v4bx_to_ld.patch
+++ b/toolchain/gcc/patches/12.2.0/840-armv4_pass_fix-v4bx_to_ld.patch
--- a/toolchain/gcc/patches/12.2.0/850-use_shared_libgcc.patch
+++ b/toolchain/gcc/patches/12.2.0/850-use_shared_libgcc.patch
--- a/toolchain/gcc/patches/12.2.0/851-libgcc_no_compat.patch
+++ b/toolchain/gcc/patches/12.2.0/851-libgcc_no_compat.patch
--- a/toolchain/gcc/patches/12.2.0/870-ppc_no_crtsavres.patch
+++ b/toolchain/gcc/patches/12.2.0/870-ppc_no_crtsavres.patch
--- a/toolchain/gcc/patches/12.2.0/881-no_tm_section.patch
+++ b/toolchain/gcc/patches/12.2.0/881-no_tm_section.patch
--- a/toolchain/gcc/patches/12.2.0/900-bad-mips16-crt.patch
+++ b/toolchain/gcc/patches/12.2.0/900-bad-mips16-crt.patch
--- a/toolchain/gcc/patches/12.2.0/910-mbsd_multi.patch
+++ b/toolchain/gcc/patches/12.2.0/910-mbsd_multi.patch
--- a/toolchain/gcc/patches/12.2.0/920-specs_nonfatal_getenv.patch
+++ b/toolchain/gcc/patches/12.2.0/920-specs_nonfatal_getenv.patch
--- a/toolchain/gcc/patches/12.2.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
--- a/toolchain/gcc/patches/12.2.0/970-macos_arm64-building-fix.patch
+++ b/toolchain/gcc/patches/12.2.0/970-macos_arm64-building-fix.patch
--- a/toolchain/gcc/patches/8.4.0/002-case_insensitive.patch
+++ b/toolchain/gcc/patches/8.4.0/002-case_insensitive.patch
--- a/toolchain/gcc/patches/8.4.0/010-documentation.patch
+++ b/toolchain/gcc/patches/8.4.0/010-documentation.patch
--- a/toolchain/gcc/patches/8.4.0/110-Fix-MIPS-PR-84790.patch
+++ b/toolchain/gcc/patches/8.4.0/110-Fix-MIPS-PR-84790.patch
--- a/toolchain/gcc/patches/8.4.0/230-musl_libssp.patch
+++ b/toolchain/gcc/patches/8.4.0/230-musl_libssp.patch
--- a/toolchain/gcc/patches/8.4.0/300-mips_Os_cpu_rtx_cost_model.patch
+++ b/toolchain/gcc/patches/8.4.0/300-mips_Os_cpu_rtx_cost_model.patch
--- a/toolchain/gcc/patches/8.4.0/800-arm_v5te_no_ldrd_strd.patch
+++ b/toolchain/gcc/patches/8.4.0/800-arm_v5te_no_ldrd_strd.patch
--- a/toolchain/gcc/patches/8.4.0/810-arm-softfloat-libgcc.patch
+++ b/toolchain/gcc/patches/8.4.0/810-arm-softfloat-libgcc.patch
--- a/toolchain/gcc/patches/8.4.0/820-libgcc_pic.patch
+++ b/toolchain/gcc/patches/8.4.0/820-libgcc_pic.patch
--- a/toolchain/gcc/patches/8.4.0/840-armv4_pass_fix-v4bx_to_ld.patch
+++ b/toolchain/gcc/patches/8.4.0/840-armv4_pass_fix-v4bx_to_ld.patch
--- a/toolchain/gcc/patches/8.4.0/850-use_shared_libgcc.patch
+++ b/toolchain/gcc/patches/8.4.0/850-use_shared_libgcc.patch
--- a/toolchain/gcc/patches/8.4.0/851-libgcc_no_compat.patch
+++ b/toolchain/gcc/patches/8.4.0/851-libgcc_no_compat.patch
--- a/toolchain/gcc/patches/8.4.0/870-ppc_no_crtsavres.patch
+++ b/toolchain/gcc/patches/8.4.0/870-ppc_no_crtsavres.patch
--- a/toolchain/gcc/patches/8.4.0/881-no_tm_section.patch
+++ b/toolchain/gcc/patches/8.4.0/881-no_tm_section.patch
--- a/toolchain/gcc/patches/8.4.0/900-bad-mips16-crt.patch
+++ b/toolchain/gcc/patches/8.4.0/900-bad-mips16-crt.patch
--- a/toolchain/gcc/patches/8.4.0/910-mbsd_multi.patch
+++ b/toolchain/gcc/patches/8.4.0/910-mbsd_multi.patch
--- a/toolchain/gcc/patches/8.4.0/920-specs_nonfatal_getenv.patch
+++ b/toolchain/gcc/patches/8.4.0/920-specs_nonfatal_getenv.patch
--- a/toolchain/gcc/patches/8.4.0/930-fix-mips-noexecstack.patch
+++ b/toolchain/gcc/patches/8.4.0/930-fix-mips-noexecstack.patch
--- a/toolchain/gcc/patches/8.4.0/931-libffi-fix-MIPS-softfloat-build-issue.patch
+++ b/toolchain/gcc/patches/8.4.0/931-libffi-fix-MIPS-softfloat-build-issue.patch
--- a/toolchain/gcc/patches/8.4.0/960-gotools-fix-compilation-when-making-cross-compiler.patch
+++ b/toolchain/gcc/patches/8.4.0/960-gotools-fix-compilation-when-making-cross-compiler.patch
--- a/toolchain/gcc/patches/8.4.0/999-fix-apple-silicon-support.patch
+++ b/toolchain/gcc/patches/8.4.0/999-fix-apple-silicon-support.patch