From: Jason Merrill <jason@redhat.com>
Date: Mon, 3 Nov 2025 15:55:06 +0000 (+0300)
Subject: libstdc++: adjust std module TBB workaround
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=237a83da197adf6d0a70d715812182df77fa5bf7;p=thirdparty%2Fgcc.git

libstdc++: adjust std module TBB workaround

Messing with macros before possibly importing the stdc++.h header unit is
bad form; better to mess with (other) macros afterward.

libstdc++-v3/ChangeLog:

	* src/c++23/std.cc.in: Move TBB macro shenanigans after
	bits/stdc++.h.
---

diff --git a/libstdc++-v3/src/c++23/std.cc.in b/libstdc++-v3/src/c++23/std.cc.in
index 11a8d4fb486..27d83f1ba1b 100644
--- a/libstdc++-v3/src/c++23/std.cc.in
+++ b/libstdc++-v3/src/c++23/std.cc.in
@@ -23,11 +23,14 @@
 
 module;
 
+#include <bits/stdc++.h>
+
 // stdc++.h doesn't include <execution> because of TBB issues;
 // FIXME for now let's avoid the problem by suppressing TBB.
-#define _GLIBCXX_USE_TBB_PAR_BACKEND 0
-
-#include <bits/stdc++.h>
+#ifdef _PSTL_PAR_BACKEND_TBB
+#undef _PSTL_PAR_BACKEND_TBB
+#define _PSTL_PAR_BACKEND_SERIAL
+#endif
 #include <execution>
 
 // Module std does include deprecated library interfaces.