From nobody Thu Mar 5 14:43:54 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 4fRXNW0Xk0z6T80t for ; Thu, 05 Mar 2026 14:43:55 +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 4fRXNV6P50z3S4W for ; Thu, 05 Mar 2026 14:43:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772721834; 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=lz+fsGFEz2lLpMLI1wL9vN8pxHGHnz3dB0fY3P5R2PE=; b=RuKaAeafEUUytCOH13dUOUiF33scLgNCUetosxZqHOAG2Ic7lnDMSt4Itws3z7xMcM1q25 wmdLwkDvUoG1FsrbkxcmdW+Ibjdk2sc1ggHZzom/Kz5KadGVI4zt8BZiRIOOhz0REokqUY ZBJ8+7NHwRkvh7rlaeHmcP4wrVlQpuAfHh714Pf4ru3ZXamXQPwIeBpHr7bgeGwkv3onnr 43Aanpz0+gZo4NSYoZBFBsXQ34NpBWsYREmxWa1llyx62BJ8Cv3p7fcZf4l60cyKA/p0bQ Nmtt5DqZZlmXVe691WjV6TPQzvROjcZM8TFWnB/kPnH8g8exLuw6TSi5nH0uOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772721834; a=rsa-sha256; cv=none; b=ELhIKbOgBnxpVNm5wCS1XCHSZQUIxPXNFA1pECoLlruFohKbR7vHHRmFqAA1cr/PbUXMdR hjlR0E8eqApVp94cYsjkZt9htHjeDm+L7apEnjAwaiIi+wyjGiqWnTNtrElH8MuiZts8DU WmFOHHAtO0YD5iEX7okgQ6wv3xo5HfyEtSZMdhsu9DVNDYwH3Eklk+Z9sSsPigbv6XkpUr sFXvypDyZFBL6mNY1QD11811nn65+B1vXJVDU9AuqFkCM225WrWYjFy/OtDCcqyRMVJG0q rPXNurUUl001jY5fzkO6TsdnI9PQRYQDdsV7spl+bSbF3KYMeCp4DBD3j8VJ4g== 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=1772721834; 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=lz+fsGFEz2lLpMLI1wL9vN8pxHGHnz3dB0fY3P5R2PE=; b=jRieps/4Li+PdJ8AlO96Ql1z1pvjiLeVJJSiWYJDxl/P2XbtoLWFkmT7v0Qaoh5vsspKoX TbLRj9gF/S9J6puotxX2Tz230jMRkIcREm9QEsZzYDUBcSqojVhdGYFfMuhIB/cu1YTw+I nyhBgnOvibLlLtYDpd/BveTJdeONUP1kyCvdh30hpF6KIJnETGXRm0S0YXzFyxPv2oCCao QSjuMQjSYdHLyXfinU58ISJismWsR1ZHhVP2xRyEKOfmZR7xPjcuYNn/VTjJc8eTFeEKRf skMWrUdV+tcMdNRFodTy07p/LgswUyeeGuJVTuf78rVqvH4EbBVorI8QYqJVQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fRXNV5LzFzhkj for ; Thu, 05 Mar 2026 14:43:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 259b0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Mar 2026 14:43:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 5d757312ad59 - main - build: Retire LLVM_CXXFILT option 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 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: 5d757312ad591aae26b39943f113ebf3819718da Auto-Submitted: auto-generated Date: Thu, 05 Mar 2026 14:43:54 +0000 Message-Id: <69a996aa.259b0.1da0d24a@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5d757312ad591aae26b39943f113ebf3819718da commit 5d757312ad591aae26b39943f113ebf3819718da Author: Ed Maste AuthorDate: 2026-03-04 19:03:42 +0000 Commit: Ed Maste CommitDate: 2026-03-05 14:43:46 +0000 build: Retire LLVM_CXXFILT option The LLVM_CXXFILT option was added when we used ELF Tool Chain tools by default. ELF Tool Chain's c++filt failed to demangle some symbols, so we added a special case to install LLVM's version and enabled it by default. The rest of the LLVM tools are now used by default, as of commit 9fa94e1c099d ("Turn on WITH_LLVM_CXXFILT by default"). Simplify the build logic by removing a special case and just include llvm-cxxfilt with the rest of the LLVM utilities. Reviewed by: dim Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55654 --- share/man/man5/src.conf.5 | 6 +----- share/mk/src.opts.mk | 7 ------- tools/build/mk/OptionalObsoleteFiles.inc | 7 ++----- tools/build/options/WITHOUT_LLVM_CXXFILT | 1 - tools/build/options/WITH_LLVM_CXXFILT | 1 - usr.bin/Makefile | 2 -- usr.bin/clang/Makefile | 5 +---- usr.bin/clang/llvm-cxxfilt/Makefile | 2 -- 8 files changed, 4 insertions(+), 27 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 01e9db1f1915..71d8af3057d5 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 March 3, 2026 +.Dd March 5, 2026 .Dt SRC.CONF 5 .Os .Sh NAME @@ -122,8 +122,6 @@ When set, it enforces these options: .Bl -item -compact .It .Va WITH_LLVM_BINUTILS -.It -.Va WITH_LLVM_CXXFILT .El .It Va WITHOUT_ASSERT_DEBUG Compile programs and libraries without the @@ -995,8 +993,6 @@ is always provided by ELF Tool Chain. Do not build the .Xr llvm-cov 1 tool. -.It Va WITHOUT_LLVM_CXXFILT -Install ELF Tool Chain's cxxfilt as c++filt, instead of LLVM's llvm-cxxfilt. .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. diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 4abe1c699b4e..fa91c537188d 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -125,7 +125,6 @@ __DEFAULT_YES_OPTIONS = \ LLVM_ASSERTIONS \ LLVM_BINUTILS \ LLVM_COV \ - LLVM_CXXFILT \ LOADER_BIOS_TEXTONLY \ LOADER_GELI \ LOADER_KBOOT \ @@ -508,12 +507,6 @@ MK_LLVM_COV:= no MK_LLVM_BINUTILS:= yes .endif -.if ${MK_LLVM_BINUTILS} == "yes" -# MK_LLVM_CXXFILT is a subset of MK_LLVM_BINUTILS and should therefore be -# enabled if MK_LLVM_BINUTILS is set. -MK_LLVM_CXXFILT:= yes -.endif - .if ${MK_LOADER_VERIEXEC} == "no" MK_LOADER_VERIEXEC_PASS_MANIFEST := no .endif diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index c915da8ca501..fd25359c7c0b 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -896,6 +896,7 @@ OLD_LIBS+=usr/lib/libprivatellvm.so.19 .if ${MK_CLANG} == no && ${MK_LLVM_BINUTILS} == no OLD_FILES+=usr/bin/llvm-addr2line OLD_FILES+=usr/bin/llvm-ar +OLD_FILES+=usr/bin/llvm-cxxfilt OLD_FILES+=usr/bin/llvm-nm OLD_FILES+=usr/bin/llvm-objcopy OLD_FILES+=usr/bin/llvm-objdump @@ -908,6 +909,7 @@ OLD_FILES+=usr/bin/llvm-symbolizer OLD_FILES+=usr/bin/objdump OLD_FILES+=usr/share/man/man1/llvm-addr2line.1.gz OLD_FILES+=usr/share/man/man1/llvm-ar.1.gz +OLD_FILES+=usr/share/man/man1/llvm-cxxfilt.1.gz OLD_FILES+=usr/share/man/man1/llvm-nm.1.gz OLD_FILES+=usr/share/man/man1/llvm-objcopy.1.gz OLD_FILES+=usr/share/man/man1/llvm-ranlib.1.gz @@ -1388,11 +1390,6 @@ OLD_FILES+=usr/share/man/man1/opt.1.gz OLD_FILES+=usr/bin/clang-format .endif -.if ${MK_CLANG_EXTRAS} == no && ${MK_LLVM_CXXFILT} == no -OLD_FILES+=usr/bin/llvm-cxxfilt -OLD_FILES+=usr/share/man/man1/llvm-cxxfilt.1.gz -.endif - .if ${MK_CPP} == no OLD_FILES+=usr/bin/cpp OLD_FILES+=usr/share/man/man1/cpp.1.gz diff --git a/tools/build/options/WITHOUT_LLVM_CXXFILT b/tools/build/options/WITHOUT_LLVM_CXXFILT deleted file mode 100644 index e7d263f01f2a..000000000000 --- a/tools/build/options/WITHOUT_LLVM_CXXFILT +++ /dev/null @@ -1 +0,0 @@ -Install ELF Tool Chain's cxxfilt as c++filt, instead of LLVM's llvm-cxxfilt. diff --git a/tools/build/options/WITH_LLVM_CXXFILT b/tools/build/options/WITH_LLVM_CXXFILT deleted file mode 100644 index f6ac38b20af7..000000000000 --- a/tools/build/options/WITH_LLVM_CXXFILT +++ /dev/null @@ -1 +0,0 @@ -Install LLVM's llvm-cxxfilt as c++filt, instead of ELF Tool Chain's cxxfilt. diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 0c9c66748269..125ecb6f05a0 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -255,9 +255,7 @@ SUBDIR.${MK_TOOLCHAIN}+= size SUBDIR.${MK_TOOLCHAIN}+= c89 SUBDIR.${MK_TOOLCHAIN}+= c99 SUBDIR.${MK_TOOLCHAIN}+= ctags -.if ${MK_LLVM_CXXFILT} == "no" SUBDIR.${MK_TOOLCHAIN}+= cxxfilt -.endif # ELF Tool Chain elfcopy required for EFI objects (PR280771) SUBDIR.${MK_TOOLCHAIN}+= elfcopy SUBDIR.${MK_TOOLCHAIN}+= file2c diff --git a/usr.bin/clang/Makefile b/usr.bin/clang/Makefile index e2debfb8c582..ac92b08a54cb 100644 --- a/usr.bin/clang/Makefile +++ b/usr.bin/clang/Makefile @@ -14,6 +14,7 @@ SUBDIR+= clang-scan-deps # as the default binutils (ar,nm,addr2line, etc.). .if ${MK_CLANG} != "no" || ${MK_LLVM_BINUTILS} != "no" SUBDIR+= llvm-ar +SUBDIR+= llvm-cxxfilt SUBDIR+= llvm-nm SUBDIR+= llvm-objcopy SUBDIR+= llvm-objdump @@ -23,10 +24,6 @@ SUBDIR+= llvm-strings SUBDIR+= llvm-symbolizer .endif -.if ${MK_LLVM_BINUTILS} != "no" || ${MK_LLVM_CXXFILT} != "no" -SUBDIR+= llvm-cxxfilt -.endif - .if ${MK_CLANG_EXTRAS} != "no" SUBDIR+= bugpoint SUBDIR+= llc diff --git a/usr.bin/clang/llvm-cxxfilt/Makefile b/usr.bin/clang/llvm-cxxfilt/Makefile index f9621da8da89..98cc5c09f4c4 100644 --- a/usr.bin/clang/llvm-cxxfilt/Makefile +++ b/usr.bin/clang/llvm-cxxfilt/Makefile @@ -22,9 +22,7 @@ DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} -.if ${MK_LLVM_CXXFILT} != "no" LINKS= ${BINDIR}/llvm-cxxfilt ${BINDIR}/c++filt MLINKS= llvm-cxxfilt.1 c++filt.1 -.endif .include "../llvm.prog.mk"