svn commit: r338384 - in vendor/libc++/dist-release_70: include utils/libcxx/test

[Dimitry Andric]

Author: dim
Date: Wed Aug 29 17:51:01 2018
New Revision: 338384
URL: https://svnweb.freebsd.org/changeset/base/338384

Log:
  Vendor import of libc++ release_70 branch r340910:
  https://llvm.org/svn/llvm-project/libcxx/branches/release_70@340910

Modified:
  vendor/libc++/dist-release_70/include/__node_handle
  vendor/libc++/dist-release_70/utils/libcxx/test/target_info.py

Modified: vendor/libc++/dist-release_70/include/__node_handle
==============================================================================
--- vendor/libc++/dist-release_70/include/__node_handle	Wed Aug 29 17:50:58 2018	(r338383)
+++ vendor/libc++/dist-release_70/include/__node_handle	Wed Aug 29 17:51:01 2018	(r338384)
@@ -26,7 +26,8 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 
 #if _LIBCPP_STD_VER > 14
 
-#define __cpp_lib_node_extract 201606L
+// FIXME: Uncomment this when we support the 'merge' functionality.
+// #define __cpp_lib_node_extract 201606L
 
 // Specialized in __tree & __hash_table for their _NodeType.
 template <class _NodeType, class _Alloc>

Modified: vendor/libc++/dist-release_70/utils/libcxx/test/target_info.py
==============================================================================
--- vendor/libc++/dist-release_70/utils/libcxx/test/target_info.py	Wed Aug 29 17:50:58 2018	(r338383)
+++ vendor/libc++/dist-release_70/utils/libcxx/test/target_info.py	Wed Aug 29 17:51:01 2018	(r338384)
@@ -222,12 +222,17 @@ class LinuxLocalTI(DefaultTargetInfo):
                           self.full_config.config.available_features)
         llvm_unwinder = self.full_config.get_lit_bool('llvm_unwinder', False)
         shared_libcxx = self.full_config.get_lit_bool('enable_shared', True)
+        # FIXME: Remove the need to link -lrt in all the tests, and instead
+        # limit it only to the filesystem tests. This ensures we don't cause an
+        # implicit dependency on librt except when filesystem is needed.
+        enable_fs = self.full_config.get_lit_bool('enable_filesystem',
+                                                  default=False)
         flags += ['-lm']
         if not llvm_unwinder:
             flags += ['-lgcc_s', '-lgcc']
         if enable_threads:
             flags += ['-lpthread']
-            if not shared_libcxx:
+            if not shared_libcxx or enable_fs:
               flags += ['-lrt']
         flags += ['-lc']
         if llvm_unwinder: