Revert "[libc++] Integrate the PSTL into libc++"
This reverts r366593, which caused unforeseen breakage on the build bots.
I'm reverting until the problems have been figured out and fixed.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@366603 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 78b2f37..1f32bb1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,7 +80,6 @@
option(LIBCXX_ENABLE_FILESYSTEM "Build filesystem as part of the main libc++ library"
${ENABLE_FILESYSTEM_DEFAULT})
option(LIBCXX_INCLUDE_TESTS "Build the libc++ tests." ${LLVM_INCLUDE_TESTS})
-option(LIBCXX_ENABLE_PARALLEL_ALGORITHMS "Enable the parallel algorithms library. This requires the PSTL to be available." OFF)
# Benchmark options -----------------------------------------------------------
option(LIBCXX_INCLUDE_BENCHMARKS "Build the libc++ benchmarks and their dependencies" ON)
@@ -746,7 +745,6 @@
config_define_if(LIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY _LIBCPP_HAS_THREAD_LIBRARY_EXTERNAL)
config_define_if(LIBCXX_HAS_MUSL_LIBC _LIBCPP_HAS_MUSL_LIBC)
config_define_if(LIBCXX_NO_VCRUNTIME _LIBCPP_NO_VCRUNTIME)
-config_define_if_not(LIBCXX_ENABLE_PARALLEL_ALGORITHMS _LIBCPP_HAS_NO_PARALLEL_ALGORITHMS)
if (LIBCXX_ABI_DEFINES)
set(abi_defines)
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index e12068a..7cbf82c 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -62,7 +62,6 @@
deque
errno.h
exception
- execution
experimental/__config
experimental/__memory
experimental/algorithm
diff --git a/include/__config_site.in b/include/__config_site.in
index 2bd3d8c..ffbd372 100644
--- a/include/__config_site.in
+++ b/include/__config_site.in
@@ -29,7 +29,6 @@
#cmakedefine _LIBCPP_NO_VCRUNTIME
#cmakedefine01 _LIBCPP_HAS_MERGED_TYPEINFO_NAMES_DEFAULT
#cmakedefine _LIBCPP_ABI_NAMESPACE @_LIBCPP_ABI_NAMESPACE@
-#cmakedefine _LIBCPP_HAS_NO_PARALLEL_ALGORITHMS
@_LIBCPP_ABI_DEFINES@
diff --git a/include/algorithm b/include/algorithm
index 9ff29d7..0d78626 100644
--- a/include/algorithm
+++ b/include/algorithm
@@ -5678,8 +5678,4 @@
_LIBCPP_POP_MACROS
-#if !defined(_LIBCPP_HAS_NO_PARALLEL_ALGORITHMS) && _LIBCPP_STD_VER >= 17
-# include <pstl/internal/glue_algorithm_impl.h>
-#endif
-
#endif // _LIBCPP_ALGORITHM
diff --git a/include/execution b/include/execution
deleted file mode 100644
index c1346db..0000000
--- a/include/execution
+++ /dev/null
@@ -1,19 +0,0 @@
-// -*- C++ -*-
-//===------------------------- execution ---------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_EXECUTION
-#define _LIBCPP_EXECUTION
-
-#include <__config>
-
-#if !defined(_LIBCPP_HAS_NO_PARALLEL_ALGORITHMS) && _LIBCPP_STD_VER >= 17
-# include <pstl/internal/glue_execution_defs.h>
-#endif
-
-#endif // _LIBCPP_EXECUTION
diff --git a/include/memory b/include/memory
index 744b864..d9222b3 100644
--- a/include/memory
+++ b/include/memory
@@ -5590,8 +5590,4 @@
_LIBCPP_POP_MACROS
-#if !defined(_LIBCPP_HAS_NO_PARALLEL_ALGORITHMS) && _LIBCPP_STD_VER >= 17
-# include <pstl/internal/glue_memory_impl.h>
-#endif
-
#endif // _LIBCPP_MEMORY
diff --git a/include/module.modulemap b/include/module.modulemap
index 31d39dd..bbfe90e 100644
--- a/include/module.modulemap
+++ b/include/module.modulemap
@@ -275,10 +275,6 @@
header "exception"
export *
}
- module execution {
- header "execution"
- export *
- }
module filesystem {
header "filesystem"
export *
diff --git a/include/numeric b/include/numeric
index a815e5c..2118704 100644
--- a/include/numeric
+++ b/include/numeric
@@ -586,8 +586,4 @@
_LIBCPP_POP_MACROS
-#if !defined(_LIBCPP_HAS_NO_PARALLEL_ALGORITHMS) && _LIBCPP_STD_VER >= 17
-# include <pstl/internal/glue_numeric_impl.h>
-#endif
-
#endif // _LIBCPP_NUMERIC
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e7d1106..31cd243 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -196,11 +196,6 @@
endif()
endfunction()
-find_package(ParallelSTL QUIET)
-if (LIBCXX_ENABLE_PARALLEL_ALGORITHMS AND NOT TARGET pstl::ParallelSTL)
- message(FATAL_ERROR "Could not find ParallelSTL")
-endif()
-
function(cxx_set_common_defines name)
if(LIBCXX_CXX_ABI_HEADER_TARGET)
add_dependencies(${name} ${LIBCXX_CXX_ABI_HEADER_TARGET})
@@ -227,10 +222,6 @@
# in printf, scanf.
_CRT_STDIO_ISO_WIDE_SPECIFIERS)
endif()
-
- if (LIBCXX_ENABLE_PARALLEL_ALGORITHMS)
- target_link_libraries(${name} PUBLIC pstl::ParallelSTL)
- endif()
endfunction()
split_list(LIBCXX_COMPILE_FLAGS)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 8a2114f..408ab62 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -40,7 +40,6 @@
pythonize_bool(LIBCXX_HAVE_CXX_ATOMICS_WITH_LIB)
pythonize_bool(LIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY)
pythonize_bool(LIBCXX_DEBUG_BUILD)
-pythonize_bool(LIBCXX_ENABLE_PARALLEL_ALGORITHMS)
# By default, for non-standalone builds, libcxx and libcxxabi share a library
# directory.
diff --git a/test/libcxx/double_include.sh.cpp b/test/libcxx/double_include.sh.cpp
index 5a1ee32..2ee444a 100644
--- a/test/libcxx/double_include.sh.cpp
+++ b/test/libcxx/double_include.sh.cpp
@@ -63,7 +63,6 @@
#include <deque>
#include <errno.h>
#include <exception>
-#include <execution>
#include <fenv.h>
#include <filesystem>
#include <float.h>
diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in
index b5b390d..ed9a711 100644
--- a/test/lit.site.cfg.in
+++ b/test/lit.site.cfg.in
@@ -33,7 +33,6 @@
config.debug_build = @LIBCXX_DEBUG_BUILD@
config.libcxxabi_shared = @LIBCXXABI_ENABLE_SHARED@
config.cxx_ext_threads = @LIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY@
-config.pstl_root = "@ParallelSTL_SOURCE_DIR@" if @LIBCXX_ENABLE_PARALLEL_ALGORITHMS@ else None
# Let the main config do the real work.
config.loaded_site_config = True
diff --git a/test/std/pstl b/test/std/pstl
deleted file mode 120000
index 27a2822..0000000
--- a/test/std/pstl
+++ /dev/null
@@ -1 +0,0 @@
-../../../pstl/test/std
\ No newline at end of file
diff --git a/utils/libcxx/test/config.py b/utils/libcxx/test/config.py
index e694ea1..e263e9d 100644
--- a/utils/libcxx/test/config.py
+++ b/utils/libcxx/test/config.py
@@ -580,13 +580,6 @@
support_path = os.path.join(self.libcxx_src_root, 'test/support')
self.cxx.compile_flags += ['-I' + support_path]
- # Add includes for the PSTL headers
- pstl_root = self.get_lit_conf('pstl_root')
- if pstl_root is not None:
- self.cxx.compile_flags += ['-I' + os.path.join(pstl_root, 'include')]
- self.cxx.compile_flags += ['-I' + os.path.join(pstl_root, 'test')]
- self.config.available_features.add('parallel-algorithms')
-
# FIXME(EricWF): variant_size.pass.cpp requires a slightly larger
# template depth with older Clang versions.
self.cxx.addFlagIfSupported('-ftemplate-depth=270')
