From nobody Mon Mar 09 13:24:56 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 4fTyRX5MVsz6VkBj for ; Mon, 09 Mar 2026 13:24:56 +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 4fTyRX4RF2z44f3 for ; Mon, 09 Mar 2026 13:24:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773062696; 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=nBAkvEIw4OPyO5yEWLBjKbZtosnh3Bocs1++c8BifTA=; b=JamnToqxBVKIv11iSKBTNZuUPN1fjtLpImtvtq6nGifpkO2zZT6OCW6lSh2qWTkgZ7PUxi E76ImHpgP718WeTITIgy4jAH7iCIlit+1aRW/uyvZ7LP836hsUB2zbQWOSF3xspkmip8yT mEru0hKfT2YSgvwi7lmnEBQFjgV6YMYzJ9jERNF7wg3QsJFEZI3M23YvA1gj75+tg7W45N EcPzMru11jJ2ZnONcO28nPOWmOHcjnP8k9Uy/MbMwOm/R8nQi8Mb8O90KQmHMWGju9nLLt TjpdCxO7qqV4UfkwHYBKcY4MZokW+ivA8ODGJAVFZz9awOmC5IsuKsjqK36A0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773062696; a=rsa-sha256; cv=none; b=yRGfqg/0g7ci5VGVnsdZJBDAiP5i/Hf5ECxZVFxG21iLwKyemSGPgbKL0MB1Xr+8r1vAGd BkLSoJnp6YtyJjrO2XVAZ5S+MFePokPB/w7kuEi6QaU1hezKzL0PR2LMg0mdhE4yFbkVp7 PJuy8rpFbMQ2msZCWexqW7p/PR+IdDvcTCeP3h68p5Yv6h2qkbLo7/sjoRMvaw0Yc135Pm 5IxYBbvsDNkl8xbINTkKckaFJy6JrwMtu9Fj6G4C9Ea+trRVw/XRVRhBWBLI6mtPhrcfoT OEHfMQ3vJdm0gC70epTKUe8fcjO/NwLdeVY2lvXgS4jz7DLBhijZF/jcAeFxaA== 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=1773062696; 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=nBAkvEIw4OPyO5yEWLBjKbZtosnh3Bocs1++c8BifTA=; b=o90YpuzcqrY9VwAeMR86hFY9/TzVdHxTpiI21bTiLggfTQDOwK8UPU2dDiq40QPx9SW9jR PgUqflPEEbZT97XGWJ8HOndoS7f5bSkXwW6909cXHo+nzJK2Mi/s3jtWZBCq+R9JA0bhx6 PiK8BGUoqGouMept95myrALDk1X77NAJ5TJLbjmFWYfzjwaic1SwFeIYBVWs+w3+AgAHYV BptDiCbXxhbCrW9iJ2dhPaeQ7niNuGYa73sYDPVXW89hwn0x+v9/7ctmsr6nHcI/lqbNtu 3bkJp3yh0av9Z9DPR4SRX/lxJlH1nLH2Mra3tRGDDtoEBCCj3ffzMRRbof3iYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTyRX422XzBJh for ; Mon, 09 Mar 2026 13:24:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24f1d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 13:24:56 +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: 897711b7bd4b - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 897711b7bd4ba8f34bab9e0b79495ce107cfef35 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 13:24:56 +0000 Message-Id: <69aeca28.24f1d.4ef6b441@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=897711b7bd4ba8f34bab9e0b79495ce107cfef35 commit 897711b7bd4ba8f34bab9e0b79495ce107cfef35 Author: John Baldwin AuthorDate: 2026-01-27 18:34:58 +0000 Commit: Ed Maste CommitDate: 2026-03-09 13:24:28 +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) --- .../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);