From: Jason Merrill <jason@redhat.com>
Date: Tue, 27 Aug 2024 17:15:38 +0000 (-0400)
Subject: libstdc++: avoid __GLIBCXX__ redefinition
X-Git-Tag: basepoints/gcc-16~6042
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c0da27f37df2fcfd59c6cd234793ed24705f1997;p=thirdparty%2Fgcc.git

libstdc++: avoid __GLIBCXX__ redefinition

testsuite/lib/dg-options.exp defines __GLIBCXX__ to 9999999; avoid a macro
redefinition warning in that case.

libstdc++-v3/ChangeLog:

	* include/bits/c++config: Avoid redefining __GLIBCXX__.
---

diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config
index 0f0cc7cd659..54d455be226 100644
--- a/libstdc++-v3/include/bits/c++config
+++ b/libstdc++-v3/include/bits/c++config
@@ -36,6 +36,7 @@
 #define _GLIBCXX_RELEASE
 
 // The datestamp of the C++ library in compressed ISO date format.
+#undef __GLIBCXX__ /* The testsuite defines it to 99999999 to block PCH.  */
 #define __GLIBCXX__
 
 // Macros for various attributes.