[Buildroot] [PATCH 1/2] package/gcc: bump to version 12.3

* [Buildroot] [PATCH 1/2] package/gcc: bump to version 12.3
@ 2023-05-30 19:27 Romain Naour
  2023-05-30 19:27 ` [Buildroot] [PATCH 2/2] package/gcc: bump to version 11.4 Romain Naour
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Romain Naour @ 2023-05-30 19:27 UTC (permalink / raw)
  To: buildroot; +Cc: Romain Naour

Remove upstream patch.

See announce:
https://gcc.gnu.org/pipermail/gcc-announce/2023/000176.html

Runtime tested:
https://gitlab.com/kubu93/buildroot/-/pipelines/882178578

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 .checkpackageignore                           |  3 +-
 package/gcc/12.2.0/0002-fix-condvar.patch     | 82 -------------------
 ...le-split-stack-for-non-thread-builds.patch |  0
 package/gcc/Config.in.host                    |  2 +-
 package/gcc/gcc.hash                          |  4 +-
 5 files changed, 4 insertions(+), 87 deletions(-)
 delete mode 100644 package/gcc/12.2.0/0002-fix-condvar.patch
 rename package/gcc/{12.2.0 => 12.3.0}/0001-disable-split-stack-for-non-thread-builds.patch (100%)

diff --git a/.checkpackageignore b/.checkpackageignore
index f2dea0dfd9..a8338883d0 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -524,8 +524,7 @@ package/gcc/11.3.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.pat
 package/gcc/11.3.0/0004-disable-split-stack-for-non-thread-builds.patch Upstream
 package/gcc/11.3.0/0005-rs6000-Improve-.machine.patch Upstream
 package/gcc/11.3.0/0006-rs6000-Do-not-use-rs6000_cpu-for-.machine-ppc-and-pp.patch Upstream
-package/gcc/12.2.0/0001-disable-split-stack-for-non-thread-builds.patch Upstream
-package/gcc/12.2.0/0002-fix-condvar.patch Upstream
+package/gcc/12.3.0/0001-disable-split-stack-for-non-thread-builds.patch Upstream
 package/gcc/8.4.0/0001-xtensa-fix-PR-target-91880.patch Upstream
 package/gcc/8.4.0/0002-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch Upstream
 package/gcc/8.4.0/0003-libsanitizer-Remove-cyclades-from-libsanitizer.patch Upstream
diff --git a/package/gcc/12.2.0/0002-fix-condvar.patch b/package/gcc/12.2.0/0002-fix-condvar.patch
deleted file mode 100644
index 5044942e9f..0000000000
--- a/package/gcc/12.2.0/0002-fix-condvar.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From ee4af2ed0b7322884ec4ff537564683c3749b813 Mon Sep 17 00:00:00 2001
-From: Jonathan Wakely <jwakely@redhat.com>
-Date: Thu, 22 Dec 2022 09:56:47 +0000
-Subject: [PATCH] libstdc++: Avoid recursion in __nothrow_wait_cv::wait
- [PR105730]
-
-The commit r12-5877-g9e18a25331fa25 removed the incorrect
-noexcept-specifier from std::condition_variable::wait and gave the new
-symbol version @@GLIBCXX_3.4.30. It also redefined the original symbol
-std::condition_variable::wait(unique_lock<mutex>&)@GLIBCXX_3.4.11 as an
-alias for a new symbol, __gnu_cxx::__nothrow_wait_cv::wait, which still
-has the incorrect noexcept guarantee. That __nothrow_wait_cv::wait is
-just a wrapper around the real condition_variable::wait which adds
-noexcept and so terminates on a __forced_unwind exception.
-
-This doesn't work on uclibc, possibly due to a dynamic linker bug. When
-__nothrow_wait_cv::wait calls the condition_variable::wait function it
-binds to the alias symbol, which means it just calls itself recursively
-until the stack overflows.
-
-This change avoids the possibility of a recursive call by changing the
-__nothrow_wait_cv::wait function so that instead of calling
-condition_variable::wait it re-implements it. This requires accessing
-the private _M_cond member of condition_variable, so we need to use the
-trick of instantiating a template with the member-pointer of the private
-member.
-
-libstdc++-v3/ChangeLog:
-
-	PR libstdc++/105730
-	* src/c++11/compatibility-condvar.cc (__nothrow_wait_cv::wait):
-	Access private data member of base class and call its wait
-	member.
-
-Signed-off-by: Gleb Mazovetskiy <glex.spb@gmail.com>
----
- .../src/c++11/compatibility-condvar.cc        | 22 ++++++++++++++++++-
- 1 file changed, 21 insertions(+), 1 deletion(-)
-
-diff --git a/libstdc++-v3/src/c++11/compatibility-condvar.cc b/libstdc++-v3/src/c++11/compatibility-condvar.cc
-index e3a8b8403ca..3cef3bc0714 100644
---- a/libstdc++-v3/src/c++11/compatibility-condvar.cc
-+++ b/libstdc++-v3/src/c++11/compatibility-condvar.cc
-@@ -67,6 +67,24 @@ _GLIBCXX_END_NAMESPACE_VERSION
-     && defined(_GLIBCXX_HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT)
- namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
- {
-+namespace
-+{
-+  // Pointer-to-member for private std::condition_variable::_M_cond member.
-+  std::__condvar std::condition_variable::* __base_member;
-+
-+  template<std::__condvar std::condition_variable::*X>
-+    struct cracker
-+    { static std::__condvar std::condition_variable::* value; };
-+
-+  // Initializer for this static member also initializes __base_member.
-+  template<std::__condvar std::condition_variable::*X>
-+    std::__condvar std::condition_variable::*
-+      cracker<X>::value = __base_member = X;
-+
-+  // Explicit instantiation is allowed to access the private member.
-+  template class cracker<&std::condition_variable::_M_cond>;
-+}
-+
- struct __nothrow_wait_cv : std::condition_variable
- {
-   void wait(std::unique_lock<std::mutex>&) noexcept;
-@@ -76,7 +94,9 @@ __attribute__((used))
- void
- __nothrow_wait_cv::wait(std::unique_lock<std::mutex>& lock) noexcept
- {
--  this->condition_variable::wait(lock);
-+  // In theory this could be simply this->std::condition_variable::wait(lock)
-+  // but with uclibc that binds to the @GLIBCXX_3.4.11 symbol, see PR 105730.
-+  (this->*__base_member).wait(*lock.mutex());
- }
- } // namespace __gnu_cxx
- 
--- 
-2.31.1
-
diff --git a/package/gcc/12.2.0/0001-disable-split-stack-for-non-thread-builds.patch b/package/gcc/12.3.0/0001-disable-split-stack-for-non-thread-builds.patch
similarity index 100%
rename from package/gcc/12.2.0/0001-disable-split-stack-for-non-thread-builds.patch
rename to package/gcc/12.3.0/0001-disable-split-stack-for-non-thread-builds.patch
diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index 400d8eb07b..f099ccb11b 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -88,7 +88,7 @@ config BR2_GCC_VERSION
 	default "8.4.0"     if BR2_GCC_VERSION_POWERPC_SPE
 	default "10.4.0"    if BR2_GCC_VERSION_10_X
 	default "11.3.0"    if BR2_GCC_VERSION_11_X
-	default "12.2.0"    if BR2_GCC_VERSION_12_X
+	default "12.3.0"    if BR2_GCC_VERSION_12_X
 	default "arc-2020.09-release" if BR2_GCC_VERSION_ARC
 
 config BR2_EXTRA_GCC_CONFIG_OPTIONS
diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash
index 666124fa6d..9082d25b78 100644
--- a/package/gcc/gcc.hash
+++ b/package/gcc/gcc.hash
@@ -4,8 +4,8 @@ sha512  6de904f552a02de33b11ef52312bb664396efd7e1ce3bbe37bfad5ef617f133095b3767b
 sha512  440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648  gcc-10.4.0.tar.xz
 # From https://gcc.gnu.org/pub/gcc/releases/gcc-11.3.0/sha512.sum
 sha512  f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7  gcc-11.3.0.tar.xz
-# From https://gcc.gnu.org/pub/gcc/releases/gcc-12.2.0/sha512.sum
-sha512  e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173  gcc-12.2.0.tar.xz
+# From https://gcc.gnu.org/pub/gcc/releases/gcc-12.3.0/sha512.sum
+sha512  8fb799dfa2e5de5284edf8f821e3d40c2781e4c570f5adfdb1ca0671fcae3fb7f794ea783e80f01ec7bfbf912ca508e478bd749b2755c2c14e4055648146c204  gcc-12.3.0.tar.xz
 
 # Locally calculated (fetched from Github)
 sha512  b0853e2b1c5998044392023fa653e399e74118c46e616504ac59e1a2cf27620f94434767ce06b6cf4ca3dfb57f81d6eda92752befaf095ea5e564a9181b4659c  gcc-arc-2020.09-release.tar.gz
-- 
2.34.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 6+ messages in thread