From owner-svn-src-vendor@freebsd.org Wed Aug 29 17:51:07 2018 Return-Path: Delivered-To: svn-src-vendor@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A66461090C36; Wed, 29 Aug 2018 17:51:07 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4046577020; Wed, 29 Aug 2018 17:51:02 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BE1022068D; Wed, 29 Aug 2018 17:51:02 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7THp2PQ023437; Wed, 29 Aug 2018 17:51:02 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7THp2kU023435; Wed, 29 Aug 2018 17:51:02 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201808291751.w7THp2kU023435@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Wed, 29 Aug 2018 17:51:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r338384 - in vendor/libc++/dist-release_70: include utils/libcxx/test X-SVN-Group: vendor X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in vendor/libc++/dist-release_70: include utils/libcxx/test X-SVN-Commit-Revision: 338384 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Aug 2018 17:51:08 -0000 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 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: