commit b3762e1f5f299f543aafac62c8d1a0b8e5976d22
author Arthur Eubanks <aeubanks@google.com> Wed Apr 17 19:11:58 2024 +0000
committer Copybara-Service <copybara-worker@google.com> Wed Apr 17 12:21:33 2024 -0700
tree 11bac6134562982a9553e0b79aa84efe7423cf83
parent 1d2d1a30c40833bc8559236eba03505cf9cc11ef

[gn build] Manually port d423d80e560d

GitOrigin-RevId: 1460b4964c7ada2f7536006722c8585b5bd0a1b5

utils/gn/secondary/libcxx/include/BUILD.gn

diff --git a/utils/gn/secondary/libcxx/include/BUILD.gn b/utils/gn/secondary/libcxx/include/BUILD.gn
index ee44558..bd08ce0 100644
--- a/utils/gn/secondary/libcxx/include/BUILD.gn
+++ b/utils/gn/secondary/libcxx/include/BUILD.gn
@@ -37,9 +37,9 @@
       "_LIBCPP_INSTRUMENTED_WITH_ASAN=",
       "_LIBCPP_ABI_DEFINES=",
       "_LIBCPP_HARDENING_MODE_DEFAULT=_LIBCPP_HARDENING_MODE_NONE",
-      "_LIBCPP_PSTL_CPU_BACKEND_LIBDISPATCH=",
-      "_LIBCPP_PSTL_CPU_BACKEND_SERIAL=1",
-      "_LIBCPP_PSTL_CPU_BACKEND_THREAD=",
+      "_LIBCPP_PSTL_BACKEND_LIBDISPATCH=",
+      "_LIBCPP_PSTL_BACKEND_SERIAL=1",
+      "_LIBCPP_PSTL_BACKEND_STD_THREAD=",
     ]
     if (libcxx_abi_version != 1) {
       values += [ "_LIBCPP_ABI_VERSION=$libcxx_abi_version" ]
@@ -143,18 +143,12 @@
       "__algorithm/pop_heap.h",
       "__algorithm/prev_permutation.h",
       "__algorithm/pstl_any_all_none_of.h",
-      "__algorithm/pstl_backend.h",
-      "__algorithm/pstl_backends/cpu_backend.h",
       "__algorithm/pstl_backends/cpu_backends/any_of.h",
-      "__algorithm/pstl_backends/cpu_backends/backend.h",
       "__algorithm/pstl_backends/cpu_backends/fill.h",
       "__algorithm/pstl_backends/cpu_backends/find_if.h",
       "__algorithm/pstl_backends/cpu_backends/for_each.h",
-      "__algorithm/pstl_backends/cpu_backends/libdispatch.h",
       "__algorithm/pstl_backends/cpu_backends/merge.h",
-      "__algorithm/pstl_backends/cpu_backends/serial.h",
       "__algorithm/pstl_backends/cpu_backends/stable_sort.h",
-      "__algorithm/pstl_backends/cpu_backends/thread.h",
       "__algorithm/pstl_backends/cpu_backends/transform.h",
       "__algorithm/pstl_backends/cpu_backends/transform_reduce.h",
       "__algorithm/pstl_copy.h",
@@ -664,6 +658,11 @@
       "__numeric/transform_exclusive_scan.h",
       "__numeric/transform_inclusive_scan.h",
       "__numeric/transform_reduce.h",
+      "__pstl/backends/libdispatch.h",
+      "__pstl/backends/serial.h",
+      "__pstl/backends/std_thread.h",
+      "__pstl/configuration.h",
+      "__pstl/configuration_fwd.h",
       "__pstl/cpu_algos/cpu_traits.h",
       "__random/bernoulli_distribution.h",
       "__random/binomial_distribution.h",