mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-19 21:58:04 +00:00
toolchain: gcc: update to 13.3
Release Notes: https://gcc.gnu.org/pipermail/gcc/2024-May/243980.html Remove upstreamed patches: - patches-13.x/020-Include-safe-ctype.h-after-C-standard-headers-to-avo.patch - patches-13.x/021-libcc1-fix-vector-include.patch - patches-13.x/400-LoongArch-Fix-MUSL_DYNAMIC_LINKER.patch - patches-13.x/401-LoongArch-Modify-MUSL_DYNAMIC_LINKER.patch Refresh patches: - patches-13.x/300-mips_Os_cpu_rtx_cost_model.patch - patches-13.x/970-macos_arm64-building-fix.patch Signed-off-by: Olcay Korkmaz <nuke_mania@hotmail.com>
This commit is contained in:
Olcay Korkmaz
Nick Hainke
parent
3a2706ed10
commit
3b63abfbfc
@ -16,7 +16,7 @@ config GCC_VERSION
|
||||
default "11.3.0" if GCC_VERSION_11
|
||||
default "12.3.0" if GCC_VERSION_12
|
||||
default "14.1.0" if GCC_VERSION_14
|
||||
default "13.2.0"
|
||||
default "13.3.0"
|
||||
|
||||
config GCC_USE_DEFAULT_VERSION
|
||||
bool
|
||||
|
||||
@ -38,8 +38,8 @@ ifeq ($(PKG_VERSION),12.3.0)
|
||||
PKG_HASH:=949a5d4f99e786421a93b532b22ffab5578de7321369975b91aec97adfda8c3b
|
||||
endif
|
||||
|
||||
ifeq ($(PKG_VERSION),13.2.0)
|
||||
PKG_HASH:=e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
|
||||
ifeq ($(PKG_VERSION),13.3.0)
|
||||
PKG_HASH:=0845e9621c9543a13f484e94584a49ffc0129970e9914624235fc1d061a0c083
|
||||
endif
|
||||
|
||||
ifeq ($(PKG_VERSION),14.1.0)
|
||||
|
||||
@ -1,139 +0,0 @@
|
||||
From 9970b576b7e4ae337af1268395ff221348c4b34a Mon Sep 17 00:00:00 2001
|
||||
From: Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
|
||||
Date: Thu, 7 Mar 2024 14:36:03 +0100
|
||||
Subject: [PATCH] Include safe-ctype.h after C++ standard headers, to avoid
|
||||
over-poisoning
|
||||
|
||||
When building gcc's C++ sources against recent libc++, the poisoning of
|
||||
the ctype macros due to including safe-ctype.h before including C++
|
||||
standard headers such as <list>, <map>, etc, causes many compilation
|
||||
errors, similar to:
|
||||
|
||||
In file included from /home/dim/src/gcc/master/gcc/gensupport.cc:23:
|
||||
In file included from /home/dim/src/gcc/master/gcc/system.h:233:
|
||||
In file included from /usr/include/c++/v1/vector:321:
|
||||
In file included from
|
||||
/usr/include/c++/v1/__format/formatter_bool.h:20:
|
||||
In file included from
|
||||
/usr/include/c++/v1/__format/formatter_integral.h:32:
|
||||
In file included from /usr/include/c++/v1/locale:202:
|
||||
/usr/include/c++/v1/__locale:546:5: error: '__abi_tag__' attribute
|
||||
only applies to structs, variables, functions, and namespaces
|
||||
546 | _LIBCPP_INLINE_VISIBILITY
|
||||
| ^
|
||||
/usr/include/c++/v1/__config:813:37: note: expanded from macro
|
||||
'_LIBCPP_INLINE_VISIBILITY'
|
||||
813 | # define _LIBCPP_INLINE_VISIBILITY _LIBCPP_HIDE_FROM_ABI
|
||||
| ^
|
||||
/usr/include/c++/v1/__config:792:26: note: expanded from macro
|
||||
'_LIBCPP_HIDE_FROM_ABI'
|
||||
792 |
|
||||
__attribute__((__abi_tag__(_LIBCPP_TOSTRING(
|
||||
_LIBCPP_VERSIONED_IDENTIFIER))))
|
||||
| ^
|
||||
In file included from /home/dim/src/gcc/master/gcc/gensupport.cc:23:
|
||||
In file included from /home/dim/src/gcc/master/gcc/system.h:233:
|
||||
In file included from /usr/include/c++/v1/vector:321:
|
||||
In file included from
|
||||
/usr/include/c++/v1/__format/formatter_bool.h:20:
|
||||
In file included from
|
||||
/usr/include/c++/v1/__format/formatter_integral.h:32:
|
||||
In file included from /usr/include/c++/v1/locale:202:
|
||||
/usr/include/c++/v1/__locale:547:37: error: expected ';' at end of
|
||||
declaration list
|
||||
547 | char_type toupper(char_type __c) const
|
||||
| ^
|
||||
/usr/include/c++/v1/__locale:553:48: error: too many arguments
|
||||
provided to function-like macro invocation
|
||||
553 | const char_type* toupper(char_type* __low, const
|
||||
char_type* __high) const
|
||||
| ^
|
||||
/home/dim/src/gcc/master/gcc/../include/safe-ctype.h:146:9: note:
|
||||
macro 'toupper' defined here
|
||||
146 | #define toupper(c) do_not_use_toupper_with_safe_ctype
|
||||
| ^
|
||||
|
||||
This is because libc++ uses different transitive includes than
|
||||
libstdc++, and some of those transitive includes pull in various ctype
|
||||
declarations (typically via <locale>).
|
||||
|
||||
There was already a special case for including <string> before
|
||||
safe-ctype.h, so move the rest of the C++ standard header includes to
|
||||
the same location, to fix the problem.
|
||||
|
||||
gcc/ChangeLog:
|
||||
|
||||
* system.h: Include safe-ctype.h after C++ standard headers.
|
||||
|
||||
Signed-off-by: Dimitry Andric <dimitry@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 *, ...);
|
||||
#undef fread_unlocked
|
||||
#undef fwrite_unlocked
|
||||
|
||||
-/* Include <string> before "safe-ctype.h" to avoid GCC poisoning
|
||||
- the ctype macros through safe-ctype.h */
|
||||
-
|
||||
-#ifdef __cplusplus
|
||||
-#ifdef INCLUDE_STRING
|
||||
-# include <string>
|
||||
-#endif
|
||||
-#endif
|
||||
-
|
||||
-/* There are an extraordinary number of issues with <ctype.h>.
|
||||
- The last straw is that it varies with the locale. Use libiberty's
|
||||
- replacement instead. */
|
||||
-#include "safe-ctype.h"
|
||||
-
|
||||
-#include <sys/types.h>
|
||||
-
|
||||
-#include <errno.h>
|
||||
-
|
||||
-#if !defined (errno) && defined (HAVE_DECL_ERRNO) && !HAVE_DECL_ERRNO
|
||||
-extern int errno;
|
||||
-#endif
|
||||
+/* Include C++ standard headers before "safe-ctype.h" to avoid GCC
|
||||
+ poisoning the ctype macros through safe-ctype.h */
|
||||
|
||||
#ifdef __cplusplus
|
||||
#if defined (INCLUDE_ALGORITHM) || !defined (HAVE_SWAP_IN_UTILITY)
|
||||
@@ -229,6 +210,9 @@ extern int errno;
|
||||
#ifdef INCLUDE_SET
|
||||
# include <set>
|
||||
#endif
|
||||
+#ifdef INCLUDE_STRING
|
||||
+# include <string>
|
||||
+#endif
|
||||
#ifdef INCLUDE_VECTOR
|
||||
# include <vector>
|
||||
#endif
|
||||
@@ -245,6 +229,19 @@ extern int errno;
|
||||
# include <type_traits>
|
||||
#endif
|
||||
|
||||
+/* There are an extraordinary number of issues with <ctype.h>.
|
||||
+ The last straw is that it varies with the locale. Use libiberty's
|
||||
+ replacement instead. */
|
||||
+#include "safe-ctype.h"
|
||||
+
|
||||
+#include <sys/types.h>
|
||||
+
|
||||
+#include <errno.h>
|
||||
+
|
||||
+#if !defined (errno) && defined (HAVE_DECL_ERRNO) && !HAVE_DECL_ERRNO
|
||||
+extern int errno;
|
||||
+#endif
|
||||
+
|
||||
/* 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
|
||||
|
||||
@ -1,65 +0,0 @@
|
||||
From 5213047b1d50af63dfabb5e5649821a6cb157e33 Mon Sep 17 00:00:00 2001
|
||||
From: Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
|
||||
Date: Sat, 16 Mar 2024 09:50:00 +0100
|
||||
Subject: [PATCH] libcc1: fix <vector> include
|
||||
|
||||
Use INCLUDE_VECTOR before including system.h, instead of directly
|
||||
including <vector>, to avoid running into poisoned identifiers.
|
||||
|
||||
Signed-off-by: Dimitry Andric <dimitry@andric.com>
|
||||
|
||||
libcc1/ChangeLog:
|
||||
|
||||
PR middle-end/111632
|
||||
* libcc1plugin.cc: Fix include.
|
||||
* libcp1plugin.cc: Fix include.
|
||||
---
|
||||
libcc1/libcc1plugin.cc | 3 +--
|
||||
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 @@
|
||||
#undef PACKAGE_VERSION
|
||||
|
||||
#define INCLUDE_MEMORY
|
||||
+#define INCLUDE_VECTOR
|
||||
#include "gcc-plugin.h"
|
||||
#include "system.h"
|
||||
#include "coretypes.h"
|
||||
@@ -69,8 +70,6 @@
|
||||
#include "gcc-c-interface.h"
|
||||
#include "context.hh"
|
||||
|
||||
-#include <vector>
|
||||
-
|
||||
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 @@
|
||||
#undef PACKAGE_VERSION
|
||||
|
||||
#define INCLUDE_MEMORY
|
||||
+#define INCLUDE_VECTOR
|
||||
#include "gcc-plugin.h"
|
||||
#include "system.h"
|
||||
#include "coretypes.h"
|
||||
@@ -71,8 +72,6 @@
|
||||
#include "rpc.hh"
|
||||
#include "context.hh"
|
||||
|
||||
-#include <vector>
|
||||
-
|
||||
using namespace cc1_plugin;
|
||||
|
||||
|
||||
--
|
||||
2.39.3
|
||||
|
||||
@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
--- a/gcc/config/mips/mips.cc
|
||||
+++ b/gcc/config/mips/mips.cc
|
||||
@@ -20213,7 +20213,7 @@ mips_option_override (void)
|
||||
@@ -20219,7 +20219,7 @@ mips_option_override (void)
|
||||
flag_pcc_struct_return = 0;
|
||||
|
||||
/* Decide which rtx_costs structure to use. */
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
From a80c68a08604b0ac625ac7fc59eae40b551b1176 Mon Sep 17 00:00:00 2001
|
||||
From: Peng Fan <fanpeng@loongson.cn>
|
||||
Date: Wed, 19 Apr 2023 16:23:42 +0800
|
||||
Subject: [PATCH] LoongArch: Fix MUSL_DYNAMIC_LINKER
|
||||
|
||||
The system based on musl has no '/lib64', so change it.
|
||||
|
||||
https://wiki.musl-libc.org/guidelines-for-distributions.html,
|
||||
"Multilib/multi-arch" section of this introduces it.
|
||||
|
||||
gcc/
|
||||
* config/loongarch/gnu-user.h (MUSL_DYNAMIC_LINKER): Redefine.
|
||||
|
||||
Signed-off-by: Peng Fan <fanpeng@loongson.cn>
|
||||
Suggested-by: Xi Ruoyao <xry111@xry111.site>
|
||||
---
|
||||
gcc/config/loongarch/gnu-user.h | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gcc/config/loongarch/gnu-user.h b/gcc/config/loongarch/gnu-user.h
|
||||
index aecaa02a199..fa1a5211419 100644
|
||||
--- a/gcc/config/loongarch/gnu-user.h
|
||||
+++ b/gcc/config/loongarch/gnu-user.h
|
||||
@@ -33,9 +33,14 @@ along with GCC; see the file COPYING3. If not see
|
||||
#define GLIBC_DYNAMIC_LINKER \
|
||||
"/lib" ABI_GRLEN_SPEC "/ld-linux-loongarch-" ABI_SPEC ".so.1"
|
||||
|
||||
+#define MUSL_ABI_SPEC \
|
||||
+ "%{mabi=lp64d:-lp64d}" \
|
||||
+ "%{mabi=lp64f:-lp64f}" \
|
||||
+ "%{mabi=lp64s:-lp64s}"
|
||||
+
|
||||
#undef MUSL_DYNAMIC_LINKER
|
||||
#define MUSL_DYNAMIC_LINKER \
|
||||
- "/lib" ABI_GRLEN_SPEC "/ld-musl-loongarch-" ABI_SPEC ".so.1"
|
||||
+ "/lib/ld-musl-loongarch" ABI_GRLEN_SPEC MUSL_ABI_SPEC ".so.1"
|
||||
|
||||
#undef GNU_USER_TARGET_LINK_SPEC
|
||||
#define GNU_USER_TARGET_LINK_SPEC \
|
||||
--
|
||||
2.39.3
|
||||
@ -1,43 +0,0 @@
|
||||
From 8bccee51f0deac64b79cd9ad75df599422f4c8ff Mon Sep 17 00:00:00 2001
|
||||
From: Lulu Cheng <chenglulu@loongson.cn>
|
||||
Date: Sat, 18 Nov 2023 11:04:42 +0800
|
||||
Subject: [PATCH] LoongArch: Modify MUSL_DYNAMIC_LINKER.
|
||||
|
||||
Use no suffix at all in the musl dynamic linker name for hard
|
||||
float ABI. Use -sf and -sp suffixes in musl dynamic linker name
|
||||
for soft float and single precision ABIs. The following table
|
||||
outlines the musl interpreter names for the LoongArch64 ABI names.
|
||||
|
||||
musl interpreter | LoongArch64 ABI
|
||||
--------------------------- | -----------------
|
||||
ld-musl-loongarch64.so.1 | loongarch64-lp64d
|
||||
ld-musl-loongarch64-sp.so.1 | loongarch64-lp64f
|
||||
ld-musl-loongarch64-sf.so.1 | loongarch64-lp64s
|
||||
|
||||
gcc/ChangeLog:
|
||||
|
||||
* config/loongarch/gnu-user.h (MUSL_ABI_SPEC): Modify suffix.
|
||||
---
|
||||
gcc/config/loongarch/gnu-user.h | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/gcc/config/loongarch/gnu-user.h b/gcc/config/loongarch/gnu-user.h
|
||||
index 9616d6e8a0b..e9f4bcef1d4 100644
|
||||
--- a/gcc/config/loongarch/gnu-user.h
|
||||
+++ b/gcc/config/loongarch/gnu-user.h
|
||||
@@ -34,9 +34,9 @@ along with GCC; see the file COPYING3. If not see
|
||||
"/lib" ABI_GRLEN_SPEC "/ld-linux-loongarch-" ABI_SPEC ".so.1"
|
||||
|
||||
#define MUSL_ABI_SPEC \
|
||||
- "%{mabi=lp64d:-lp64d}" \
|
||||
- "%{mabi=lp64f:-lp64f}" \
|
||||
- "%{mabi=lp64s:-lp64s}"
|
||||
+ "%{mabi=lp64d:}" \
|
||||
+ "%{mabi=lp64f:-sp}" \
|
||||
+ "%{mabi=lp64s:-sf}"
|
||||
|
||||
#undef MUSL_DYNAMIC_LINKER
|
||||
#define MUSL_DYNAMIC_LINKER \
|
||||
--
|
||||
2.39.3
|
||||
|
||||
@ -17,7 +17,7 @@ Date: Mon Aug 16 13:16:21 2021 +0100
|
||||
|
||||
--- a/gcc/config/aarch64/aarch64.h
|
||||
+++ b/gcc/config/aarch64/aarch64.h
|
||||
@@ -1185,7 +1185,7 @@ extern enum aarch64_code_model aarch64_c
|
||||
@@ -1195,7 +1195,7 @@ extern enum aarch64_code_model aarch64_c
|
||||
|
||||
/* Extra specs when building a native AArch64-hosted compiler.
|
||||
Option rewriting rules based on host system. */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user