From nobody Mon Mar 09 13:27:17 2026 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 4fTyVF6rn8z6VkrT for ; Mon, 09 Mar 2026 13:27:17 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTyVF4hQMz44mW for ; Mon, 09 Mar 2026 13:27:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773062837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GhvCPrMz9YmjmCn8958CKday9SJj7Gl5Nf/k6TFhp/Y=; b=h2PYkkPqBReMHYEHw/ndUh21jiHWLMzZoaAEmopG9+tX6PA/LbmcSDSDi9VGNDTRiZcnHg 0DcMO3S78IkHeZrrqwnu6oC9yGyQBcPMOgPse5y+ndPRcphjcekvLaLnePn24fontfvYPT ioxORFWQ9MXmfIvpbQsTYqL0+N3l53oDOKM3Oa9JcROFTi2aw+U073KYHTyX9WV5oD5dMA CfXKOtSlLoYptsY6MpzXCm6la2b6RaKKSYTdo9rI2qHYBlYPWgfTHJ8nOPMvl31aOm8zQf pHZ1x+TSj+jD3TjG8qzpvhX8w8Nj7bXBxQNaZShUuPMjhEpSEjdETEJBGR+C3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773062837; a=rsa-sha256; cv=none; b=uXe15TX0ECA8RyIYBdZilxiu/Dkk4BNX3rOqRQjH8GNO1DDWQcd7evVPyyktqNLHUljPqO TCfsSUCYe/mRmiVTS0qtsuaUGgcIkiVXEckYspsOJuED92yeR0YQyu6XwY6BDU1GmroivU 8JtuwY9aFEqm6PsbKF4ceFXuTnCfwTfWiwUnJnDAd2fgHDO7bJfDECB6T3VYbjhhdvY8qd oNoKA3F7b3BeP+Wz9K0G3hu0IhODlrl+QheOmIbsKuRhpO57q2E2mz2zZPnAfCdz5Zm2YE dae6DeVjKPLr0++6UfK3T18abz7ciTQM/GbIEVid4L12GBF+YOpYyYtlhOqGJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773062837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GhvCPrMz9YmjmCn8958CKday9SJj7Gl5Nf/k6TFhp/Y=; b=T5oaQSYQGKvd6XGDds6VWQOwxwJZxtnXXmB6GRaosMRpYJAHlfb88pW1qHH6YZp0ocQ7y1 462HrVeEtG/8DiH1oJu+0wzM7SWM6aG9RR3floM85om2BBSmIDiHawB9gFmFLkGawphIpo cqMaLCMuibHPOOR6cgvjn1FKhl6KNPlqhavnv4oQKwAQmsm5cNblCQNKOfnTULAMmwgToC Eg3r8eJSroE/3i3fbFo4ZB8me54cyzn/ji5GwRJRv1L3M7moIdaD/NJoWeb2mBIY6XB9Fb en0dX3BYIpn9mrFHjryIUhZsLwcYa5p575GC3FUUOoERjIzEVHLPju4p6lQEHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTyVF40bZzBLB for ; Mon, 09 Mar 2026 13:27:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27691 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 13:27:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: John Baldwin From: Ed Maste Subject: git: 7fd8a2028034 - stable/14 - Merge commit 81b20e110b3f from llvm git (by Roland McGrath): 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7fd8a2028034968b8dc7984e83046f4b7c1696ff Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 13:27:17 +0000 Message-Id: <69aecab5.27691.20ec51eb@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7fd8a2028034968b8dc7984e83046f4b7c1696ff commit 7fd8a2028034968b8dc7984e83046f4b7c1696ff Author: John Baldwin AuthorDate: 2026-01-27 18:34:58 +0000 Commit: Ed Maste CommitDate: 2026-03-09 13:25:54 +0000 Merge commit 81b20e110b3f from llvm git (by Roland McGrath): [libc++] Work around new GCC 15 type_traits builtins that can't be used as Clang's can (#137871) GCC 15 has added builtins for various C++ type traits that Clang already had. Since `__has_builtin(...)` now finds these, the #if branches previously only used for Clang are now used for GCC 15. However, GCC 15 requires that these builtins only be used in type aliases, not in template aliases. For now, just don't use the `__has_builtin(...)` branches under newer GCC versions, so both 14 and 15 work during the transition. This can be cleaned up later to use all the GCC 15 builtins available. Fixed: #137704 Fixed: #117319 Reviewed by: dim Differential Revision: https://reviews.freebsd.org/D54865 (cherry picked from commit bfc6e56f6327621171cef4fe29290c63edfc4d9c) (cherry picked from commit 897711b7bd4ba8f34bab9e0b79495ce107cfef35) --- .../llvm-project/libcxx/include/__type_traits/add_lvalue_reference.h | 2 +- contrib/llvm-project/libcxx/include/__type_traits/add_pointer.h | 2 +- .../llvm-project/libcxx/include/__type_traits/add_rvalue_reference.h | 2 +- contrib/llvm-project/libcxx/include/__type_traits/decay.h | 2 +- contrib/llvm-project/libcxx/include/__type_traits/remove_all_extents.h | 2 +- contrib/llvm-project/libcxx/include/__type_traits/remove_extent.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__type_traits/add_lvalue_reference.h b/contrib/llvm-project/libcxx/include/__type_traits/add_lvalue_reference.h index a633e3904532..f583b4328830 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/add_lvalue_reference.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/add_lvalue_reference.h @@ -18,7 +18,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__add_lvalue_reference) +#if __has_builtin(__add_lvalue_reference) && !defined(_LIBCPP_COMPILER_GCC) template using __add_lvalue_reference_t = __add_lvalue_reference(_Tp); diff --git a/contrib/llvm-project/libcxx/include/__type_traits/add_pointer.h b/contrib/llvm-project/libcxx/include/__type_traits/add_pointer.h index 5aac7d5cfa90..8f85ece33d6a 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/add_pointer.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/add_pointer.h @@ -20,7 +20,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if !defined(_LIBCPP_WORKAROUND_OBJCXX_COMPILER_INTRINSICS) && __has_builtin(__add_pointer) +#if !defined(_LIBCPP_WORKAROUND_OBJCXX_COMPILER_INTRINSICS) && __has_builtin(__add_pointer) && !defined(_LIBCPP_COMPILER_GCC) template using __add_pointer_t = __add_pointer(_Tp); diff --git a/contrib/llvm-project/libcxx/include/__type_traits/add_rvalue_reference.h b/contrib/llvm-project/libcxx/include/__type_traits/add_rvalue_reference.h index a54aae7ec8de..e5dc920e6a44 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/add_rvalue_reference.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/add_rvalue_reference.h @@ -18,7 +18,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__add_rvalue_reference) +#if __has_builtin(__add_rvalue_reference) && !defined(_LIBCPP_COMPILER_GCC) template using __add_rvalue_reference_t = __add_rvalue_reference(_Tp); diff --git a/contrib/llvm-project/libcxx/include/__type_traits/decay.h b/contrib/llvm-project/libcxx/include/__type_traits/decay.h index 7412044f9317..861dc2eb10d0 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/decay.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/decay.h @@ -25,7 +25,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__decay) +#if __has_builtin(__decay) && !defined(_LIBCPP_COMPILER_GCC) template using __decay_t _LIBCPP_NODEBUG = __decay(_Tp); diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_all_extents.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_all_extents.h index d5373b51f522..a27e3bb48038 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_all_extents.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_all_extents.h @@ -18,7 +18,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__remove_all_extents) +#if __has_builtin(__remove_all_extents) && !defined(_LIBCPP_COMPILER_GCC) template struct remove_all_extents { using type _LIBCPP_NODEBUG = __remove_all_extents(_Tp); diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_extent.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_extent.h index fe37b5c7266c..767331e102ad 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_extent.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_extent.h @@ -18,7 +18,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__remove_extent) +#if __has_builtin(__remove_extent) && !defined(_LIBCPP_COMPILER_GCC) template struct remove_extent { using type _LIBCPP_NODEBUG = __remove_extent(_Tp);