[openwrt/openwrt] toolchain: gcc: Refresh patches
LEDE Commits
lede-commits at lists.infradead.org
Sat May 3 13:06:04 PDT 2025
hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/e184be34ab18b7e8b58f857984abdf27e2869079
commit e184be34ab18b7e8b58f857984abdf27e2869079
Author: Hauke Mehrtens <hauke at hauke-m.de>
AuthorDate: Sat May 3 00:45:51 2025 +0200
toolchain: gcc: Refresh patches
Refresh all GCC patches.
Link: https://github.com/openwrt/openwrt/pull/18688
Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
.../020-Include-safe-ctype.h-after-C-standard-headers-to-avo.patch | 7 +------
.../gcc/patches-11.x/980-fix-build-error-with-Xcode-16.3.patch | 7 +------
.../020-Include-safe-ctype.h-after-C-standard-headers-to-avo.patch | 7 +------
toolchain/gcc/patches-12.x/021-libcc1-fix-vector-include.patch | 7 -------
.../gcc/patches-12.x/980-fix-build-error-with-Xcode-16.3.patch | 7 +------
.../gcc/patches-13.x/980-fix-build-error-with-Xcode-16.3.patch | 7 +------
toolchain/gcc/patches-14.x/300-mips_Os_cpu_rtx_cost_model.patch | 2 +-
.../gcc/patches-14.x/980-fix-build-error-with-Xcode-16.3.patch | 7 +------
8 files changed, 7 insertions(+), 44 deletions(-)
diff --git a/toolchain/gcc/patches-11.x/020-Include-safe-ctype.h-after-C-standard-headers-to-avo.patch b/toolchain/gcc/patches-11.x/020-Include-safe-ctype.h-after-C-standard-headers-to-avo.patch
index a17c56b272..4a9ebbd837 100644
--- a/toolchain/gcc/patches-11.x/020-Include-safe-ctype.h-after-C-standard-headers-to-avo.patch
+++ b/toolchain/gcc/patches-11.x/020-Include-safe-ctype.h-after-C-standard-headers-to-avo.patch
@@ -70,11 +70,9 @@ Signed-off-by: Dimitry Andric <dimitry at andric.com>
gcc/system.h | 39 ++++++++++++++++++---------------------
1 file changed, 18 insertions(+), 21 deletions(-)
-diff --git a/gcc/system.h b/gcc/system.h
-index b0edab02885..ab29fc19776 100644
--- a/gcc/system.h
+++ b/gcc/system.h
-@@ -194,27 +194,8 @@ extern int fprintf_unlocked (FILE *, const char *, ...);
+@@ -194,27 +194,8 @@ extern int fprintf_unlocked (FILE *, con
#undef fread_unlocked
#undef fwrite_unlocked
@@ -134,6 +132,3 @@ index b0edab02885..ab29fc19776 100644
/* Some of glibc's string inlines cause warnings. Plus we'd rather
rely on (and therefore test) GCC's string builtins. */
#define __NO_STRING_INLINES
---
-2.39.3
-
diff --git a/toolchain/gcc/patches-11.x/980-fix-build-error-with-Xcode-16.3.patch b/toolchain/gcc/patches-11.x/980-fix-build-error-with-Xcode-16.3.patch
index 3f4cdd5726..c55100133c 100644
--- a/toolchain/gcc/patches-11.x/980-fix-build-error-with-Xcode-16.3.patch
+++ b/toolchain/gcc/patches-11.x/980-fix-build-error-with-Xcode-16.3.patch
@@ -34,11 +34,9 @@ Signed-off-by: Georgi Valkov <gvalkov at gmail.com>
zlib/zutil.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/zlib/zutil.h b/zlib/zutil.h
-index 4b596adf629..9ea8d840643 100644
--- a/zlib/zutil.h
+++ b/zlib/zutil.h
-@@ -130,7 +130,7 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+@@ -130,7 +130,7 @@ extern z_const char * const z_errmsg[10]
# endif
#endif
@@ -47,6 +45,3 @@ index 4b596adf629..9ea8d840643 100644
# define OS_CODE 7
# ifndef Z_SOLO
# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
---
-2.49.0
-
diff --git a/toolchain/gcc/patches-12.x/020-Include-safe-ctype.h-after-C-standard-headers-to-avo.patch b/toolchain/gcc/patches-12.x/020-Include-safe-ctype.h-after-C-standard-headers-to-avo.patch
index 986d19057f..7519e31d53 100644
--- a/toolchain/gcc/patches-12.x/020-Include-safe-ctype.h-after-C-standard-headers-to-avo.patch
+++ b/toolchain/gcc/patches-12.x/020-Include-safe-ctype.h-after-C-standard-headers-to-avo.patch
@@ -70,11 +70,9 @@ Signed-off-by: Dimitry Andric <dimitry at andric.com>
gcc/system.h | 39 ++++++++++++++++++---------------------
1 file changed, 18 insertions(+), 21 deletions(-)
-diff --git a/gcc/system.h b/gcc/system.h
-index b0edab02885..ab29fc19776 100644
--- a/gcc/system.h
+++ b/gcc/system.h
-@@ -194,27 +194,8 @@ extern int fprintf_unlocked (FILE *, const char *, ...);
+@@ -194,27 +194,8 @@ extern int fprintf_unlocked (FILE *, con
#undef fread_unlocked
#undef fwrite_unlocked
@@ -134,6 +132,3 @@ index b0edab02885..ab29fc19776 100644
/* Some of glibc's string inlines cause warnings. Plus we'd rather
rely on (and therefore test) GCC's string builtins. */
#define __NO_STRING_INLINES
---
-2.39.3
-
diff --git a/toolchain/gcc/patches-12.x/021-libcc1-fix-vector-include.patch b/toolchain/gcc/patches-12.x/021-libcc1-fix-vector-include.patch
index b6b15cd1c6..6d67292221 100644
--- a/toolchain/gcc/patches-12.x/021-libcc1-fix-vector-include.patch
+++ b/toolchain/gcc/patches-12.x/021-libcc1-fix-vector-include.patch
@@ -18,8 +18,6 @@ libcc1/ChangeLog:
libcc1/libcp1plugin.cc | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
-diff --git a/libcc1/libcc1plugin.cc b/libcc1/libcc1plugin.cc
-index 72d17c3b81c..e64847466f4 100644
--- a/libcc1/libcc1plugin.cc
+++ b/libcc1/libcc1plugin.cc
@@ -32,6 +32,7 @@
@@ -39,8 +37,6 @@ index 72d17c3b81c..e64847466f4 100644
using namespace cc1_plugin;
-diff --git a/libcc1/libcp1plugin.cc b/libcc1/libcp1plugin.cc
-index 0eff7c68d29..da68c5d0ac1 100644
--- a/libcc1/libcp1plugin.cc
+++ b/libcc1/libcp1plugin.cc
@@ -33,6 +33,7 @@
@@ -60,6 +56,3 @@ index 0eff7c68d29..da68c5d0ac1 100644
using namespace cc1_plugin;
---
-2.39.3
-
diff --git a/toolchain/gcc/patches-12.x/980-fix-build-error-with-Xcode-16.3.patch b/toolchain/gcc/patches-12.x/980-fix-build-error-with-Xcode-16.3.patch
index 3f4cdd5726..c55100133c 100644
--- a/toolchain/gcc/patches-12.x/980-fix-build-error-with-Xcode-16.3.patch
+++ b/toolchain/gcc/patches-12.x/980-fix-build-error-with-Xcode-16.3.patch
@@ -34,11 +34,9 @@ Signed-off-by: Georgi Valkov <gvalkov at gmail.com>
zlib/zutil.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/zlib/zutil.h b/zlib/zutil.h
-index 4b596adf629..9ea8d840643 100644
--- a/zlib/zutil.h
+++ b/zlib/zutil.h
-@@ -130,7 +130,7 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+@@ -130,7 +130,7 @@ extern z_const char * const z_errmsg[10]
# endif
#endif
@@ -47,6 +45,3 @@ index 4b596adf629..9ea8d840643 100644
# define OS_CODE 7
# ifndef Z_SOLO
# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
---
-2.49.0
-
diff --git a/toolchain/gcc/patches-13.x/980-fix-build-error-with-Xcode-16.3.patch b/toolchain/gcc/patches-13.x/980-fix-build-error-with-Xcode-16.3.patch
index 3f4cdd5726..c55100133c 100644
--- a/toolchain/gcc/patches-13.x/980-fix-build-error-with-Xcode-16.3.patch
+++ b/toolchain/gcc/patches-13.x/980-fix-build-error-with-Xcode-16.3.patch
@@ -34,11 +34,9 @@ Signed-off-by: Georgi Valkov <gvalkov at gmail.com>
zlib/zutil.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/zlib/zutil.h b/zlib/zutil.h
-index 4b596adf629..9ea8d840643 100644
--- a/zlib/zutil.h
+++ b/zlib/zutil.h
-@@ -130,7 +130,7 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+@@ -130,7 +130,7 @@ extern z_const char * const z_errmsg[10]
# endif
#endif
@@ -47,6 +45,3 @@ index 4b596adf629..9ea8d840643 100644
# define OS_CODE 7
# ifndef Z_SOLO
# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
---
-2.49.0
-
diff --git a/toolchain/gcc/patches-14.x/300-mips_Os_cpu_rtx_cost_model.patch b/toolchain/gcc/patches-14.x/300-mips_Os_cpu_rtx_cost_model.patch
index 2cbffe4517..11940960ab 100644
--- a/toolchain/gcc/patches-14.x/300-mips_Os_cpu_rtx_cost_model.patch
+++ b/toolchain/gcc/patches-14.x/300-mips_Os_cpu_rtx_cost_model.patch
@@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
--- a/gcc/config/mips/mips.cc
+++ b/gcc/config/mips/mips.cc
-@@ -20453,7 +20453,7 @@ mips_option_override (void)
+@@ -20447,7 +20447,7 @@ mips_option_override (void)
flag_pcc_struct_return = 0;
/* Decide which rtx_costs structure to use. */
diff --git a/toolchain/gcc/patches-14.x/980-fix-build-error-with-Xcode-16.3.patch b/toolchain/gcc/patches-14.x/980-fix-build-error-with-Xcode-16.3.patch
index 3f4cdd5726..c55100133c 100644
--- a/toolchain/gcc/patches-14.x/980-fix-build-error-with-Xcode-16.3.patch
+++ b/toolchain/gcc/patches-14.x/980-fix-build-error-with-Xcode-16.3.patch
@@ -34,11 +34,9 @@ Signed-off-by: Georgi Valkov <gvalkov at gmail.com>
zlib/zutil.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/zlib/zutil.h b/zlib/zutil.h
-index 4b596adf629..9ea8d840643 100644
--- a/zlib/zutil.h
+++ b/zlib/zutil.h
-@@ -130,7 +130,7 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+@@ -130,7 +130,7 @@ extern z_const char * const z_errmsg[10]
# endif
#endif
@@ -47,6 +45,3 @@ index 4b596adf629..9ea8d840643 100644
# define OS_CODE 7
# ifndef Z_SOLO
# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
---
-2.49.0
-
More information about the lede-commits
mailing list