[PATCH RFA] libstdc++: adjust std module TBB workaround
Jonathan Wakely
jwakely@redhat.com
Mon Nov 3 15:10:15 GMT 2025
On Sunday, 2 November 2025, Jason Merrill <jason@redhat.com> wrote:
> Tested x86_64-pc-linux-gnu, OK for trunk?
>
OK, thanks
>
> -- 8< --
>
> 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.
> ---
> libstdc++-v3/src/c++23/std.cc.in | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/libstdc++-v3/src/c++23/std.cc.in b/libstdc++-v3/src/c++23/
> std.cc.in
> index 28f0e8cb1fb..868601adbb3 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.
>
> base-commit: 2be505ace7e5e29a29ab53025762cf1a100a6d76
> --
> 2.51.0
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://gcc.gnu.org/pipermail/libstdc++/attachments/20251103/9e5e32cf/attachment.htm>
More information about the Libstdc++
mailing list