From patchwork Wed Sep 23 09:10:31 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoann Congal X-Patchwork-Id: 98985 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A33FC982FA for ; Wed, 23 Sep 2026 09:11:55 +0000 (UTC) Received: from mail-wm2-f13.google.com (mail-wm2-f13.google.com [74.125.225.141]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.2827.1790154713677520175 for ; Wed, 23 Sep 2026 02:11:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile.fr header.s=google header.b=wcSIlMiZ; spf=pass (domain: smile.fr, ip: 74.125.225.141, mailfrom: yoann.congal@smile.fr) Received: by mail-wm2-f13.google.com with SMTP id 5b1f17b1804b1-49cd38e0e5dso8678905e9.2 for ; Wed, 23 Sep 2026 02:11:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile.fr; s=google; t=1790154712; x=1790759512; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to:content-type; bh=i0ULtBs/MD2J1N2HwL1nZ1fJS1ujkPA5We07sdW/E90=; b=wcSIlMiZHxTa1R/b0dloI8QnXEPEuel85YNFtGReHsN2J8u+CAKsgPtdOKJjGZnGmB NGbD7NZ0QnGo0FA4eWRijv+9vDLLAoJ/x4Sd/xLtyC/vZ65eeu4F5DJugmcpa4Zf6v/V 6vvCeXkxshBxbBZ/uKVyjQQmsehc/aLjjnovQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790154712; x=1790759512; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to:content-type; bh=i0ULtBs/MD2J1N2HwL1nZ1fJS1ujkPA5We07sdW/E90=; b=IxWZ8JAY5PiRpJhjggU0GUw8pYf/mS3ls57WCbHeQHJtOo1uNiDobl5tyUA6wGt1sj h3+VLoysfLs4vqkyEBhjAm3Uh0+VssN98OzHVvSsSlt6IRQ+ZXC1BxHm3DVkvavjGKHo 01RMLy33vc8ZWHyXIc8fK3w1uzfVkiU+QELl7Cf0dc4nH0fzWi0KwiUXSFxOygHzmtaa 5XdQeW4Gvd5cyRNLgZxUXLHuVhNw4hcY2Nbq9P4EJLnHtKY5q6XIy6MDJtssZszOvUWR CwpZTFbbYHJzcMCtj22Zgy+rzROh2lG8pf8Zzno3M9fLr655zIJvjEPJcW1WPtODpYex ZTwg== X-Gm-Message-State: AFuF++mSdja+C2E0eaxlURL6BFtUrJS91UpdnflWohU7qW0Jb7avEOqk UsPLK+q7629PvxKY/9ZIaF/wSoadOD7H9vgg+lKj889vEnDX7ik8vLDo++r09Ehkn7oXOkwsr/F v5FFACIM= X-Gm-Gg: AYBFou3BLGFQdDQeXVmZv2f92/degFIKLRilAMoQbY+a+klOr/8UXf0lVouzE6FuCF6 PgZ1+P+SF/9x4S7HRsqOb6JwdIRoPtg5DE7ZveClPaLFCBqxjF2NA7GtQsApETQh2Hc6cIReUUq RQDo4uBICXuBjx7784zl7+k5amiPfbrwlt91ks4XXeowbAtyz90mZMSVnAovMghBWjc9WRtjA+u BOJXAo4HKK4XfrMoc0HqzQazYKXPJmtODJFaAz9h/9B1z2QUboUSll6bA7vI2cGulqc20NHONn1 fFMT/XkMgqymWAR8cTPXWJRApwhM2kaJWS9SXvk7gGi4xH9bb4A8pkmP935uJdzonCg2NCw2mdp VyUoQVEyuQK80LyIqUn8O4ZeJ2ARTzRY4MUWKdBJa2BQNkvDh2wodNW6FcNH8e2egm44vmTNzpY +l8/sR64AqdUH5pS3478E3RZ725dPKkVYnpNnqgNfJTyFSWk1IZfekQtGCmY1YUTVc1vN7D6rW0 ukbxBFan6+X0G5fh+2NcZgPc+lyeso0ylPGa5aj4Ji0J5TQyhpDhHiE2iOCPjsmDv/wbihgf9Pm clLXO28= X-Received: by 2002:a05:600c:8b21:b0:49c:f512:2361 with SMTP id 5b1f17b1804b1-49fdf1087edmr24776495e9.14.1790154711650; Wed, 23 Sep 2026 02:11:51 -0700 (PDT) Received: from FRSMI25-LASER.home (2a02-8440-b519-f416-8bed-8817-19fd-ccf7.rev.sfr.net. [2a02:8440:b519:f416:8bed:8817:19fd:ccf7]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fe2730da9sm14251525e9.4.2026.09.23.02.11.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2026 02:11:51 -0700 (PDT) From: Yoann Congal To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 29/48] gcc: Upgrade to GCC 13.5 Date: Wed, 23 Sep 2026 11:10:31 +0200 Message-ID: <1260b53b4ab29913e429fe403240356a7cd9aeec.1790154074.git.yoann.congal@smile.fr> X-Mailer: git-send-email 2.47.3 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 23 Sep 2026 09:11:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/246491 From: Hemanth Kumar M D This is a bugfix release in GCC-13 release series with 266 bugfixes https://gcc.gnu.org/bugzilla/buglist.cgi?bug_status=RESOLVED&resolution=FIXED&target_milestone=13.5 Docs: https://gcc.gnu.org/onlinedocs/13.5.0/ Dropped the following patches: 0028-libcody-Make-it-buildable-by-C-11-to-C-26.patch https://github.com/gcc-mirror/gcc/commit/51b9a0f7dfd2441a30e0ebfd4b30f18f86b4ea54 0029-build-Remove-INCLUDE_MEMORY-PR117737.patch https://github.com/gcc-mirror/gcc/commit/9239757a9c6e3a6e8d94d56803329d556ec914d7 0030-build-Move-sstream-include-above-safe-ctype.h-PR1177.patch https://github.com/gcc-mirror/gcc/commit/9239757a9c6e3a6e8d94d56803329d556ec914d7 GCC 13.4 GCC 13.5 Diff No. of expected passes 179388 179928 +540 No. of unexpected failures 26 27 +1 No. of expected failures 1416 1416 0 No. of unsupported tests 2230 2241 +11 Signed-off-by: Hemanth Kumar M D Signed-off-by: Yoann Congal --- meta/conf/distro/include/maintainers.inc | 2 +- .../gcc/{gcc-13.4.inc => gcc-13.5.inc} | 9 +- ...ian_13.4.bb => gcc-cross-canadian_13.5.bb} | 0 .../{gcc-cross_13.4.bb => gcc-cross_13.5.bb} | 0 ...-crosssdk_13.4.bb => gcc-crosssdk_13.5.bb} | 0 ...cc-runtime_13.4.bb => gcc-runtime_13.5.bb} | 0 ...itizers_13.4.bb => gcc-sanitizers_13.5.bb} | 0 ...{gcc-source_13.4.bb => gcc-source_13.5.bb} | 0 ...dy-Make-it-buildable-by-C-11-to-C-26.patch | 257 ------------------ ...build-Remove-INCLUDE_MEMORY-PR117737.patch | 46 ---- ...am-include-above-safe-ctype.h-PR1177.patch | 54 ---- .../gcc/{gcc_13.4.bb => gcc_13.5.bb} | 0 ...initial_13.4.bb => libgcc-initial_13.5.bb} | 0 .../gcc/{libgcc_13.4.bb => libgcc_13.5.bb} | 0 ...ibgfortran_13.4.bb => libgfortran_13.5.bb} | 0 15 files changed, 4 insertions(+), 364 deletions(-) rename meta/recipes-devtools/gcc/{gcc-13.4.inc => gcc-13.5.inc} (93%) rename meta/recipes-devtools/gcc/{gcc-cross-canadian_13.4.bb => gcc-cross-canadian_13.5.bb} (100%) rename meta/recipes-devtools/gcc/{gcc-cross_13.4.bb => gcc-cross_13.5.bb} (100%) rename meta/recipes-devtools/gcc/{gcc-crosssdk_13.4.bb => gcc-crosssdk_13.5.bb} (100%) rename meta/recipes-devtools/gcc/{gcc-runtime_13.4.bb => gcc-runtime_13.5.bb} (100%) rename meta/recipes-devtools/gcc/{gcc-sanitizers_13.4.bb => gcc-sanitizers_13.5.bb} (100%) rename meta/recipes-devtools/gcc/{gcc-source_13.4.bb => gcc-source_13.5.bb} (100%) delete mode 100644 meta/recipes-devtools/gcc/gcc/0028-libcody-Make-it-buildable-by-C-11-to-C-26.patch delete mode 100644 meta/recipes-devtools/gcc/gcc/0029-build-Remove-INCLUDE_MEMORY-PR117737.patch delete mode 100644 meta/recipes-devtools/gcc/gcc/0030-build-Move-sstream-include-above-safe-ctype.h-PR1177.patch rename meta/recipes-devtools/gcc/{gcc_13.4.bb => gcc_13.5.bb} (100%) rename meta/recipes-devtools/gcc/{libgcc-initial_13.4.bb => libgcc-initial_13.5.bb} (100%) rename meta/recipes-devtools/gcc/{libgcc_13.4.bb => libgcc_13.5.bb} (100%) rename meta/recipes-devtools/gcc/{libgfortran_13.4.bb => libgfortran_13.5.bb} (100%) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 3a51ad2139c..a9b7be3bf75 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -190,7 +190,7 @@ RECIPE_MAINTAINER:pn-gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Khem Raj -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 - - * 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 -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 &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 &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 &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 &words) - // OK or ERROR - Packet OKResponse (std::vector &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 &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 -+constexpr char S2C (char8_t const (&s)[I]) -+{ -+ static_assert (I == 2, "only single octet strings may be converted"); -+ return s[0]; -+} -+#else - template - 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 &&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; diff --git a/meta/recipes-devtools/gcc/gcc/0029-build-Remove-INCLUDE_MEMORY-PR117737.patch b/meta/recipes-devtools/gcc/gcc/0029-build-Remove-INCLUDE_MEMORY-PR117737.patch deleted file mode 100644 index d784edefd76..00000000000 --- a/meta/recipes-devtools/gcc/gcc/0029-build-Remove-INCLUDE_MEMORY-PR117737.patch +++ /dev/null @@ -1,46 +0,0 @@ -From b3f1b9e2aa079f8ec73e3cb48143a16645c49566 Mon Sep 17 00:00:00 2001 -From: Andrew Pinski -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 -Signed-off-by: Martin Jansa -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 - #endif -+# include - # include - # include - # include -@@ -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 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 --#endif - - #ifdef INCLUDE_MUTEX - # include diff --git a/meta/recipes-devtools/gcc/gcc/0030-build-Move-sstream-include-above-safe-ctype.h-PR1177.patch b/meta/recipes-devtools/gcc/gcc/0030-build-Move-sstream-include-above-safe-ctype.h-PR1177.patch deleted file mode 100644 index 270c91c345b..00000000000 --- a/meta/recipes-devtools/gcc/gcc/0030-build-Move-sstream-include-above-safe-ctype.h-PR1177.patch +++ /dev/null @@ -1,54 +0,0 @@ -From ac90b5c413c1565fb37cf79b92f6859b3852254a Mon Sep 17 00:00:00 2001 -From: Andrew Pinski -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 -Signed-off-by: Martin Jansa -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 - #endif -+#ifdef INCLUDE_SSTREAM -+# include -+#endif - # include - # include - # include -@@ -742,10 +745,6 @@ extern int vsnprintf (char *, size_t, const char *, va_list); - # include - #endif - --#ifdef INCLUDE_SSTREAM --# include --#endif -- - #ifdef INCLUDE_MALLOC_H - #if defined(HAVE_MALLINFO) || defined(HAVE_MALLINFO2) - #include diff --git a/meta/recipes-devtools/gcc/gcc_13.4.bb b/meta/recipes-devtools/gcc/gcc_13.5.bb similarity index 100% rename from meta/recipes-devtools/gcc/gcc_13.4.bb rename to meta/recipes-devtools/gcc/gcc_13.5.bb diff --git a/meta/recipes-devtools/gcc/libgcc-initial_13.4.bb b/meta/recipes-devtools/gcc/libgcc-initial_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 diff --git a/meta/recipes-devtools/gcc/libgcc_13.4.bb b/meta/recipes-devtools/gcc/libgcc_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 diff --git a/meta/recipes-devtools/gcc/libgfortran_13.4.bb b/meta/recipes-devtools/gcc/libgfortran_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