From nobody Fri Jul 10 15:20:47 2026 X-Original-To: dev-commits-src-main@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 4gxbBS0cvJz6lHHR for ; Fri, 10 Jul 2026 15:20:48 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gxbBR73X0z432r for ; Fri, 10 Jul 2026 15:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783696848; 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=4QKvctlNoFuWTBaxcRzlhbVM80mw7Rnd6hV61TVPhzg=; b=ipKEcJ/8LvBcncUnqrmku43NDYsV/tf5E3/+LkKYZ0wdBv3Gpc+6fR4vXrivBzuaXMHVOD 6Kroo8k/XcXFjx73gM45mZnHed2vi5RoYUAqNaDBSdbnOSOCHjf+Av9KhTzlpBQ9zdCitB AZzwh/gqgR3f9cIDSxydvhlHT05+p1UR4L7to0rPkpyv6W0kQt9VE9ToemqteCv9UynePP Fm05TFOBgFzEZfYRIKgrFFHD1Q9vlxViTFZ1j29t5xMOvdZ4XJf6qzooijmqbzZcLsvmph zFjI591g+3FoLEBgFhGjSjUV4G41Yd03H68pz5O6RpJi4WcD6U16/DQMnkEBAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783696848; a=rsa-sha256; cv=none; b=QZGxXq2djmwZsOr3CGCQA4gTMT3HhcBQdhSZgIv30VLRe/8/7+gu876giFaIEJ/PDSUoIB jtCTxMVXylnTRsLqqeiL0iRHQVYvAFZl/y0YyXrobvzQNkkk4I//550ErClGo8y0lAV2NJ GdOO7qWPfL7Sp89uZqRpwv61r16xfdBRQgHHrhP35Wva+SMKeEOfcQEbKV74R7mkde8Sbb AlwJDOOGgb6AzHYfqer1/cHx+T4o/V9hGW9nIPEXB2jI0FfvYA1GaqTK+8klJ0lIEIuiky +vzHR3yz7c78rzGlSkHEdjYbT6iiAvtTgKr227ufvrrbQe2PsiBJs3xCmBHviw== 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=1783696848; 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=4QKvctlNoFuWTBaxcRzlhbVM80mw7Rnd6hV61TVPhzg=; b=URBhhrTWELt9LLYZjzY2gQYC2R3FgnqeEOC1mFHtH7s+YgQUF79eT7RDlDlOQMZEyWbjBC iwJaqMi86CMFLhWNPbfZzrt5MzwCBLOzWBou9r8m5hJIxUY0doNBWQynzvaT0UehZJQQwk Cqfzol4qdsp4xbUa7ugPFWAgVRix2AZBZX7T7tKGLtlF/mkmzmU5nOweX57IudeNBv/8eJ b1t4wif5v1czqaCmq7bEopTLCTvwfi49PP9wcVXGK7ZxwFQ1UYiosQCN53YyrJYNmFLNWt 6pwbf1z+gXx4Qx9Z9y4ef9nNbVqduJQ0emLi3oSk9qAhqJ0t2hS2+Ffy0jlttQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gxbBR5ZZrz10CJ for ; Fri, 10 Jul 2026 15:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3331e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Jul 2026 15:20:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: ae0a3632b508 - main - build: Retire LLVM_COV src.conf knob List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/main X-Git-Reftype: branch X-Git-Commit: ae0a3632b5080b953e138b69d2b96de54d9be8a3 Auto-Submitted: auto-generated Date: Fri, 10 Jul 2026 15:20:47 +0000 Message-Id: <6a510dcf.3331e.767e580f@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ae0a3632b5080b953e138b69d2b96de54d9be8a3 commit ae0a3632b5080b953e138b69d2b96de54d9be8a3 Author: Ed Maste AuthorDate: 2026-05-04 14:34:07 +0000 Commit: Ed Maste CommitDate: 2026-07-10 15:20:34 +0000 build: Retire LLVM_COV src.conf knob I introduced it in commit 1b49115a40ad ("Promote llvm-cov to a standalone option"). llvm-cov was previously enabled as part of the CLANG_EXTRAS option. I made it a standalone, default-enabled option for parity with the tools provided by the GCC-based toolchain. We no longer provide an in-tree GCC toolchain. Now, just build llvm-cov along with Clang to simplify build infrastructure. Reviewed by: dim Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D58155 --- lib/clang/libllvm/Makefile | 5 ++--- share/man/man5/src.conf.5 | 10 +--------- share/mk/src.opts.mk | 2 -- tools/build/mk/OptionalObsoleteFiles.inc | 4 ++-- tools/build/options/WITHOUT_LLVM_COV | 3 --- tools/build/options/WITH_LLVM_COV | 3 --- usr.bin/clang/Makefile | 2 +- usr.bin/clang/toolchain/Makefile | 2 -- 8 files changed, 6 insertions(+), 25 deletions(-) diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index ea90b37f8cbd..a234c73b15b9 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -2205,10 +2205,9 @@ SRCS_ALL+= ${SRCS_XDL} .if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no" || !defined(TOOLS_PREFIX) SRCS_ALL+= ${SRCS_XDW} .endif -.if ${MK_LLVM_COV} != "no" +# LLVM_COV retired, just part of Clang now SRCS_ALL+= ${SRCS_COV} -.endif -.if ${MK_LLVM_COV} != "no" || ${MK_LLD} != "no" || \ +.if ${MK_LLD} != "no" || \ (defined(TOOLS_PREFIX) && ${MK_LLD_BOOTSTRAP} != "no") SRCS_ALL+= ${SRCS_COL} .endif diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index b1c511f596ef..c9c9c01cbc99 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd July 9, 2026 +.Dd July 10, 2026 .Dt SRC.CONF 5 .Os .Sh NAME @@ -397,8 +397,6 @@ When set, it enforces these options: .Va WITHOUT_CLANG_FORMAT .It .Va WITHOUT_CLANG_FULL -.It -.Va WITHOUT_LLVM_COV .El .Pp When set, these options are also in effect: @@ -993,10 +991,6 @@ To be able to build the system alternate binary utilities must be provided via and .Ev XSTRIPBIN . -.It Va WITHOUT_LLVM_COV -Do not build the -.Xr llvm-cov 1 -tool. .It Va WITH_LLVM_FULL_DEBUGINFO Generate full debug information for LLVM libraries and tools, which uses more disk space and build resources, but allows for easier debugging. @@ -1841,8 +1835,6 @@ When set, it enforces these options: .Va WITHOUT_LLD .It .Va WITHOUT_LLDB -.It -.Va WITHOUT_LLVM_COV .El .Pp When set, these options are also in effect: diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 1dbd1d2d9703..13136b174860 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -124,7 +124,6 @@ __DEFAULT_YES_OPTIONS = \ LLVM_ASSERTIONS \ LLVM_BINUTILS \ LLVM_BINUTILS_BOOTSTRAP \ - LLVM_COV \ LOADER_BIOS \ LOADER_BIOS_TEXTONLY \ LOADER_GELI \ @@ -511,7 +510,6 @@ MK_LLVM_BINUTILS:= no MK_CLANG_EXTRAS:= no MK_CLANG_FORMAT:= no MK_CLANG_FULL:= no -MK_LLVM_COV:= no .endif .if ${MK_ASAN} == "yes" diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index e46618644f7d..842ecec362a6 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -895,7 +895,7 @@ OLD_LIBS+=usr/lib/libprivateclang.so.21 .endif .if (${MK_CLANG_EXTRAS} == no && ${MK_CLANG} == no && ${MK_LLDB} == no && \ - ${MK_LLD} == no && ${MK_LLVM_BINUTILS} == no && ${MK_LLVM_COV} == no) || \ + ${MK_LLD} == no && ${MK_LLVM_BINUTILS} == no) || \ ${MK_LLVM_LINK_STATIC_LIBRARIES} != no OLD_LIBS+=usr/lib/libprivatellvm.so.21 .endif @@ -3925,7 +3925,7 @@ OLD_FILES+=usr/share/man/man1/lldb-server.1.gz OLD_FILES+=usr/share/man/man1/lldb.1.gz .endif -.if ${MK_LLVM_COV} == no +.if ${MK_CLANG} == no OLD_FILES+=usr/bin/gcov OLD_FILES+=usr/bin/llvm-cov OLD_FILES+=usr/bin/llvm-profdata diff --git a/tools/build/options/WITHOUT_LLVM_COV b/tools/build/options/WITHOUT_LLVM_COV deleted file mode 100644 index d95e76ddf659..000000000000 --- a/tools/build/options/WITHOUT_LLVM_COV +++ /dev/null @@ -1,3 +0,0 @@ -Do not build the -.Xr llvm-cov 1 -tool. diff --git a/tools/build/options/WITH_LLVM_COV b/tools/build/options/WITH_LLVM_COV deleted file mode 100644 index 8cfe078ee231..000000000000 --- a/tools/build/options/WITH_LLVM_COV +++ /dev/null @@ -1,3 +0,0 @@ -Build the -.Xr llvm-cov 1 -tool. diff --git a/usr.bin/clang/Makefile b/usr.bin/clang/Makefile index 1d80fad2936f..3252e077d42f 100644 --- a/usr.bin/clang/Makefile +++ b/usr.bin/clang/Makefile @@ -62,7 +62,7 @@ SUBDIR+= lld SUBDIR+= lldb SUBDIR+= lldb-server .endif -.if ${MK_LLVM_COV} != "no" +.if ${MK_CLANG} != "no" SUBDIR+= llvm-cov SUBDIR+= llvm-profdata SUBDIR_DEPEND_toolchain= llvm-cov diff --git a/usr.bin/clang/toolchain/Makefile b/usr.bin/clang/toolchain/Makefile index 5f66ae1433b1..728c945bea10 100644 --- a/usr.bin/clang/toolchain/Makefile +++ b/usr.bin/clang/toolchain/Makefile @@ -7,10 +7,8 @@ SYMLINKS+= llvm-ar ${BINDIR}/ar SYMLINKS+= llvm-ranlib ${BINDIR}/ranlib MLINKS+= llvm-ar.1 ar.1 llvm-ar.1 ranlib.1 -.if ${MK_LLVM_COV} != "no" SYMLINKS+= llvm-cov ${BINDIR}/gcov MLINKS= llvm-cov.1 gcov.1 -.endif SYMLINKS+= llvm-cxxfilt ${BINDIR}/c++filt MLINKS+= llvm-cxxfilt.1 c++filt.1