@@ -190,7 +190,7 @@ RECIPE_MAINTAINER:pn-gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Khem Raj <r
RECIPE_MAINTAINER:pn-gcc-crosssdk-${SDK_SYS} = "Khem Raj <raj.khem@gmail.com>"
RECIPE_MAINTAINER:pn-gcc-runtime = "Khem Raj <raj.khem@gmail.com>"
RECIPE_MAINTAINER:pn-gcc-sanitizers = "Khem Raj <raj.khem@gmail.com>"
-RECIPE_MAINTAINER:pn-gcc-source-13.4.0 = "Khem Raj <raj.khem@gmail.com>"
+RECIPE_MAINTAINER:pn-gcc-source-13.5.0 = "Khem Raj <raj.khem@gmail.com>"
RECIPE_MAINTAINER:pn-gconf = "Ross Burton <ross.burton@arm.com>"
RECIPE_MAINTAINER:pn-gcr = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER:pn-gdb = "Khem Raj <raj.khem@gmail.com>"
similarity index 93%
rename from meta/recipes-devtools/gcc/gcc-13.4.inc
rename to meta/recipes-devtools/gcc/gcc-13.5.inc
@@ -2,11 +2,11 @@ require gcc-common.inc
# Third digit in PV should be incremented after a minor release
-PV = "13.4.0"
+PV = "13.5.0"
# BINV should be incremented to a revision after a minor gcc release
-BINV = "13.4.0"
+BINV = "13.5.0"
FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc:${FILE_DIRNAME}/gcc/backport:"
@@ -66,11 +66,8 @@ SRC_URI = "${BASEURI} \
file://0024-Avoid-hardcoded-build-paths-into-ppc-libgcc.patch \
file://0025-gcc-testsuite-tweaks-for-mips-OE.patch \
file://0027-Fix-gcc-vect-module-testcases.patch \
- file://0028-libcody-Make-it-buildable-by-C-11-to-C-26.patch \
- file://0029-build-Remove-INCLUDE_MEMORY-PR117737.patch \
- file://0030-build-Move-sstream-include-above-safe-ctype.h-PR1177.patch \
"
-SRC_URI[sha256sum] = "9c4ce6dbb040568fdc545588ac03c5cbc95a8dbf0c7aa490170843afb59ca8f5"
+SRC_URI[sha256sum] = "ec3df0015ed01411f91f9a9cd5b4da3070eb1222b02fadf4133c30c090399855"
S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/${SOURCEDIR}"
B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}"
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-cross-canadian_13.4.bb
rename to meta/recipes-devtools/gcc/gcc-cross-canadian_13.5.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-cross_13.4.bb
rename to meta/recipes-devtools/gcc/gcc-cross_13.5.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-crosssdk_13.4.bb
rename to meta/recipes-devtools/gcc/gcc-crosssdk_13.5.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-runtime_13.4.bb
rename to meta/recipes-devtools/gcc/gcc-runtime_13.5.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-sanitizers_13.4.bb
rename to meta/recipes-devtools/gcc/gcc-sanitizers_13.5.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-source_13.4.bb
rename to meta/recipes-devtools/gcc/gcc-source_13.5.bb
deleted file mode 100644
@@ -1,257 +0,0 @@
-From 0ffe3c9af4e5d5468df742512b6e930fe7039230 Mon Sep 17 00:00:00 2001
-From: Jakub Jelinek <jakub@redhat.com>
-Date: Fri, 21 Nov 2025 16:25:58 +0100
-Subject: [PATCH] libcody: Make it buildable by C++11 to C++26
-
-The following builds with -std=c++11 and c++14 and c++17 and c++20 and c++23
-and c++26.
-
-I see the u8 string literals are mixed e.g. with strerror, so in
--fexec-charset=IBM1047 there will still be garbage, so am not 100% sure if
-the u8 literals everywhere are worth it either.
-
-2025-11-21 Jakub Jelinek <jakub@redhat.com>
-
- * cody.hh (S2C): For __cpp_char8_t >= 201811 use char8_t instead of
- char in argument type.
- (MessageBuffer::Space): Revert 2025-11-15 change.
- (MessageBuffer::Append): For __cpp_char8_t >= 201811 add overload
- with char8_t const * type of first argument.
- (Packet::Packet): Similarly for first argument.
- * client.cc (CommunicationError, Client::ProcessResponse,
- Client::Connect, ConnectResponse, PathnameResponse, OKResponse,
- IncludeTranslateResponse): Cast u8 string literals to (const char *)
- where needed.
- * server.cc (Server::ProcessRequests, ConnectRequest): Likewise.
-
-Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
-Upstream-Status: Backport [07a767c7a50d1daae8ef7d4aba73fe53ad40c0b7]
----
- libcody/client.cc | 36 +++++++++++++++++++-----------------
- libcody/cody.hh | 22 ++++++++++++++++++++++
- libcody/server.cc | 28 ++++++++++++++--------------
- 3 files changed, 55 insertions(+), 31 deletions(-)
-
-diff --git a/libcody/client.cc b/libcody/client.cc
-index ae69d190cb77..147fecdbe500 100644
---- a/libcody/client.cc
-+++ b/libcody/client.cc
-@@ -97,7 +97,7 @@ int Client::CommunicateWithServer ()
-
- static Packet CommunicationError (int err)
- {
-- std::string e {u8"communication error:"};
-+ std::string e {(const char *) u8"communication error:"};
- e.append (strerror (err));
-
- return Packet (Client::PC_ERROR, std::move (e));
-@@ -110,33 +110,34 @@ Packet Client::ProcessResponse (std::vector<std::string> &words,
- {
- if (e == EINVAL)
- {
-- std::string msg (u8"malformed string '");
-+ std::string msg ((const char *) u8"malformed string '");
- msg.append (words[0]);
-- msg.append (u8"'");
-+ msg.append ((const char *) u8"'");
- return Packet (Client::PC_ERROR, std::move (msg));
- }
- else
-- return Packet (Client::PC_ERROR, u8"missing response");
-+ return Packet (Client::PC_ERROR, (const char *) u8"missing response");
- }
-
- Assert (!words.empty ());
-- if (words[0] == u8"ERROR")
-+ if (words[0] == (const char *) u8"ERROR")
- return Packet (Client::PC_ERROR,
-- words.size () == 2 ? words[1]: u8"malformed error response");
-+ words.size () == 2 ? words[1]
-+ : (const char *) u8"malformed error response");
-
- if (isLast && !read.IsAtEnd ())
- return Packet (Client::PC_ERROR,
-- std::string (u8"unexpected extra response"));
-+ std::string ((const char *) u8"unexpected extra response"));
-
- Assert (code < Detail::RC_HWM);
- Packet result (responseTable[code] (words));
- result.SetRequest (code);
- if (result.GetCode () == Client::PC_ERROR && result.GetString ().empty ())
- {
-- std::string msg {u8"malformed response '"};
-+ std::string msg {(const char *) u8"malformed response '"};
-
- read.LexedLine (msg);
-- msg.append (u8"'");
-+ msg.append ((const char *) u8"'");
- result.GetString () = std::move (msg);
- }
- else if (result.GetCode () == Client::PC_CONNECT)
-@@ -199,7 +200,7 @@ Packet Client::Connect (char const *agent, char const *ident,
- size_t alen, size_t ilen)
- {
- write.BeginLine ();
-- write.AppendWord (u8"HELLO");
-+ write.AppendWord ((const char *) u8"HELLO");
- write.AppendInteger (Version);
- write.AppendWord (agent, true, alen);
- write.AppendWord (ident, true, ilen);
-@@ -211,7 +212,8 @@ Packet Client::Connect (char const *agent, char const *ident,
- // HELLO $version $agent [$flags]
- Packet ConnectResponse (std::vector<std::string> &words)
- {
-- if (words[0] == u8"HELLO" && (words.size () == 3 || words.size () == 4))
-+ if (words[0] == (const char *) u8"HELLO"
-+ && (words.size () == 3 || words.size () == 4))
- {
- char *eptr;
- unsigned long val = strtoul (words[1].c_str (), &eptr, 10);
-@@ -247,7 +249,7 @@ Packet Client::ModuleRepo ()
- // PATHNAME $dir | ERROR
- Packet PathnameResponse (std::vector<std::string> &words)
- {
-- if (words[0] == u8"PATHNAME" && words.size () == 2)
-+ if (words[0] == (const char *) u8"PATHNAME" && words.size () == 2)
- return Packet (Client::PC_PATHNAME, std::move (words[1]));
-
- return Packet (Client::PC_ERROR, u8"");
-@@ -256,7 +258,7 @@ Packet PathnameResponse (std::vector<std::string> &words)
- // OK or ERROR
- Packet OKResponse (std::vector<std::string> &words)
- {
-- if (words[0] == u8"OK")
-+ if (words[0] == (const char *) u8"OK")
- return Packet (Client::PC_OK);
- else
- return Packet (Client::PC_ERROR,
-@@ -319,11 +321,11 @@ Packet Client::IncludeTranslate (char const *include, Flags flags, size_t ilen)
- // PATHNAME $cmifile
- Packet IncludeTranslateResponse (std::vector<std::string> &words)
- {
-- if (words[0] == u8"BOOL" && words.size () == 2)
-+ if (words[0] == (const char *) u8"BOOL" && words.size () == 2)
- {
-- if (words[1] == u8"FALSE")
-- return Packet (Client::PC_BOOL, 0);
-- else if (words[1] == u8"TRUE")
-+ if (words[1] == (const char *) u8"FALSE")
-+ return Packet (Client::PC_BOOL);
-+ else if (words[1] == (const char *) u8"TRUE")
- return Packet (Client::PC_BOOL, 1);
- else
- return Packet (Client::PC_ERROR, u8"");
-diff --git a/libcody/cody.hh b/libcody/cody.hh
-index 789ce9e70b75..93bce93aa94d 100644
---- a/libcody/cody.hh
-+++ b/libcody/cody.hh
-@@ -47,12 +47,21 @@ namespace Detail {
-
- // C++11 doesn't have utf8 character literals :(
-
-+#if __cpp_char8_t >= 201811
-+template<unsigned I>
-+constexpr char S2C (char8_t const (&s)[I])
-+{
-+ static_assert (I == 2, "only single octet strings may be converted");
-+ return s[0];
-+}
-+#else
- template<unsigned I>
- constexpr char S2C (char const (&s)[I])
- {
- static_assert (I == 2, "only single octet strings may be converted");
- return s[0];
- }
-+#endif
-
- /// Internal buffering class. Used to concatenate outgoing messages
- /// and Lex incoming ones.
-@@ -123,6 +132,13 @@ public:
- Space ();
- Append (str, maybe_quote, len);
- }
-+#if __cpp_char8_t >= 201811
-+ void AppendWord (char8_t const *str, bool maybe_quote = false,
-+ size_t len = ~size_t (0))
-+ {
-+ AppendWord ((const char *) str, maybe_quote, len);
-+ }
-+#endif
- /// Add a word as with AppendWord
- /// @param str the string to append
- /// @param maybe_quote string might need quoting, as for Append
-@@ -264,6 +280,12 @@ public:
- : string (s), cat (STRING), code (c)
- {
- }
-+#if __cpp_char8_t >= 201811
-+ Packet (unsigned c, const char8_t *s)
-+ : string ((const char *) s), cat (STRING), code (c)
-+ {
-+ }
-+#endif
- Packet (unsigned c, std::vector<std::string> &&v)
- : vector (std::move (v)), cat (VECTOR), code (c)
- {
-diff --git a/libcody/server.cc b/libcody/server.cc
-index e2fa069bb933..c18469fae843 100644
---- a/libcody/server.cc
-+++ b/libcody/server.cc
-@@ -36,12 +36,12 @@ static RequestPair
- const requestTable[Detail::RC_HWM] =
- {
- // Same order as enum RequestCode
-- RequestPair {u8"HELLO", nullptr},
-- RequestPair {u8"MODULE-REPO", ModuleRepoRequest},
-- RequestPair {u8"MODULE-EXPORT", ModuleExportRequest},
-- RequestPair {u8"MODULE-IMPORT", ModuleImportRequest},
-- RequestPair {u8"MODULE-COMPILED", ModuleCompiledRequest},
-- RequestPair {u8"INCLUDE-TRANSLATE", IncludeTranslateRequest},
-+ RequestPair {(const char *) u8"HELLO", nullptr},
-+ RequestPair {(const char *) u8"MODULE-REPO", ModuleRepoRequest},
-+ RequestPair {(const char *) u8"MODULE-EXPORT", ModuleExportRequest},
-+ RequestPair {(const char *) u8"MODULE-IMPORT", ModuleImportRequest},
-+ RequestPair {(const char *) u8"MODULE-COMPILED", ModuleCompiledRequest},
-+ RequestPair {(const char *) u8"INCLUDE-TRANSLATE", IncludeTranslateRequest},
- };
- }
-
-@@ -135,21 +135,21 @@ void Server::ProcessRequests (void)
- std::string msg;
-
- if (err > 0)
-- msg = u8"error processing '";
-+ msg = (const char *) u8"error processing '";
- else if (ix >= Detail::RC_HWM)
-- msg = u8"unrecognized '";
-+ msg = (const char *) u8"unrecognized '";
- else if (IsConnected () && ix == Detail::RC_CONNECT)
-- msg = u8"already connected '";
-+ msg = (const char *) u8"already connected '";
- else if (!IsConnected () && ix != Detail::RC_CONNECT)
-- msg = u8"not connected '";
-+ msg = (const char *) u8"not connected '";
- else
-- msg = u8"malformed '";
-+ msg = (const char *) u8"malformed '";
-
- read.LexedLine (msg);
-- msg.append (u8"'");
-+ msg.append ((const char *) u8"'");
- if (err > 0)
- {
-- msg.append (u8" ");
-+ msg.append ((const char *) u8" ");
- msg.append (strerror (err));
- }
- resolver->ErrorResponse (this, std::move (msg));
-@@ -176,7 +176,7 @@ Resolver *ConnectRequest (Server *s, Resolver *r,
- return nullptr;
-
- if (words.size () == 3)
-- words.emplace_back (u8"");
-+ words.emplace_back ((const char *) u8"");
- unsigned version = ParseUnsigned (words[1]);
- if (version == ~0u)
- return nullptr;
deleted file mode 100644
@@ -1,46 +0,0 @@
-From b3f1b9e2aa079f8ec73e3cb48143a16645c49566 Mon Sep 17 00:00:00 2001
-From: Andrew Pinski <quic_apinski@quicinc.com>
-Date: Fri, 22 Nov 2024 09:31:44 -0800
-Subject: [PATCH] build: Remove INCLUDE_MEMORY [PR117737]
-
-Since diagnostic.h is included in over half of the sources, requiring to `#define INCLUDE_MEMORY`
-does not make sense. Instead lets unconditionally include memory in system.h.
-
-The majority of this patch is just removing `#define INCLUDE_MEMORY` from the sources which currently
-have it.
-
-This should also fix the mingw build issue but I have not tried it.
-
-Signed-off-by: Andrew Pinski <quic_apinski@quicinc.com>
-Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
-Upstream-Status: Backport [gcc-15.1.0 b3f1b9e2aa07 partial, only the gcc/system.h change]
----
- gcc/system.h | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/gcc/system.h b/gcc/system.h
-index c18c7c5ec58d..c209871df72d 100644
---- a/gcc/system.h
-+++ b/gcc/system.h
-@@ -222,6 +222,7 @@ extern int fprintf_unlocked (FILE *, const char *, ...);
- #ifdef INCLUDE_FUNCTIONAL
- # include <functional>
- #endif
-+# include <memory>
- # include <cstring>
- # include <initializer_list>
- # include <new>
-@@ -758,13 +759,6 @@ private:
- #define LIKELY(x) (__builtin_expect ((x), 1))
- #define UNLIKELY(x) (__builtin_expect ((x), 0))
-
--/* Some of the headers included by <memory> can use "abort" within a
-- namespace, e.g. "_VSTD::abort();", which fails after we use the
-- preprocessor to redefine "abort" as "fancy_abort" below. */
--
--#ifdef INCLUDE_MEMORY
--# include <memory>
--#endif
-
- #ifdef INCLUDE_MUTEX
- # include <mutex>
deleted file mode 100644
@@ -1,54 +0,0 @@
-From ac90b5c413c1565fb37cf79b92f6859b3852254a Mon Sep 17 00:00:00 2001
-From: Andrew Pinski <quic_apinski@quicinc.com>
-Date: Mon, 25 Nov 2024 14:03:27 -0800
-Subject: [PATCH] build: Move sstream include above safe-ctype.h {PR117771]
-
-sstream in some versions of libstdc++ include locale which might not have been
-included yet. safe-ctype.h defines the toupper, tolower, etc. as macros so the
-c++ header files needed to be included before hand as comment in system.h says:
-/* Include C++ standard headers before "safe-ctype.h" to avoid GCC
- poisoning the ctype macros through safe-ctype.h */
-
-I don't understand how it was working before when memory was included after
-safe-ctype.h rather than before. But this makes sstream consistent with the
-other C++ headers.
-
-Pushed as obvious after a build for riscv64-elf.
-
-gcc/ChangeLog:
-
- PR target/117771
- * system.h: Move the include of sstream above safe-ctype.h.
-
-Signed-off-by: Andrew Pinski <quic_apinski@quicinc.com>
-Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
-Upstream-Status: Backport [gcc-15.1.0 f6e00226a4ca63e76e3e0b3a09a4ce6223980981]
----
- gcc/system.h | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/gcc/system.h b/gcc/system.h
-index 33245e76a986..ff983986153c 100644
---- a/gcc/system.h
-+++ b/gcc/system.h
-@@ -222,6 +222,9 @@ extern int fprintf_unlocked (FILE *, const char *, ...);
- #ifdef INCLUDE_FUNCTIONAL
- # include <functional>
- #endif
-+#ifdef INCLUDE_SSTREAM
-+# include <sstream>
-+#endif
- # include <memory>
- # include <cstring>
- # include <initializer_list>
-@@ -742,10 +745,6 @@ extern int vsnprintf (char *, size_t, const char *, va_list);
- # include <mutex>
- #endif
-
--#ifdef INCLUDE_SSTREAM
--# include <sstream>
--#endif
--
- #ifdef INCLUDE_MALLOC_H
- #if defined(HAVE_MALLINFO) || defined(HAVE_MALLINFO2)
- #include <malloc.h>
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc_13.4.bb
rename to meta/recipes-devtools/gcc/gcc_13.5.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/libgcc-initial_13.4.bb
rename to meta/recipes-devtools/gcc/libgcc-initial_13.5.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/libgcc_13.4.bb
rename to meta/recipes-devtools/gcc/libgcc_13.5.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/libgfortran_13.4.bb
rename to meta/recipes-devtools/gcc/libgfortran_13.5.bb