Browse Source

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 <[email protected]>
Nick Hainke 3 years ago
parent
commit
d7382cc0e4
74 changed files with 2 additions and 1 deletions
  1. 2 1
      toolchain/gcc/common.mk
  2. 0 0
      toolchain/gcc/patches-10.x/002-case_insensitive.patch
  3. 0 0
      toolchain/gcc/patches-10.x/010-documentation.patch
  4. 0 0
      toolchain/gcc/patches-10.x/110-Fix-MIPS-PR-84790.patch
  5. 0 0
      toolchain/gcc/patches-10.x/230-musl_libssp.patch
  6. 0 0
      toolchain/gcc/patches-10.x/300-mips_Os_cpu_rtx_cost_model.patch
  7. 0 0
      toolchain/gcc/patches-10.x/810-arm-softfloat-libgcc.patch
  8. 0 0
      toolchain/gcc/patches-10.x/820-libgcc_pic.patch
  9. 0 0
      toolchain/gcc/patches-10.x/840-armv4_pass_fix-v4bx_to_ld.patch
  10. 0 0
      toolchain/gcc/patches-10.x/850-use_shared_libgcc.patch
  11. 0 0
      toolchain/gcc/patches-10.x/851-libgcc_no_compat.patch
  12. 0 0
      toolchain/gcc/patches-10.x/870-ppc_no_crtsavres.patch
  13. 0 0
      toolchain/gcc/patches-10.x/881-no_tm_section.patch
  14. 0 0
      toolchain/gcc/patches-10.x/900-bad-mips16-crt.patch
  15. 0 0
      toolchain/gcc/patches-10.x/910-mbsd_multi.patch
  16. 0 0
      toolchain/gcc/patches-10.x/920-specs_nonfatal_getenv.patch
  17. 0 0
      toolchain/gcc/patches-10.x/930-fix-mips-noexecstack.patch
  18. 0 0
      toolchain/gcc/patches-10.x/931-libffi-fix-MIPS-softfloat-build-issue.patch
  19. 0 0
      toolchain/gcc/patches-10.x/960-gotools-fix-compilation-when-making-cross-compiler.patch
  20. 0 0
      toolchain/gcc/patches-11.x/002-case_insensitive.patch
  21. 0 0
      toolchain/gcc/patches-11.x/010-documentation.patch
  22. 0 0
      toolchain/gcc/patches-11.x/011-v12-configure-define-TARGET_LIBC_GNUSTACK-on-musl.patch
  23. 0 0
      toolchain/gcc/patches-11.x/110-Fix-MIPS-PR-84790.patch
  24. 0 0
      toolchain/gcc/patches-11.x/230-musl_libssp.patch
  25. 0 0
      toolchain/gcc/patches-11.x/300-mips_Os_cpu_rtx_cost_model.patch
  26. 0 0
      toolchain/gcc/patches-11.x/810-arm-softfloat-libgcc.patch
  27. 0 0
      toolchain/gcc/patches-11.x/820-libgcc_pic.patch
  28. 0 0
      toolchain/gcc/patches-11.x/840-armv4_pass_fix-v4bx_to_ld.patch
  29. 0 0
      toolchain/gcc/patches-11.x/850-use_shared_libgcc.patch
  30. 0 0
      toolchain/gcc/patches-11.x/851-libgcc_no_compat.patch
  31. 0 0
      toolchain/gcc/patches-11.x/870-ppc_no_crtsavres.patch
  32. 0 0
      toolchain/gcc/patches-11.x/881-no_tm_section.patch
  33. 0 0
      toolchain/gcc/patches-11.x/900-bad-mips16-crt.patch
  34. 0 0
      toolchain/gcc/patches-11.x/910-mbsd_multi.patch
  35. 0 0
      toolchain/gcc/patches-11.x/920-specs_nonfatal_getenv.patch
  36. 0 0
      toolchain/gcc/patches-11.x/931-libffi-fix-MIPS-softfloat-build-issue.patch
  37. 0 0
      toolchain/gcc/patches-11.x/960-gotools-fix-compilation-when-making-cross-compiler.patch
  38. 0 0
      toolchain/gcc/patches-11.x/970-macos_arm64-building-fix.patch
  39. 0 0
      toolchain/gcc/patches-12.x/002-case_insensitive.patch
  40. 0 0
      toolchain/gcc/patches-12.x/010-documentation.patch
  41. 0 0
      toolchain/gcc/patches-12.x/110-Fix-MIPS-PR-84790.patch
  42. 0 0
      toolchain/gcc/patches-12.x/230-musl_libssp.patch
  43. 0 0
      toolchain/gcc/patches-12.x/300-mips_Os_cpu_rtx_cost_model.patch
  44. 0 0
      toolchain/gcc/patches-12.x/810-arm-softfloat-libgcc.patch
  45. 0 0
      toolchain/gcc/patches-12.x/820-libgcc_pic.patch
  46. 0 0
      toolchain/gcc/patches-12.x/840-armv4_pass_fix-v4bx_to_ld.patch
  47. 0 0
      toolchain/gcc/patches-12.x/850-use_shared_libgcc.patch
  48. 0 0
      toolchain/gcc/patches-12.x/851-libgcc_no_compat.patch
  49. 0 0
      toolchain/gcc/patches-12.x/870-ppc_no_crtsavres.patch
  50. 0 0
      toolchain/gcc/patches-12.x/881-no_tm_section.patch
  51. 0 0
      toolchain/gcc/patches-12.x/900-bad-mips16-crt.patch
  52. 0 0
      toolchain/gcc/patches-12.x/910-mbsd_multi.patch
  53. 0 0
      toolchain/gcc/patches-12.x/920-specs_nonfatal_getenv.patch
  54. 0 0
      toolchain/gcc/patches-12.x/960-gotools-fix-compilation-when-making-cross-compiler.patch
  55. 0 0
      toolchain/gcc/patches-12.x/970-macos_arm64-building-fix.patch
  56. 0 0
      toolchain/gcc/patches-8.x/002-case_insensitive.patch
  57. 0 0
      toolchain/gcc/patches-8.x/010-documentation.patch
  58. 0 0
      toolchain/gcc/patches-8.x/110-Fix-MIPS-PR-84790.patch
  59. 0 0
      toolchain/gcc/patches-8.x/230-musl_libssp.patch
  60. 0 0
      toolchain/gcc/patches-8.x/300-mips_Os_cpu_rtx_cost_model.patch
  61. 0 0
      toolchain/gcc/patches-8.x/800-arm_v5te_no_ldrd_strd.patch
  62. 0 0
      toolchain/gcc/patches-8.x/810-arm-softfloat-libgcc.patch
  63. 0 0
      toolchain/gcc/patches-8.x/820-libgcc_pic.patch
  64. 0 0
      toolchain/gcc/patches-8.x/840-armv4_pass_fix-v4bx_to_ld.patch
  65. 0 0
      toolchain/gcc/patches-8.x/850-use_shared_libgcc.patch
  66. 0 0
      toolchain/gcc/patches-8.x/851-libgcc_no_compat.patch
  67. 0 0
      toolchain/gcc/patches-8.x/870-ppc_no_crtsavres.patch
  68. 0 0
      toolchain/gcc/patches-8.x/881-no_tm_section.patch
  69. 0 0
      toolchain/gcc/patches-8.x/900-bad-mips16-crt.patch
  70. 0 0
      toolchain/gcc/patches-8.x/910-mbsd_multi.patch
  71. 0 0
      toolchain/gcc/patches-8.x/920-specs_nonfatal_getenv.patch
  72. 0 0
      toolchain/gcc/patches-8.x/930-fix-mips-noexecstack.patch
  73. 0 0
      toolchain/gcc/patches-8.x/931-libffi-fix-MIPS-softfloat-build-issue.patch
  74. 0 0
      toolchain/gcc/patches-8.x/960-gotools-fix-compilation-when-making-cross-compiler.patch

+ 2 - 1
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)

+ 0 - 0
toolchain/gcc/patches/10.3.0/002-case_insensitive.patch → toolchain/gcc/patches-10.x/002-case_insensitive.patch


+ 0 - 0
toolchain/gcc/patches/10.3.0/010-documentation.patch → toolchain/gcc/patches-10.x/010-documentation.patch


+ 0 - 0
toolchain/gcc/patches/10.3.0/110-Fix-MIPS-PR-84790.patch → toolchain/gcc/patches-10.x/110-Fix-MIPS-PR-84790.patch


+ 0 - 0
toolchain/gcc/patches/10.3.0/230-musl_libssp.patch → toolchain/gcc/patches-10.x/230-musl_libssp.patch


+ 0 - 0
toolchain/gcc/patches/10.3.0/300-mips_Os_cpu_rtx_cost_model.patch → toolchain/gcc/patches-10.x/300-mips_Os_cpu_rtx_cost_model.patch


+ 0 - 0
toolchain/gcc/patches/10.3.0/810-arm-softfloat-libgcc.patch → toolchain/gcc/patches-10.x/810-arm-softfloat-libgcc.patch


+ 0 - 0
toolchain/gcc/patches/10.3.0/820-libgcc_pic.patch → toolchain/gcc/patches-10.x/820-libgcc_pic.patch


+ 0 - 0
toolchain/gcc/patches/10.3.0/840-armv4_pass_fix-v4bx_to_ld.patch → toolchain/gcc/patches-10.x/840-armv4_pass_fix-v4bx_to_ld.patch


+ 0 - 0
toolchain/gcc/patches/10.3.0/850-use_shared_libgcc.patch → toolchain/gcc/patches-10.x/850-use_shared_libgcc.patch


+ 0 - 0
toolchain/gcc/patches/10.3.0/851-libgcc_no_compat.patch → toolchain/gcc/patches-10.x/851-libgcc_no_compat.patch


+ 0 - 0
toolchain/gcc/patches/10.3.0/870-ppc_no_crtsavres.patch → toolchain/gcc/patches-10.x/870-ppc_no_crtsavres.patch


+ 0 - 0
toolchain/gcc/patches/10.3.0/881-no_tm_section.patch → toolchain/gcc/patches-10.x/881-no_tm_section.patch


+ 0 - 0
toolchain/gcc/patches/10.3.0/900-bad-mips16-crt.patch → toolchain/gcc/patches-10.x/900-bad-mips16-crt.patch


+ 0 - 0
toolchain/gcc/patches/10.3.0/910-mbsd_multi.patch → toolchain/gcc/patches-10.x/910-mbsd_multi.patch


+ 0 - 0
toolchain/gcc/patches/10.3.0/920-specs_nonfatal_getenv.patch → toolchain/gcc/patches-10.x/920-specs_nonfatal_getenv.patch


+ 0 - 0
toolchain/gcc/patches/10.3.0/930-fix-mips-noexecstack.patch → toolchain/gcc/patches-10.x/930-fix-mips-noexecstack.patch


+ 0 - 0
toolchain/gcc/patches/10.3.0/931-libffi-fix-MIPS-softfloat-build-issue.patch → toolchain/gcc/patches-10.x/931-libffi-fix-MIPS-softfloat-build-issue.patch


+ 0 - 0
toolchain/gcc/patches/10.3.0/960-gotools-fix-compilation-when-making-cross-compiler.patch → toolchain/gcc/patches-10.x/960-gotools-fix-compilation-when-making-cross-compiler.patch


+ 0 - 0
toolchain/gcc/patches/11.3.0/002-case_insensitive.patch → toolchain/gcc/patches-11.x/002-case_insensitive.patch


+ 0 - 0
toolchain/gcc/patches/11.3.0/010-documentation.patch → toolchain/gcc/patches-11.x/010-documentation.patch


+ 0 - 0
toolchain/gcc/patches/11.3.0/011-v12-configure-define-TARGET_LIBC_GNUSTACK-on-musl.patch → toolchain/gcc/patches-11.x/011-v12-configure-define-TARGET_LIBC_GNUSTACK-on-musl.patch


+ 0 - 0
toolchain/gcc/patches/11.3.0/110-Fix-MIPS-PR-84790.patch → toolchain/gcc/patches-11.x/110-Fix-MIPS-PR-84790.patch


+ 0 - 0
toolchain/gcc/patches/11.3.0/230-musl_libssp.patch → toolchain/gcc/patches-11.x/230-musl_libssp.patch


+ 0 - 0
toolchain/gcc/patches/11.3.0/300-mips_Os_cpu_rtx_cost_model.patch → toolchain/gcc/patches-11.x/300-mips_Os_cpu_rtx_cost_model.patch


+ 0 - 0
toolchain/gcc/patches/11.3.0/810-arm-softfloat-libgcc.patch → toolchain/gcc/patches-11.x/810-arm-softfloat-libgcc.patch


+ 0 - 0
toolchain/gcc/patches/11.3.0/820-libgcc_pic.patch → toolchain/gcc/patches-11.x/820-libgcc_pic.patch


+ 0 - 0
toolchain/gcc/patches/11.3.0/840-armv4_pass_fix-v4bx_to_ld.patch → toolchain/gcc/patches-11.x/840-armv4_pass_fix-v4bx_to_ld.patch


+ 0 - 0
toolchain/gcc/patches/11.3.0/850-use_shared_libgcc.patch → toolchain/gcc/patches-11.x/850-use_shared_libgcc.patch


+ 0 - 0
toolchain/gcc/patches/11.3.0/851-libgcc_no_compat.patch → toolchain/gcc/patches-11.x/851-libgcc_no_compat.patch


+ 0 - 0
toolchain/gcc/patches/11.3.0/870-ppc_no_crtsavres.patch → toolchain/gcc/patches-11.x/870-ppc_no_crtsavres.patch


+ 0 - 0
toolchain/gcc/patches/11.3.0/881-no_tm_section.patch → toolchain/gcc/patches-11.x/881-no_tm_section.patch


+ 0 - 0
toolchain/gcc/patches/11.3.0/900-bad-mips16-crt.patch → toolchain/gcc/patches-11.x/900-bad-mips16-crt.patch


+ 0 - 0
toolchain/gcc/patches/11.3.0/910-mbsd_multi.patch → toolchain/gcc/patches-11.x/910-mbsd_multi.patch


+ 0 - 0
toolchain/gcc/patches/11.3.0/920-specs_nonfatal_getenv.patch → toolchain/gcc/patches-11.x/920-specs_nonfatal_getenv.patch


+ 0 - 0
toolchain/gcc/patches/11.3.0/931-libffi-fix-MIPS-softfloat-build-issue.patch → toolchain/gcc/patches-11.x/931-libffi-fix-MIPS-softfloat-build-issue.patch


+ 0 - 0
toolchain/gcc/patches/11.3.0/960-gotools-fix-compilation-when-making-cross-compiler.patch → toolchain/gcc/patches-11.x/960-gotools-fix-compilation-when-making-cross-compiler.patch


+ 0 - 0
toolchain/gcc/patches/11.3.0/970-macos_arm64-building-fix.patch → toolchain/gcc/patches-11.x/970-macos_arm64-building-fix.patch


+ 0 - 0
toolchain/gcc/patches/12.2.0/002-case_insensitive.patch → toolchain/gcc/patches-12.x/002-case_insensitive.patch


+ 0 - 0
toolchain/gcc/patches/12.2.0/010-documentation.patch → toolchain/gcc/patches-12.x/010-documentation.patch


+ 0 - 0
toolchain/gcc/patches/12.2.0/110-Fix-MIPS-PR-84790.patch → toolchain/gcc/patches-12.x/110-Fix-MIPS-PR-84790.patch


+ 0 - 0
toolchain/gcc/patches/12.2.0/230-musl_libssp.patch → toolchain/gcc/patches-12.x/230-musl_libssp.patch


+ 0 - 0
toolchain/gcc/patches/12.2.0/300-mips_Os_cpu_rtx_cost_model.patch → toolchain/gcc/patches-12.x/300-mips_Os_cpu_rtx_cost_model.patch


+ 0 - 0
toolchain/gcc/patches/12.2.0/810-arm-softfloat-libgcc.patch → toolchain/gcc/patches-12.x/810-arm-softfloat-libgcc.patch


+ 0 - 0
toolchain/gcc/patches/12.2.0/820-libgcc_pic.patch → toolchain/gcc/patches-12.x/820-libgcc_pic.patch


+ 0 - 0
toolchain/gcc/patches/12.2.0/840-armv4_pass_fix-v4bx_to_ld.patch → toolchain/gcc/patches-12.x/840-armv4_pass_fix-v4bx_to_ld.patch


+ 0 - 0
toolchain/gcc/patches/12.2.0/850-use_shared_libgcc.patch → toolchain/gcc/patches-12.x/850-use_shared_libgcc.patch


+ 0 - 0
toolchain/gcc/patches/12.2.0/851-libgcc_no_compat.patch → toolchain/gcc/patches-12.x/851-libgcc_no_compat.patch


+ 0 - 0
toolchain/gcc/patches/12.2.0/870-ppc_no_crtsavres.patch → toolchain/gcc/patches-12.x/870-ppc_no_crtsavres.patch


+ 0 - 0
toolchain/gcc/patches/12.2.0/881-no_tm_section.patch → toolchain/gcc/patches-12.x/881-no_tm_section.patch


+ 0 - 0
toolchain/gcc/patches/12.2.0/900-bad-mips16-crt.patch → toolchain/gcc/patches-12.x/900-bad-mips16-crt.patch


+ 0 - 0
toolchain/gcc/patches/12.2.0/910-mbsd_multi.patch → toolchain/gcc/patches-12.x/910-mbsd_multi.patch


+ 0 - 0
toolchain/gcc/patches/12.2.0/920-specs_nonfatal_getenv.patch → toolchain/gcc/patches-12.x/920-specs_nonfatal_getenv.patch


+ 0 - 0
toolchain/gcc/patches/12.2.0/960-gotools-fix-compilation-when-making-cross-compiler.patch → toolchain/gcc/patches-12.x/960-gotools-fix-compilation-when-making-cross-compiler.patch


+ 0 - 0
toolchain/gcc/patches/12.2.0/970-macos_arm64-building-fix.patch → toolchain/gcc/patches-12.x/970-macos_arm64-building-fix.patch


+ 0 - 0
toolchain/gcc/patches/8.4.0/002-case_insensitive.patch → toolchain/gcc/patches-8.x/002-case_insensitive.patch


+ 0 - 0
toolchain/gcc/patches/8.4.0/010-documentation.patch → toolchain/gcc/patches-8.x/010-documentation.patch


+ 0 - 0
toolchain/gcc/patches/8.4.0/110-Fix-MIPS-PR-84790.patch → toolchain/gcc/patches-8.x/110-Fix-MIPS-PR-84790.patch


+ 0 - 0
toolchain/gcc/patches/8.4.0/230-musl_libssp.patch → toolchain/gcc/patches-8.x/230-musl_libssp.patch


+ 0 - 0
toolchain/gcc/patches/8.4.0/300-mips_Os_cpu_rtx_cost_model.patch → toolchain/gcc/patches-8.x/300-mips_Os_cpu_rtx_cost_model.patch


+ 0 - 0
toolchain/gcc/patches/8.4.0/800-arm_v5te_no_ldrd_strd.patch → toolchain/gcc/patches-8.x/800-arm_v5te_no_ldrd_strd.patch


+ 0 - 0
toolchain/gcc/patches/8.4.0/810-arm-softfloat-libgcc.patch → toolchain/gcc/patches-8.x/810-arm-softfloat-libgcc.patch


+ 0 - 0
toolchain/gcc/patches/8.4.0/820-libgcc_pic.patch → toolchain/gcc/patches-8.x/820-libgcc_pic.patch


+ 0 - 0
toolchain/gcc/patches/8.4.0/840-armv4_pass_fix-v4bx_to_ld.patch → toolchain/gcc/patches-8.x/840-armv4_pass_fix-v4bx_to_ld.patch


+ 0 - 0
toolchain/gcc/patches/8.4.0/850-use_shared_libgcc.patch → toolchain/gcc/patches-8.x/850-use_shared_libgcc.patch


+ 0 - 0
toolchain/gcc/patches/8.4.0/851-libgcc_no_compat.patch → toolchain/gcc/patches-8.x/851-libgcc_no_compat.patch


+ 0 - 0
toolchain/gcc/patches/8.4.0/870-ppc_no_crtsavres.patch → toolchain/gcc/patches-8.x/870-ppc_no_crtsavres.patch


+ 0 - 0
toolchain/gcc/patches/8.4.0/881-no_tm_section.patch → toolchain/gcc/patches-8.x/881-no_tm_section.patch


+ 0 - 0
toolchain/gcc/patches/8.4.0/900-bad-mips16-crt.patch → toolchain/gcc/patches-8.x/900-bad-mips16-crt.patch


+ 0 - 0
toolchain/gcc/patches/8.4.0/910-mbsd_multi.patch → toolchain/gcc/patches-8.x/910-mbsd_multi.patch


+ 0 - 0
toolchain/gcc/patches/8.4.0/920-specs_nonfatal_getenv.patch → toolchain/gcc/patches-8.x/920-specs_nonfatal_getenv.patch


+ 0 - 0
toolchain/gcc/patches/8.4.0/930-fix-mips-noexecstack.patch → toolchain/gcc/patches-8.x/930-fix-mips-noexecstack.patch


+ 0 - 0
toolchain/gcc/patches/8.4.0/931-libffi-fix-MIPS-softfloat-build-issue.patch → toolchain/gcc/patches-8.x/931-libffi-fix-MIPS-softfloat-build-issue.patch


+ 0 - 0
toolchain/gcc/patches/8.4.0/960-gotools-fix-compilation-when-making-cross-compiler.patch → toolchain/gcc/patches-8.x/960-gotools-fix-compilation-when-making-cross-compiler.patch