From nobody Mon May 4 13:50:07 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 4g8NLm1Dj2z6bCZf for ; Mon, 04 May 2026 13:50:08 +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 4g8NLm0FGLz3Lf9 for ; Mon, 04 May 2026 13:50:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777902608; 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=mQvX1ja4zohP2AsiwwpxZEGExaJM2Uu9vo94L8sodvwD+KKdM+MpzgujlStXOj6JU1pSWY Dyw6xxb/L57DPm6W9vytar4MKutcUB/WfAYJnM6GCDEUSeUoPXcXn0QuaskDX4n0G5z/O4 QWfWXEhZ5/AZoU0xEXBTEaRg5OOjx6zzX1mQkQJDa0QYW5hpMWG10wZYKaGxNyiXJxoSxq bo6RtgWWFKuBhcZ9XyLbEqvSvpR4BChPHlhAtqN7xI/TDB7WVhtvJcS0RCL7NR0Cz4MSId UPPAh0bVcO5eNXbubqe5zNij2Lhi6Cx93PDbC1O2gdFI+2+l/cJb8NyBxR1LVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777902608; a=rsa-sha256; cv=none; b=jmMHT8fBPGgrcKxsw+kdsUlZJL+RywdW8+e/nVJyqckVNN3WCfQaeoGRuRZ9Gl+gqPjjwR PU/u0QglbDc5TbJ+A0LQhsWvU5M5aCQOzFwolEwQ/PBH+zlwuE9sB1cceeBGyrmNkYPHVZ LGg1R2/t03yoyOpxmyACfM/vEzOXQSaFINVfwr7AMvbAERf7Mun5VxL5+0b/UeeDso8eMS H9a6d6CR0R6fBVMCZ1ua9J3NlVfl6UnzluqWgYpwYlx6tImQnJLi1Yt/ojqg1TEVuDr2fR y88j5WZUVTdpbfIsaHdmA2Jl23Dkju7DvcNO1YsnS0dNl2Omx11OG65IQAaDLQ== 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=1777902608; 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=Rx6mXi7nEJpfFAL718WNT42qmohQ+ausFIuV045G5YoOuzvYgzX+0BWjm9fcUbTfPsrqrZ vzgd9DjUVAwWkB/CpNtmiQGTxcZdFQ/tK7GvG0pw4GJljiA2SadaPPnL3b8LWQC9CkUSDm 75yclHQdOJueVspJz5FM1ZsDL5ds1oVtDtbWgSoBno2A5ObVS+xCORH8a+BHpOJNPghiVS o4Z72tsNiFnsVRH20BXGuJ9kJ4o8jPLq2E1qPS1E/T1A4pySsDpfXyFiVM50vxUFJ873cV jBAZ25XayedsSjoKzmAF6V9081s7cgz3giOFK9KcETBuH83cGYryEQXTtA5hEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8NLl6yC4z732 for ; Mon, 04 May 2026 13:50:07 +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 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: 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