From nobody Sat Apr 25 14:18:37 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 4g2sPn6LlWz6bZ4Q for ; Sat, 25 Apr 2026 14:18:37 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2sPn1c9Rz3FNj for ; Sat, 25 Apr 2026 14:18:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777126717; 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=xyWJ1nackGZCXwb7Kx9ZtphLkJOiCcZvsZ+LDAe4Bgk=; b=ZIPkYofWC1VqeHxHuPmcmMUE22bywdqJYYR6CZBmXgZ6XPqmIbhtJuWfotd0nGLGjMsvsk 6Yr1+fe44upJ8xOhHNXLM2SwIm22XirCaGG1F3nrznxHCpb5cwI8VLAf/EFWmAcI4hsIXt JjxRajWg1Ooswu92uExeVBmw0gHjHYSXX85Mz0EycR4JmIp7xEOZRUQjvnWaTG2SiFKWDu Dg5CLkAB2KlY3AI9SXKM5XGnn8JR/TociYgJRELkTBn4JqXHmOpORZlUEuAe48dNK0f51t hjp0kK5taiAvPz2ISArQ3IUt8HNPlQItRE1HRSWZROtZo/3nOR1VYJG17NVdow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777126717; a=rsa-sha256; cv=none; b=UMAduHjv9LA25jlu9H20QpigfINofmnvo9mvzwVNWtZUmfuy2GaDxNmL2oZPVblvdEDEkV eFOSuXpx0dsgEhfAnGtgKbArVBimh9AcpqlLdW24xnHkb46ctaySHkgY3oYgg7PDzaFGS2 Gw4JMp9fhFpW5v1GAVmTar6O4z1P3sBIxG3b/Z5pkwctlT3XhlkFyndsOzo7jO+v1NsSzb h72Fhev2e/5/tQ5FkYEm1U0RVKdtKhxRlQaVdKd4w2miYIBa92Ujb7iBFUjk4Ha9j7N28w Smt2YDb1pIGxbXxMGJOBjqwkgizwsnsDIbVBSofcHj3YGibVuMfCrssgkQKeWg== 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=1777126717; 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=xyWJ1nackGZCXwb7Kx9ZtphLkJOiCcZvsZ+LDAe4Bgk=; b=uvexSC5szuowyPEG4Xp4C5pXEkzo//WzxzdU+5lWpY2bAuKqXYM4Fiuo26mNtLQ1jfPERk Sw7JBmgAjtPhl0J6AVwJZjFcyFiv0Xaq2og1zT62hX/WsFGqCqzVwDtfRB0cfReH0pyOD5 hiVZeFeVrezHtHn7oX1B5TKRuulE2ILBPN4HKBItPQbyPdz2sEBcNUpprEr8MEGGmEfHNv RmbW9qwf4+7PAI54bdnnv8OA869Z2hBYk+6kYfAY6EFH+oarwmkyG/TTIOw8EOj3NEQOTh 6MEPi1Nuf2+jTkwwSJs6C1RjxJFM1UImOi86oGTTGsQTskUBXCCDhRiMFMZ4/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2sPn192zzd0Y for ; Sat, 25 Apr 2026 14:18:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37a92 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Apr 2026 14:18:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: a843ea3f246f - main - Revert "libcxx-compat: revert llvmorg-19-init-8667-g472b612ccbed:" 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a843ea3f246f3f137722db556aa07710e6a84b71 Auto-Submitted: auto-generated Date: Sat, 25 Apr 2026 14:18:37 +0000 Message-Id: <69eccd3d.37a92.e37fbec@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=a843ea3f246f3f137722db556aa07710e6a84b71 commit a843ea3f246f3f137722db556aa07710e6a84b71 Author: Dimitry Andric AuthorDate: 2025-12-06 20:24:15 +0000 Commit: Dimitry Andric CommitDate: 2026-04-25 14:07:42 +0000 Revert "libcxx-compat: revert llvmorg-19-init-8667-g472b612ccbed:" This reverts commit f7570f1eb0dc056dfce9d7500157538c670edaf6, in preparation for merging llvm 21. PR: 292067 MFC after: 1 month --- contrib/llvm-project/libcxx/include/__format/format_arg.h | 1 + contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__format/format_arg.h b/contrib/llvm-project/libcxx/include/__format/format_arg.h index 4924e5fb3253..aa02f81dc40e 100644 --- a/contrib/llvm-project/libcxx/include/__format/format_arg.h +++ b/contrib/llvm-project/libcxx/include/__format/format_arg.h @@ -19,6 +19,7 @@ #include <__fwd/format.h> #include <__memory/addressof.h> #include <__type_traits/conditional.h> +#include <__type_traits/remove_const.h> #include <__utility/forward.h> #include <__utility/move.h> #include <__utility/unreachable.h> 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 8e1c04336432..2c4e9e419a1b 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h @@ -10,8 +10,6 @@ #define _LIBCPP___TYPE_TRAITS_REMOVE_CV_H #include <__config> -#include <__type_traits/remove_const.h> -#include <__type_traits/remove_volatile.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header