From nobody Sat Dec 25 11:55:29 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3BAE018F2D30; Sat, 25 Dec 2021 11:55:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JLj6p3X4Dz4kwg; Sat, 25 Dec 2021 11:55:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 16C6016E84; Sat, 25 Dec 2021 11:55:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BPBtTsC006351; Sat, 25 Dec 2021 11:55:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BPBtTRi006350; Sat, 25 Dec 2021 11:55:29 GMT (envelope-from git) Date: Sat, 25 Dec 2021 11:55:29 GMT Message-Id: <202112251155.1BPBtTRi006350@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 8a74220dbb02 - stable/12 - Apply upstream libc++ fix to allow building with devel/xxx-xtoolchain-gcc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 8a74220dbb02930328b37ba1c5ebcf7280304722 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640433330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8BwSmFBwwysgMeT6dHg2mPBWw4ZezkE6yGiOAhLVNZM=; b=JlO/23DlK9zyJL8ERIHEUNL09i+9YzfEjYwjrtjJOjO5kf4DqTO8vLxFaWxrTIFt7fZD/R PPjncO3r1L4JZCiSyMmPz3uSNcNwARjT2jDLbkkvMq7Ie+hoHxIIK47oPCaLRMYjjGmCYu Nxns4CgfBcTJkwDrdKhFvtJAMRJR1jIcx0dvEFlBxo5xpHRQcpNHDV3PR2M913LmaN7hRS TdFUiC17TwAPYGTJ0xAVqtDzAYlk9oYbefY06YGW8j3ilwibXacdNBQ0h3JsOiwmhs7igB Ckgb0+ZVo04eXcjhX80WVLi5oXan4oplnpgHsRitFLlfTR6zJHpEFSp0LWzgxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640433330; a=rsa-sha256; cv=none; b=jY9AbgLXYJxZKdjC80ql6q2zlCLWGdfclpAd92orQxLu9sNn8gPjZCQ7MQPfX+fIH2v0ON 5B+PIgk485dIjvQLoRyPBrbWpD8skQVoiSQhKXsUZIoMx1EAsfyVuZgRAJlkhRMo/7FoHA 3gU45kEfPtxKatRJK3DH4bLTWorh8QE/39ajsMycfal0sJCoC5gxv7cOAy1Pm6u5NGXtU4 +GLIQ9NkVWM48FBuftEgkLUB6aYifq/zNOxxcQv9VzVLGXD61LRB+MqeQ7Kvki85m/35NT fWLORl6Uck2QtgFw8/jVBObsTO0e0axM2dt1aABf+jpPiEmAsGF4ilJi9K8PSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=8a74220dbb02930328b37ba1c5ebcf7280304722 commit 8a74220dbb02930328b37ba1c5ebcf7280304722 Author: Dimitry Andric AuthorDate: 2021-06-14 18:44:09 +0000 Commit: Dimitry Andric CommitDate: 2021-12-25 11:51:07 +0000 Apply upstream libc++ fix to allow building with devel/xxx-xtoolchain-gcc Merge commit 52e9d80d5db2 from llvm git (by Jason Liu): [libc++] add `inline` for __open's definition in ifstream and ofstream Summary: When building with gcc on AIX, it seems that gcc does not like the `always_inline` without the `inline` keyword. So adding the inline keywords in for __open in ifstream and ofstream. That will also make it consistent with __open in basic_filebuf (it seems we added `inline` there before for gcc build as well). Differential Revision: https://reviews.llvm.org/D99422 PR: 255570 MFC after: 6 weeks (cherry picked from commit d099db25464b826c5724cf2fb5b22292bbe15f6e) --- contrib/llvm-project/libcxx/include/fstream | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/fstream b/contrib/llvm-project/libcxx/include/fstream index d7d6b46c32d9..7b1bbfe16c01 100644 --- a/contrib/llvm-project/libcxx/include/fstream +++ b/contrib/llvm-project/libcxx/include/fstream @@ -244,7 +244,7 @@ public: return open(__p.c_str(), __mode); } #endif - inline _LIBCPP_INLINE_VISIBILITY + _LIBCPP_INLINE_VISIBILITY basic_filebuf* __open(int __fd, ios_base::openmode __mode); #endif basic_filebuf* close(); @@ -574,7 +574,7 @@ basic_filebuf<_CharT, _Traits>::open(const char* __s, ios_base::openmode __mode) } template -inline _LIBCPP_INLINE_VISIBILITY +inline basic_filebuf<_CharT, _Traits>* basic_filebuf<_CharT, _Traits>::__open(int __fd, ios_base::openmode __mode) { basic_filebuf<_CharT, _Traits>* __rt = nullptr; @@ -1326,6 +1326,7 @@ basic_ifstream<_CharT, _Traits>::open(const string& __s, ios_base::openmode __mo } template +inline void basic_ifstream<_CharT, _Traits>::__open(int __fd, ios_base::openmode __mode) { if (__sb_.__open(__fd, __mode | ios_base::in)) @@ -1539,6 +1540,7 @@ basic_ofstream<_CharT, _Traits>::open(const string& __s, ios_base::openmode __mo } template +inline void basic_ofstream<_CharT, _Traits>::__open(int __fd, ios_base::openmode __mode) { if (__sb_.__open(__fd, __mode | ios_base::out))