From nobody Mon May 4 13:50:07 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 4g8NLs2JRRz6bCZh for ; Mon, 04 May 2026 13:50:13 +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 4g8NLs1013z3LZb for ; Mon, 04 May 2026 13:50:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777902613; 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=CyNerDDuREPBwudkbmSgs+5HaYzwB4bJ6Wh9rO8yYDg=; b=M2ZW79uHkrHNCDaYjqdxPYUP34Q3/UhDonuVz375hfQdF7YJciwRbXRZPklFRFePqhYL+D BV3Jrmc/TPSOtH4YyKxqd3P3xI4g6UDkW9gV4KN9KUSJTyr4IpXYjFi/El5ly2vugWcttE xs9FiERmuGRgwIGe4rtBhuqe0h0fNzk4OxLBfaQ0gaw2/6KzrWeL/OIDZTlAZR99l2Thkc pGGAarK14mBRHvV5f6XyXjmYhOdl+QdKLhuPcn8AqCkSsj+XBUposDumUdmRtM9ah9QWZG WZ46oRhUKpIdIwvAezpKkz/PYbLxi+ANn6iEP2uR7c844UOjmcMIE0BLUWB2OA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777902613; a=rsa-sha256; cv=none; b=Px/5sfr09UusDFG3PsrM24PBQsH7vkFIIsyotkrcSEFegvcOjmdQz/oQcLMkimheYHkZN1 Z1ao1TGTE/MoalcBIa82+BTGSSw+LnM7t0gXrMFjoQuax4euw40xwDF8O4tBngRl2C8ADi sdKTDyj7abvycGFJeq7Bn6xSGsZmegR9ZuY2MqsJo2mAkO3VKb8Bv3yvS/77H1VJu9oBOJ 43djUWsBp53MNarhgwCRWT46oeWPR0kzbPBwI20++ImDH8XECXUtGOSkr1ZMnbkyYaZ2zG aqw4g16N56FjzNJ8FaWkfChRaRIGjqg3xPRGt81QGW/yC/RLMne27E/NN4qhKQ== 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=1777902613; 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=CyNerDDuREPBwudkbmSgs+5HaYzwB4bJ6Wh9rO8yYDg=; b=PxrQPrGYLfs6Q1D1HDnqH9t68zJ2fSvunfB0r75OSaE0NTHFVKqHzOsgi7+Ui4qTbrPRG3 QoxHF6l0zZejqM/MSSi8MvpPJXFU6x+ocxCwEQt+ZNfML/nbwZE/Y5aSxQjbQdthQEzpEF Zwlqx+bUmFJW4W+dAUWcDWotsId+DJT/trLC4IIiNnRS0/nTOkHC1amV3Z05w9y35fY/PE ZRECCZgK38r0qzW106mdqNr4JfrpuRzy9yszrc+4E2zK5KyYoDTzDgWl8nBrnlPaS31F88 GtBIsEN7NYjBmW6rgpDfpzG8Ym/c8sPwOUfufFbVOOQFrov8PVd3WyxF10JsBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8NLs04q8z70c for ; Mon, 04 May 2026 13:50:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41fd7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 13:50:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 045a9ef829fa - main - llvm: Don't install /usr/bin/{gcov,objdump} twice 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 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 045a9ef829fa30c2ba7af47ab34d3b2443024207 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 13:50:07 +0000 Message-Id: <69f8a40f.41fd7.1637cbcf@gitrepo.freebsd.org> The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=045a9ef829fa30c2ba7af47ab34d3b2443024207 commit 045a9ef829fa30c2ba7af47ab34d3b2443024207 Author: Lexi Winter AuthorDate: 2026-05-04 13:49:20 +0000 Commit: Lexi Winter CommitDate: 2026-05-04 13:49:20 +0000 llvm: Don't install /usr/bin/{gcov,objdump} twice Commit c4f08d46c7f7 moved the symlinks for the LLVM binutils from LLVM itself to the toolchain (usr.bin/clang/toolchain), but did not remove the links for /usr/bin/gcov and /usr/bin/objdump from the llvm version, meaning we installed them twice, once in the clang package and once in the toolchain package. Remove the links from the llvm version and move the MLINKs to toolchain, which is where the other MLINKs dwell. While here, fix toolchain to use the correct build option for llvm-cov, MK_LLVM_COV. Fixes: c4f08d46c7f7 ("llvm-*: Move all LLVM_BINUTILS symlinks to toolchain package") Reported by: jrm Reviewed by: jrm, dim, emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D56788 --- usr.bin/clang/Makefile | 1 + usr.bin/clang/llvm-cov/Makefile | 2 -- usr.bin/clang/llvm-objdump/Makefile | 3 --- usr.bin/clang/toolchain/Makefile | 4 ++++ 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/usr.bin/clang/Makefile b/usr.bin/clang/Makefile index d86508829533..1d80fad2936f 100644 --- a/usr.bin/clang/Makefile +++ b/usr.bin/clang/Makefile @@ -65,6 +65,7 @@ SUBDIR+= lldb-server .if ${MK_LLVM_COV} != "no" SUBDIR+= llvm-cov SUBDIR+= llvm-profdata +SUBDIR_DEPEND_toolchain= llvm-cov .endif .endif # TOOLS_PREFIX diff --git a/usr.bin/clang/llvm-cov/Makefile b/usr.bin/clang/llvm-cov/Makefile index 3c02d4b7d144..67a93fa593bb 100644 --- a/usr.bin/clang/llvm-cov/Makefile +++ b/usr.bin/clang/llvm-cov/Makefile @@ -1,8 +1,6 @@ .include PROG_CXX= llvm-cov -SYMLINKS= llvm-cov ${BINDIR}/gcov -MLINKS= llvm-cov.1 gcov.1 SRCDIR= llvm/tools/llvm-cov SRCS+= CodeCoverage.cpp diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile index 86281217ee0a..c0c201b68085 100644 --- a/usr.bin/clang/llvm-objdump/Makefile +++ b/usr.bin/clang/llvm-objdump/Makefile @@ -29,7 +29,4 @@ DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} -SYMLINKS= llvm-objdump ${BINDIR}/objdump -MLINKS= llvm-objdump.1 objdump.1 - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/toolchain/Makefile b/usr.bin/clang/toolchain/Makefile index 1a7db32274e3..5f66ae1433b1 100644 --- a/usr.bin/clang/toolchain/Makefile +++ b/usr.bin/clang/toolchain/Makefile @@ -7,7 +7,10 @@ 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 @@ -21,6 +24,7 @@ MLINKS+= llvm-objcopy.1 objcopy.1 MLINKS+= llvm-objcopy.1 strip.1 SYMLINKS+= llvm-objdump ${BINDIR}/objdump +MLINKS= llvm-objdump.1 objdump.1 SYMLINKS+= llvm-readelf ${BINDIR}/readelf MLINKS+= llvm-readelf.1 readelf.1