Date: Wed, 15 Nov 2023 02:37:43 GMT From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: ab43851b0c7b - main - Merge commit 3537338d1ab9 from llvm git (by Nikolas Klauser): Message-ID: <202311150237.3AF2bh5N009675@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ab43851b0c7bd5f21ade72c3cae3d3ee09eb8891 commit ab43851b0c7bd5f21ade72c3cae3d3ee09eb8891 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2023-11-15 02:34:45 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2023-11-15 02:34:45 +0000 Merge commit 3537338d1ab9 from llvm git (by Nikolas Klauser): [libc++][libunwind] Fixes to allow GCC 13 to compile libunwind/libc++abi/libc++ These are changes to allow GCC 13 to successfully compile the runtimes stack. Reviewed By: ldionne, #libc, #libunwind, MaskRay Spies: MaskRay, zibi, SeanP, power-llvm-team, mstorsjo, arichardson, libcxx-commits Differential Revision: https://reviews.llvm.org/D151387 Reviewed by: imp, dim, emaste Differential Revision: https://reviews.freebsd.org/D42578 --- contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h | 2 +- contrib/llvm-project/libcxx/include/__type_traits/remove_cvref.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h index ea85e23b8065..4c063e134d8e 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h @@ -19,7 +19,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__remove_cv) +#if __has_builtin(__remove_cv) && !defined(_LIBCPP_COMPILER_GCC) template <class _Tp> struct remove_cv { using type _LIBCPP_NODEBUG = __remove_cv(_Tp); diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_cvref.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_cvref.h index e96cc6523b71..1956ac3e5a43 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_cvref.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_cvref.h @@ -20,7 +20,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__remove_cvref) +#if __has_builtin(__remove_cvref) && !defined(_LIBCPP_COMPILER_GCC) template <class _Tp> using __remove_cvref_t _LIBCPP_NODEBUG = __remove_cvref(_Tp); #else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311150237.3AF2bh5N009675>