[libcxx-commits] [libcxx] a19fd1a - Revert "[libcxx] Fix compile for BUILD_EXTERNAL_THREAD_LIBRARY"

[Mikhail Maltsev via libcxx-commits]

Author: Mikhail Maltsev
Date: 2020-08-27T16:48:10+01:00
New Revision: a19fd1aab519ccec18654f76a01b0345880c5200

URL: https://github.com/llvm/llvm-project/commit/a19fd1aab519ccec18654f76a01b0345880c5200
DIFF: https://github.com/llvm/llvm-project/commit/a19fd1aab519ccec18654f76a01b0345880c5200.diff

LOG: Revert "[libcxx] Fix compile for BUILD_EXTERNAL_THREAD_LIBRARY"

This reverts commit 3b71f91558ff8b569199547efe800cb501c3cf94.

The commit is breaking some build bots.

Added: 
    

Modified: 
    libcxx/include/__threading_support
    libcxx/src/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/libcxx/include/__threading_support b/libcxx/include/__threading_support
index f8add051f2ab..072c4c7bcc89 100644
--- a/libcxx/include/__threading_support
+++ b/libcxx/include/__threading_support
@@ -282,7 +282,7 @@ struct __libcpp_timed_backoff_policy {
   bool operator()(chrono::nanoseconds __elapsed) const;
 };
 
-inline _LIBCPP_THREAD_ABI_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY
 bool __libcpp_timed_backoff_policy::operator()(chrono::nanoseconds __elapsed) const
 {
     if(__elapsed > chrono::milliseconds(128))

diff  --git a/libcxx/src/CMakeLists.txt b/libcxx/src/CMakeLists.txt
index dcd53c8a302a..2001c09761d9 100644
--- a/libcxx/src/CMakeLists.txt
+++ b/libcxx/src/CMakeLists.txt
@@ -323,8 +323,7 @@ endif()
 
 
 if (LIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY)
-  set(LIBCXX_EXTERNAL_THREADING_SUPPORT_SOURCES
-      "${CMAKE_CURRENT_SOURCE_DIR}/../test/support/external_threads.cpp")
+  file(GLOB LIBCXX_EXTERNAL_THREADING_SUPPORT_SOURCES ../test/support/external_threads.cpp)
 
   if (LIBCXX_ENABLE_SHARED)
     add_library(cxx_external_threads SHARED ${LIBCXX_EXTERNAL_THREADING_SUPPORT_SOURCES})
@@ -338,8 +337,6 @@ if (LIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY)
       COMPILE_FLAGS "${LIBCXX_COMPILE_FLAGS}"
       OUTPUT_NAME   "c++external_threads"
   )
-
-  target_link_libraries(cxx_external_threads PRIVATE cxx-headers)
 endif()
 
 if (LIBCXX_INSTALL_LIBRARY)