From nobody Mon Oct 05 19:35:28 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 4hz8kC2fY7z6vJJM; Mon, 05 Oct 2026 19:35:31 +0000 (UTC) (envelope-from markj@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hz8kC0xTrz4sCy; Mon, 05 Oct 2026 19:35:31 +0000 (UTC) (envelope-from markj@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791228931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=EvmBAgGvQUiMHzVLdVqfiKkE2GdpF1NogKo1OXr7aT4=; b=JXaMnhG21w+RpZ5n2QOu9Q++N0oXntvaE+B+/lmgXBocfIy3ZXeK2sPPWi7pbM+EH4DE1H MNntmpyVR+gCEakobpX1QYHYP4IDug3qhumz78jWKGxTo3TSHgZI6Ek1GI8YwN5mrBXWHx Mk/ylbxGVjzlPA1YPLAzkh3Kgm1Qte+5FUkEd98pIpIFrpmhY8f25Yk6Z9KppGmVl8oMrx 8UQjX+nybjIib7aDdousw1xeetStfnMJkxnX+b+/+QOcN2YLDg2taI4kvpNXDYKgjzKeI2 A9dgOzjCGH+h/VslsrkGVbaQknt8zVYrPxarDI0v7f8ftlG7NxOWNYniWeLD0Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791228931; b=oyLUNhaQyA6kQMjlQJxzu7kvkJgIzmc0vrbBdTpJMg+KIZqj/teF/BG0p84hednMTqpUj6 2OJgjsno/7ght0J7el7jsU5Y5twYcOl0zOGrwhAFMHpBBINLR0A4ok6PBEfL/KRIe+ENBd 2e7hro2aEN+x+P35+dtkeFE12DMyBhqt2q46y93C8/8Utj7LlXLCbQJjRQMjJQux8H1ZYy p1vUfMi/KGjpfsS7Ui9z692LrqDD1bhdi9R5nE8Kqj6zIjnJPFGZAuQwqwHnD7w+CazGDL ZKYkcw+sJCifKd7eSSrbl+ECA+VxSEnItULw8g1G1pBBtNWq2s1baPZzAqQDXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791228931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=EvmBAgGvQUiMHzVLdVqfiKkE2GdpF1NogKo1OXr7aT4=; b=L8JE4paOsxU9efosEnQbKJ4Cp4qW6fuXj77Ms4YO09WKOJpyuMHVIt9vPqXL/A5wMO3Pjy ORk8pjSkPqSoAa7xgwYmYIDdjhGijp0Mdw97aYNOuG0tt7C6ftDExN8/2b+hUDG+a1wMC6 yPCLwqMdBBz5djguLokWdSEwbq//OsHuydk79OwHU93KODliP7jf4CG1saxXE5P0O3+HwW fweMBuTvXhiidJmwHxD6yKXodfpfvDAc+bCelKoaAiwOywulfgZjXMFhr2ZNaA0CKD367h oAO0O+wyvqDQMFZxKl/7c7dgf2YNUJARH9UUhYf3N419EUWN0L/aQ1LVSUN77A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from nuc (198-84-224-249.cpe.teksavvy.com [198.84.224.249]) (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 did not present a certificate) (Authenticated sender: markj) by smtp.freebsd.org (Postfix) with ESMTPSA id 4hz8kB4xL2zj0x; Mon, 05 Oct 2026 19:35:30 +0000 (UTC) (envelope-from markj@freebsd.org) Date: Mon, 5 Oct 2026 15:35:28 -0400 From: Mark Johnston To: Siva Mahadevan Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: fdd3f6f78888 - main - bsd.lib.mk: only ctfmerge if objfiles have a CTF section Message-ID: References: <6ac3af3d.446b4.721d30f1@gitrepo.freebsd.org> 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=us-ascii Content-Disposition: inline In-Reply-To: <6ac3af3d.446b4.721d30f1@gitrepo.freebsd.org> On Mon, Oct 05, 2026 at 02:07:57PM +0000, Siva Mahadevan wrote: > The branch main has been updated by siva: > > URL: https://cgit.FreeBSD.org/src/commit/?id=fdd3f6f78888b02a1bfa69a0572317413dc14a45 > > commit fdd3f6f78888b02a1bfa69a0572317413dc14a45 > Author: Siva Mahadevan > AuthorDate: 2026-10-02 19:54:55 +0000 > Commit: Siva Mahadevan > CommitDate: 2026-10-05 14:07:44 +0000 > > bsd.lib.mk: only ctfmerge if objfiles have a CTF section > > PR: 299013 > Reported by: Trond.Endrestol@ximalas.info > Reviewed by: emaste > Fixes: 222210c6a822 ("libgcc_s: add libgcc_s_asneeded.so wrapper for gcc 16") > MFC after: 3 days > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D60252 > --- > share/mk/bsd.lib.mk | 2 +- > share/mk/sys.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk > index e3b3d760ff28..5b7bed041b8f 100644 > --- a/share/mk/bsd.lib.mk > +++ b/share/mk/bsd.lib.mk > @@ -291,7 +291,7 @@ ${SHLIB_NAME_FULL}: ${SOBJS} > .endif > ${_LD:N${CCACHE_BIN}} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \ > -o ${.TARGET} -Wl,-soname,${SONAME} ${SOBJS} ${LDADD} > -.if ${MK_CTF} != "no" > +.if ${MK_CTF} != "no" && defined(SOBJS) && !empty(SOBJS) > ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} > .endif > > diff --git a/share/mk/sys.mk b/share/mk/sys.mk > index bb943d2b1519..f63223e8464e 100644 > --- a/share/mk/sys.mk > +++ b/share/mk/sys.mk > @@ -165,7 +165,7 @@ CPP ?= cpp > CTFFLAGS ?= -L VERSION > > CTFCONVERT ?= ctfconvert > -CTFMERGE ?= ctfmerge > +CTFMERGE ?= ctfmerge -t Is this part of the change intentional? It doesn't seem right. We may legitimately have object files without CTF info, I'm sure this happens in the kernel for instance. > > .if defined(CFLAGS) && (${CFLAGS:M-g} != "") > CTFFLAGS += -g >