From nobody Tue Jan 27 18:40:59 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 4f0vPF0lwTz6QFbp for ; Tue, 27 Jan 2026 18:41:05 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f0vPD5thkz3nW1 for ; Tue, 27 Jan 2026 18:41:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539264; 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=tRKlg5hja/vRW+TZgn0oA227O2nhXisPFTYS1RmFhDU=; b=FoMDZSO9kZuIsz+MC/aSZury7iErZyJEb6aQ5sPtdE8K5D4bhgg7Xym3noJ3YtqSf+t6Sp Oml8InywD5gsqsE0K97QKGjNtllMBehvG6fwgWdhkj0VDRU1rTWcSjRx6lc9G3DZFPENPe ore7pH8hSQUh57KWYkja5aUxHTCg1kM+Uz+gf6lnSF3hMOEbtpT7QgWnTWFz68w47ct+rK 96xqAoO9tEyWw+rvpvDA7b+dpu+kgBMdYpyyW+VCFCKCuK+0YccOSm6qfZHgLs9HUpymzg odX/nLMwWWJ2oTB/HFyXeh/RaCai2Mkfcb3bNF7BW9ZasVgA4l6OrYqn3Du8Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539264; 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=tRKlg5hja/vRW+TZgn0oA227O2nhXisPFTYS1RmFhDU=; b=MMU7oZqahOVs2ZFIobtbMoF3ZNJXa3tK9JUgJ+XnaUqrO8DgLkroOT9SC2VPRzksbcP9Wp pXCRMFNRAs+CW/EmKRP1XFydZiGKonX/mB6ShzILa+Pzn2YUUasSzIYG8VPAih5q/jiozn e3gJvuyjZaRVNHedozdwD7xRiKRx3qV1juzjFuDoSvr1SFNLMTIvC2yyf9MV4qgucP0tm8 zh+WX0rvRJZ2KNCVF3GgyNcJ06fzAFTIBRIoKEco6ozti/pwWwuB9ZOjAElcTElXXrBJPi q8D47s6KJ1y0HbdIO0iYXzzxn/U9ti9MXbF9i7TDovu7NcvXZ4kGzorbgxC94Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769539264; a=rsa-sha256; cv=none; b=ILBzrf2Q70L4r2Bd3pep7av4qfyBMaqooCv4G+/cr/xs0/YjLyjPO2PQDI1MkZvxIHvV11 vSD6HwvofxdaCDogIzuTroAZs7IfTMychVtkDDKNybqJbM0Vs0HRCyFtoYQQ4LreUwbd8/ JxSoHPs5HRrUtXs6ffuKotdwLjk/qIscgvE/O+Q+xD0R1DqNHfMB6aZIL3H6ypeGCec1B1 VE6AagoQP5pGdFLnYdQTHrKAoSzWOJcdESPfXlOvslK4Cmg4f8Y/1qGY03iM45+imce2ab ZfEt0a8MHD3DLlmEqrpmtoUcjBy0qkq+Vh+UUxOjsVk3oWPiFm38qg8mFpyVOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f0vPD4ptWz3W3 for ; Tue, 27 Jan 2026 18:41:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e2c6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Jan 2026 18:40:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: bfc6e56f6327 - main - 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bfc6e56f6327621171cef4fe29290c63edfc4d9c Auto-Submitted: auto-generated Date: Tue, 27 Jan 2026 18:40:59 +0000 Message-Id: <697906bb.e2c6.3a7612eb@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bfc6e56f6327621171cef4fe29290c63edfc4d9c commit bfc6e56f6327621171cef4fe29290c63edfc4d9c Author: John Baldwin AuthorDate: 2026-01-27 18:34:58 +0000 Commit: John Baldwin CommitDate: 2026-01-27 18:34:58 +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 --- .../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);