git: c3eb0b7c1922 - stable/13 - Merge commit 3537338d1ab9 from llvm git (by Nikolas Klauser):

The branch stable/13 has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=c3eb0b7c19221f3a2133ab14d3ffffa61ec0c4bc

commit c3eb0b7c19221f3a2133ab14d3ffffa61ec0c4bc
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2023-11-15 02:34:45 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2024-01-07 23:04:34 +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
    
    (cherry picked from commit ab43851b0c7bd5f21ade72c3cae3d3ee09eb8891)
---
 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