diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2018-08-29 17:51:01 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2018-08-29 17:51:01 +0000 |
| commit | e0095a7644863a8d37ebc2306549cb4e92ecd3aa (patch) | |
| tree | 83f399c6616b05976fe3f93c22581f6f39e58b25 | |
| parent | 8ad8b454b4916f3cbee9af77a1095ffbf2bc0896 (diff) | |
| download | src-test2-e0095a7644863a8d37ebc2306549cb4e92ecd3aa.tar.gz src-test2-e0095a7644863a8d37ebc2306549cb4e92ecd3aa.zip | |
Vendor import of libc++ release_70 branch r340910:vendor/libc++/libc++-release_70-r340910
Notes
Notes:
svn path=/vendor/libc++/dist-release_70/; revision=338384
svn path=/vendor/libc++/libc++-release_70-r340910/; revision=338385; tag=vendor/libc++/libc++-release_70-r340910
| -rw-r--r-- | include/__node_handle | 3 | ||||
| -rw-r--r-- | utils/libcxx/test/target_info.py | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/include/__node_handle b/include/__node_handle index fe09f3c1e51c..567f8b047a34 100644 --- a/include/__node_handle +++ b/include/__node_handle @@ -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> diff --git a/utils/libcxx/test/target_info.py b/utils/libcxx/test/target_info.py index 0e93e11448bf..de2232ff4188 100644 --- a/utils/libcxx/test/target_info.py +++ b/utils/libcxx/test/target_info.py @@ -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: |