|
 |
cbe2c5 |
From efd5bc0715e5477318be95a76811cda0a89e8289 Mon Sep 17 00:00:00 2001
|
|
|
cbe2c5 |
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
|
|
|
cbe2c5 |
Date: Fri, 4 Mar 2022 12:00:26 +0100
|
|
|
cbe2c5 |
Subject: [PATCH] GLIBCXX fix for GCC 12?
|
|
|
cbe2c5 |
|
|
|
cbe2c5 |
---
|
|
|
cbe2c5 |
build/unix/stdc++compat/stdc++compat.cpp | 14 ++++++++++++++
|
|
|
cbe2c5 |
1 file changed, 14 insertions(+)
|
|
|
cbe2c5 |
|
|
|
cbe2c5 |
diff --git a/build/unix/stdc++compat/stdc++compat.cpp b/build/unix/stdc++compat/stdc++compat.cpp
|
|
|
cbe2c5 |
index 0180f6bcfa998..8d7a542ff11f0 100644
|
|
|
cbe2c5 |
--- a/build/unix/stdc++compat/stdc++compat.cpp
|
|
|
cbe2c5 |
+++ b/build/unix/stdc++compat/stdc++compat.cpp
|
|
|
cbe2c5 |
@@ -24,6 +24,7 @@
|
|
|
cbe2c5 |
GLIBCXX_3.4.27 is from gcc 10
|
|
|
cbe2c5 |
GLIBCXX_3.4.28 is from gcc 10
|
|
|
cbe2c5 |
GLIBCXX_3.4.29 is from gcc 11
|
|
|
cbe2c5 |
+ GLIBCXX_3.4.30 is from gcc 12
|
|
|
cbe2c5 |
|
|
|
cbe2c5 |
This file adds the necessary compatibility tricks to avoid symbols with
|
|
|
cbe2c5 |
version GLIBCXX_3.4.20 and bigger, keeping binary compatibility with
|
|
|
cbe2c5 |
@@ -69,6 +70,19 @@ void __attribute__((weak)) __throw_bad_array_new_length() { MOZ_CRASH(); }
|
|
|
cbe2c5 |
} // namespace std
|
|
|
cbe2c5 |
#endif
|
|
|
cbe2c5 |
|
|
|
cbe2c5 |
+#if _GLIBCXX_RELEASE >= 12
|
|
|
cbe2c5 |
+namespace std {
|
|
|
cbe2c5 |
+
|
|
|
cbe2c5 |
+/* This avoids the GLIBCXX_3.4.30 symbol version. */
|
|
|
cbe2c5 |
+void __attribute__((weak))
|
|
|
cbe2c5 |
+__glibcxx_assert_fail(const char* __file, int __line, const char* __function,
|
|
|
cbe2c5 |
+ const char* __condition) {
|
|
|
cbe2c5 |
+ MOZ_CRASH();
|
|
|
cbe2c5 |
+}
|
|
|
cbe2c5 |
+
|
|
|
cbe2c5 |
+} // namespace std
|
|
|
cbe2c5 |
+#endif
|
|
|
cbe2c5 |
+
|
|
|
cbe2c5 |
/* While we generally don't build with exceptions, we have some host tools
|
|
|
cbe2c5 |
* that do use them. libstdc++ from GCC 5.0 added exception constructors with
|
|
|
cbe2c5 |
* char const* argument. Older versions only have a constructor with
|
|
|
cbe2c5 |
--
|
|
|
cbe2c5 |
2.35.1
|
|
|
cbe2c5 |
|