From nobody Tue Jun 30 14:17:04 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 4gqQFw54W4z6kGG2 for ; Tue, 30 Jun 2026 14:17:24 +0000 (UTC) (envelope-from wschnr@googlemail.com) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gqQFv3P4Jz3QVF for ; Tue, 30 Jun 2026 14:17:23 +0000 (UTC) (envelope-from wschnr@googlemail.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of wschnr@googlemail.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=wschnr@googlemail.com; arc=pass ("google.com:s=arc-20260327:i=1") Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-493be364394so125125e9.1 for ; Tue, 30 Jun 2026 07:17:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1782829037; cv=none; d=google.com; s=arc-20260327; b=Jk+hY/znls4yOFkFE2Xz7eXW+NDtJQg2L16voNTwpV4pEFSIXHBZ7uq6/TSzXJE3Lk z7UYQSQkl3JBDxoFHgF9kaqus6s8Ib+sJ6Buh3AbHyJXePmLbUQkRThYz+zduLuIN5J3 Qijivq3CPlNdg5sduOi576cZP8Mxcr3dl4otRl5aAOc4JwMpmn2fZPIVk/1Wrqj7fzNn c0KW/FaHZxif4WYMnU8Sq9KWKUy7WB+0gq4unmbSPU7b4EaGveviUj8S082MtjgE+O62 p29gxVVKB2vrRFw1qrFKyxGwYHJDnWLTKKVsvrU4u9MGsouFdE1NTh4ZLA3bHQwHexOw 4goQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version; bh=Txyc8AdJcaYgq1hr3rdqyYVmBNnZllnQIuVm2ufnQG0=; fh=zgNwTU22iqkYjCtE36k+GsCMQibThYYVb0BaFh/mBec=; b=HRxp/MxagveVo6nTqH8YiU1QbIQgccKaZUcp7DJ6uWcnQP6cQU2GJr4p7rcMOwMdiG wcthTO7udaU6XbuPiCigVxCnCL0VDvNP+acyK1Qqnlqdzn+E87is22G/EZc1GnQJUCJ4 LZZez/Jk2OKVM4NB7jojm1vLophXGWFAtMG9AoTfWI1+3kFE4OJc58U78Y+kWb+TQUVN EK3LKvOWM1HgCnKVZJLkBucWl9dBBPe7qCEwpZ5KGMQWGwpCzRPllCNmkabsI+ZxebBF foIvlxk/CXpXVg9JkdlGG8sKSI7yDm3wg5NZun4aQsr6S8LZf5loRooV/5Y4294q78xE 7j2Q==; darn=freebsd.org ARC-Authentication-Results: i=1; mx.google.com; arc=none X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782829037; x=1783433837; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Txyc8AdJcaYgq1hr3rdqyYVmBNnZllnQIuVm2ufnQG0=; b=F1cwcHLAW7Kn9Dy0p9oOB4mNRkyuivr0dg1zTH77IVrVEi9IhuGh3qkeSTVkPfPZ2T oLbNFv68jYEzn2DjNa7QN88X4PwArQ+6FriF82Wu4RGpSJ2JOCpro95kpN7cGPI35Vst gcgdJ9gtqiTqKyql4HAX/DkWDQrYaTh9k9RxC3IsS+4bASyQT2pQScLZ2o5SPUyhDeMh uYgMgFszHbxlL8Yfd3KVLYHul4OFF5CzrbpjSgge1NTrmSQjQMXsU1boTqbMnfqO7bX+ JEPBCztZnAMX4UCp3vIRwdj0G4XqI0FR/jObqTVwN/tvEHbTCM8G2kU/bIktMJBVk2Rn LPWA== X-Forwarded-Encrypted: i=1; AFNElJ9BThZdIXBc4pTlofPbfTie7jnkqjhTkpPyRBBD6BEYaJStdD23NcMwcyh/TD4RaIy9iX1+N1wbanGR9VNE4k9O32KGfA==@freebsd.org X-Gm-Message-State: AOJu0Yx3ZID/7rqlfaVk3XjfSt8zInD8pu+GPDLwfSqobOBPc5ShNDRq bTlNW71yE3/t9SfOT4jCmpQZ7uB4qVnHqmwZrZbcqHd+ziG0Ann5ud0J7oO60uh7jHVca06qyUY Afu4YX0jDhRT2rgk+3bPzfI/hFLxcmAc= X-Gm-Gg: AfdE7cls1jNr6YKAGQglGsGJG1J3073e2MXgAMqD+OemfNLHZAD2cq5iZlAJavER2x5 Uavb52xAeT3mMiQYgaIsJaya78riVaneszfy2e0sSoXGq5PxkxGXJEFEUrQ4Ogz+idK8ITdZ1CS cUUR0Yz5++xkv5pq2YJ6/gGrAes6teBwpGK4epArsACp2+gx3KMV+H4nCcvuQAEfG5pw09B390I a+SEUK0aN2gLMy21ZYIufej5/txO5R/R1mB8TmrBognKWqEzaS8q9osOKzC7Kx9ePkapO4vnVRi h2ivLUpFXhcWXpWc4T8z1cNMJmivavcx8abBYC12ZH/bjmwv9Ip16lQZ/BH/yA== X-Received: by 2002:a05:600c:17ca:b0:493:a63b:1f62 with SMTP id 5b1f17b1804b1-493bc25b9a8mr19968615e9.16.1782829036395; Tue, 30 Jun 2026 07:17:16 -0700 (PDT) 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 References: <69f5387a.26bf3.36f56fa3@gitrepo.freebsd.org> In-Reply-To: <69f5387a.26bf3.36f56fa3@gitrepo.freebsd.org> From: Wolfram Schneider Date: Tue, 30 Jun 2026 16:17:04 +0200 X-Gm-Features: AVVi8Cdz42bJpb8ND1D8v-7KFhL5V3yUH_2Bpz-JIaJ3zhtzUMGDcrTAA2YN044 Message-ID: Subject: Re: git: c4f08d46c7f7 - main - llvm-*: Move all LLVM_BINUTILS symlinks to toolchain package To: Ed Maste Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Spamd-Result: default: False [-3.87 / 15.00]; ARC_ALLOW(-1.00)[google.com:s=arc-20260327:i=1]; NEURAL_HAM_MEDIUM(-1.00)[-0.999]; NEURAL_HAM_LONG(-0.99)[-0.994]; NEURAL_HAM_SHORT(-0.98)[-0.981]; FORGED_SENDER(0.30)[wosch@freebsd.org,wschnr@googlemail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; RCVD_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FREEMAIL_ENVFROM(0.00)[googlemail.com]; TO_DN_SOME(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.128.42:from]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; FROM_NEQ_ENVFROM(0.00)[wosch@freebsd.org,wschnr@googlemail.com]; FROM_HAS_DN(0.00)[]; MISSING_XM_UA(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.128.42:from]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_THREE(0.00)[4] X-Spamd-Bar: --- X-Rspamd-Queue-Id: 4gqQFv3P4Jz3QVF After running buildworld, I now see stale symlinks: ./tools/build/stale-symlink-buildworld.sh stale symlink detected: lrwxrwxr-x 1 wosch wheel 12 Jun 16 03:36 /scratch/tmp/wosch/freebsd/home/wosch/projects/freebsd-src-dev/amd64.amd64/tmp/usr/bin/c++filt -> llvm-cxxfilt stale symlink detected: lrwxrwxr-x 1 wosch wheel 8 Jun 16 03:36 /scratch/tmp/wosch/freebsd/home/wosch/projects/freebsd-src-dev/amd64.amd64/tmp/usr/bin/gcov -> llvm-cov stale symlink detected: lrwxrwxr-x 1 wosch wheel 12 Jun 16 03:36 /scratch/tmp/wosch/freebsd/home/wosch/projects/freebsd-src-dev/amd64.amd64/tmp/usr/bin/objdump -> llvm-objdump stale symlink detected: lrwxrwxr-x 1 wosch wheel 12 Jun 16 03:36 /scratch/tmp/wosch/freebsd/home/wosch/projects/freebsd-src-dev/amd64.amd64/tmp/usr/bin/readelf -> llvm-readelf any idea why this happens? -Wolfram On Sat, 2 May 2026 at 01:34, Ed Maste wrote: > > The branch main has been updated by emaste: > > URL: https://cgit.FreeBSD.org/src/commit/?id=c4f08d46c7f717cc8c66bf702c006765a5b6b1a9 > > commit c4f08d46c7f717cc8c66bf702c006765a5b6b1a9 > Author: Ed Maste > AuthorDate: 2026-03-06 14:46:18 +0000 > Commit: Ed Maste > CommitDate: 2026-05-01 23:33:51 +0000 > > llvm-*: Move all LLVM_BINUTILS symlinks to toolchain package > > Some of the LLVM binary utilities were included in the Clang package > (because they did not set an explicit PACKAGE). > > Add a new Makefile under clang/toolchain to create the symlinks and man > links for ar, c++filt, nm, and so on (without the llvm-* prefix) when > LLVM_BINUTILS is enabled (as it is by default). > > PR: 293610 > Reviewed by: bapt, ivy, brooks > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D55692 > --- > Makefile.inc1 | 3 ++- > packages/toolchain/Makefile | 6 ++++++ > usr.bin/clang/Makefile | 2 ++ > usr.bin/clang/llvm-ar/Makefile | 7 ------- > usr.bin/clang/llvm-cxxfilt/Makefile | 5 ----- > usr.bin/clang/llvm-nm/Makefile | 6 ------ > usr.bin/clang/llvm-objcopy/Makefile | 7 ------- > usr.bin/clang/llvm-readobj/Makefile | 5 ----- > usr.bin/clang/llvm-size/Makefile | 6 ------ > usr.bin/clang/llvm-symbolizer/Makefile | 5 ----- > usr.bin/clang/toolchain/Makefile | 35 ++++++++++++++++++++++++++++++++++ > 11 files changed, 45 insertions(+), 42 deletions(-) > > diff --git a/Makefile.inc1 b/Makefile.inc1 > index 3c93159645fd..b07b5f9c1a65 100644 > --- a/Makefile.inc1 > +++ b/Makefile.inc1 > @@ -3052,7 +3052,8 @@ _clang_libs= lib/clang > _llvm_binutils= usr.bin/clang/llvm-ar \ > usr.bin/clang/llvm-nm \ > usr.bin/clang/llvm-objcopy \ > - usr.bin/clang/llvm-size > + usr.bin/clang/llvm-size \ > + usr.bin/clang/toolchain > .endif > .if ${MK_USB} != "no" > _usb_tools= stand/usb/tools > diff --git a/packages/toolchain/Makefile b/packages/toolchain/Makefile > index 344f0d250b79..b47d931c2c10 100644 > --- a/packages/toolchain/Makefile > +++ b/packages/toolchain/Makefile > @@ -1,7 +1,13 @@ > +.include > + > WORLDPACKAGE= toolchain > SUBPACKAGES= dbg dev man > COMPAT_PKGS= dev > > PKG_SETS= devel > > +.if ${MK_LLVM_BINUTILS} != "no" > +PKG_DEPS.toolchain+= llvm > +.endif > + > .include > diff --git a/usr.bin/clang/Makefile b/usr.bin/clang/Makefile > index ac92b08a54cb..d86508829533 100644 > --- a/usr.bin/clang/Makefile > +++ b/usr.bin/clang/Makefile > @@ -22,6 +22,8 @@ SUBDIR+= llvm-readobj > SUBDIR+= llvm-size > SUBDIR+= llvm-strings > SUBDIR+= llvm-symbolizer > +SUBDIR+= .WAIT > +SUBDIR+= toolchain > .endif > > .if ${MK_CLANG_EXTRAS} != "no" > diff --git a/usr.bin/clang/llvm-ar/Makefile b/usr.bin/clang/llvm-ar/Makefile > index ee776a7c0d9e..10cd46bad4dc 100644 > --- a/usr.bin/clang/llvm-ar/Makefile > +++ b/usr.bin/clang/llvm-ar/Makefile > @@ -1,6 +1,5 @@ > .include > > -PACKAGE= toolchain > PROG_CXX= llvm-ar > MAN= llvm-ar.1 llvm-ranlib.1 > > @@ -10,10 +9,4 @@ SRCS+= llvm-ar.cpp > > LINKS+= ${BINDIR}/llvm-ar ${BINDIR}/llvm-ranlib > > -.if ${MK_LLVM_BINUTILS} != "no" > -SYMLINKS+= llvm-ar ${BINDIR}/ar > -SYMLINKS+= llvm-ranlib ${BINDIR}/ranlib > -MLINKS+= llvm-ar.1 ar.1 llvm-ar.1 ranlib.1 > -.endif > - > .include "../llvm.prog.mk" > diff --git a/usr.bin/clang/llvm-cxxfilt/Makefile b/usr.bin/clang/llvm-cxxfilt/Makefile > index 26a5d9e8975d..7d49ccb0a8d0 100644 > --- a/usr.bin/clang/llvm-cxxfilt/Makefile > +++ b/usr.bin/clang/llvm-cxxfilt/Makefile > @@ -22,9 +22,4 @@ DEPENDFILES+= ${TGHDRS:C/$/.d/} > DPSRCS+= ${TGHDRS} > CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} > > -.if ${MK_LLVM_BINUTILS} != "no" > -SYMLINKS= llvm-cxxfilt ${BINDIR}/c++filt > -MLINKS= llvm-cxxfilt.1 c++filt.1 > -.endif > - > .include "../llvm.prog.mk" > diff --git a/usr.bin/clang/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile > index 333513246cb6..68033ce3874f 100644 > --- a/usr.bin/clang/llvm-nm/Makefile > +++ b/usr.bin/clang/llvm-nm/Makefile > @@ -1,6 +1,5 @@ > .include > > -PACKAGE= toolchain > PROG_CXX= llvm-nm > > SRCDIR= llvm/tools/llvm-nm > @@ -23,9 +22,4 @@ DEPENDFILES+= ${TGHDRS:C/$/.d/} > DPSRCS+= ${TGHDRS} > CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} > > -.if ${MK_LLVM_BINUTILS} != "no" > -SYMLINKS+= llvm-nm ${BINDIR}/nm > -MLINKS+= llvm-nm.1 nm.1 > -.endif > - > .include "../llvm.prog.mk" > diff --git a/usr.bin/clang/llvm-objcopy/Makefile b/usr.bin/clang/llvm-objcopy/Makefile > index 13bbab97899f..ee9b13b18f13 100644 > --- a/usr.bin/clang/llvm-objcopy/Makefile > +++ b/usr.bin/clang/llvm-objcopy/Makefile > @@ -26,11 +26,4 @@ CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} > > LINKS= ${BINDIR}/llvm-objcopy ${BINDIR}/llvm-strip > > -.if ${MK_LLVM_BINUTILS} != "no" > -SYMLINKS+= llvm-objcopy ${BINDIR}/objcopy \ > - llvm-strip ${BINDIR}/strip > -MLINKS= llvm-objcopy.1 objcopy.1 \ > - llvm-objcopy.1 strip.1 > -.endif > - > .include "../llvm.prog.mk" > diff --git a/usr.bin/clang/llvm-readobj/Makefile b/usr.bin/clang/llvm-readobj/Makefile > index 3f705431e509..b669e4398fc3 100644 > --- a/usr.bin/clang/llvm-readobj/Makefile > +++ b/usr.bin/clang/llvm-readobj/Makefile > @@ -35,9 +35,4 @@ CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} > > LINKS+= ${BINDIR}/llvm-readobj ${BINDIR}/llvm-readelf > > -.if ${MK_LLVM_BINUTILS} != "no" > -SYMLINKS+= llvm-readelf ${BINDIR}/readelf > -MLINKS+= llvm-readelf.1 readelf.1 > -.endif > - > .include "../llvm.prog.mk" > diff --git a/usr.bin/clang/llvm-size/Makefile b/usr.bin/clang/llvm-size/Makefile > index 1991065b61b2..c1b7c770acfb 100644 > --- a/usr.bin/clang/llvm-size/Makefile > +++ b/usr.bin/clang/llvm-size/Makefile > @@ -1,6 +1,5 @@ > .include > > -PACKAGE= toolchain > PROG_CXX= llvm-size > > SRCDIR= llvm/tools/llvm-size > @@ -23,9 +22,4 @@ DEPENDFILES+= ${TGHDRS:C/$/.d/} > DPSRCS+= ${TGHDRS} > CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} > > -.if ${MK_LLVM_BINUTILS} != "no" > -SYMLINKS+= llvm-size ${BINDIR}/size > -MLINKS+= llvm-size.1 size.1 > -.endif > - > .include "../llvm.prog.mk" > diff --git a/usr.bin/clang/llvm-symbolizer/Makefile b/usr.bin/clang/llvm-symbolizer/Makefile > index 1a3a65c774c9..231aeec849c2 100644 > --- a/usr.bin/clang/llvm-symbolizer/Makefile > +++ b/usr.bin/clang/llvm-symbolizer/Makefile > @@ -25,9 +25,4 @@ CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} > > LINKS+= ${BINDIR}/llvm-symbolizer ${BINDIR}/llvm-addr2line > > -.if ${MK_LLVM_BINUTILS} != "no" > -SYMLINKS+= llvm-addr2line ${BINDIR}/addr2line > -MLINKS+= llvm-addr2line.1 addr2line.1 > -.endif > - > .include "../llvm.prog.mk" > diff --git a/usr.bin/clang/toolchain/Makefile b/usr.bin/clang/toolchain/Makefile > new file mode 100644 > index 000000000000..1a7db32274e3 > --- /dev/null > +++ b/usr.bin/clang/toolchain/Makefile > @@ -0,0 +1,35 @@ > +.include > + > +.if ${MK_LLVM_BINUTILS} == yes > +PACKAGE= toolchain > + > +SYMLINKS+= llvm-ar ${BINDIR}/ar > +SYMLINKS+= llvm-ranlib ${BINDIR}/ranlib > +MLINKS+= llvm-ar.1 ar.1 llvm-ar.1 ranlib.1 > + > +SYMLINKS+= llvm-cov ${BINDIR}/gcov > + > +SYMLINKS+= llvm-cxxfilt ${BINDIR}/c++filt > +MLINKS+= llvm-cxxfilt.1 c++filt.1 > + > +SYMLINKS+= llvm-nm ${BINDIR}/nm > +MLINKS+= llvm-nm.1 nm.1 > + > +SYMLINKS+= llvm-objcopy ${BINDIR}/objcopy > +SYMLINKS+= llvm-strip ${BINDIR}/strip > +MLINKS+= llvm-objcopy.1 objcopy.1 > +MLINKS+= llvm-objcopy.1 strip.1 > + > +SYMLINKS+= llvm-objdump ${BINDIR}/objdump > + > +SYMLINKS+= llvm-readelf ${BINDIR}/readelf > +MLINKS+= llvm-readelf.1 readelf.1 > + > +SYMLINKS+= llvm-size ${BINDIR}/size > +MLINKS+= llvm-size.1 size.1 > + > +SYMLINKS+= llvm-addr2line ${BINDIR}/addr2line > +MLINKS+= llvm-addr2line.1 addr2line.1 > +.endif > + > +.include > -- Wolfram Schneider https://wolfram.schneider.org