From nobody Mon Oct 05 19:55:01 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 4hz98l02r4z6vK8B; Mon, 05 Oct 2026 19:55:03 +0000 (UTC) (envelope-from siva@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 4hz98k6XxCz4vGl; Mon, 05 Oct 2026 19:55:02 +0000 (UTC) (envelope-from siva@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791230102; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bWPwTlSSlnx9J/gmUzCgI9JFRhwJXP8RvjmvE30xS7o=; b=O4Azv14x/Yt8ddhpAJBRJENkQhU+LW+cpE1TaOAqvVFku4lxltZQnxPCn/UeQ0rTck0P9F 9p0oGuuCQUxEcNeOjxh9zQHpfQs19HpOpQ0Cz4glx15k9jM1CyHtSmsBJoWcJub5BAA+EK 3vrnN2039PfdhX5ULsNAd8rFt+wr3nHhk/xT2ZU1OGUD/AEWgH/lh4KxDdSw+6rD/Mitsc LnK47iSVfP+WZyBw0DSQcb2vz2AxJhB6pAyHCZ7x9+pmIY/Ee+NNYI8jOTtQlaTrJJIG64 KnUjvq8+Bb8R8rcVVqs6o4ASKXRQUjhWvevCvhmQ6nTmCV2DD8QD7qPg3qHxGA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791230102; b=ZLIFhEVzJd4XJMeBgYsFO/nyq8ffJRd6d+zG7z5PJI0l3ru9arg1TOBnR/xeBfJLXB2YBJ 4VSwEgKrjveS4YPnEgKhBQZByh8ywGNDY5yRe1FYCgCIBhot6Lbn4zr46CfH8wilC4YsYR GjJj7qmsa9mk0dHxNYa+oDO+k4VYQiMGLo+e5CxeQU0XzqEfbB2FV/lswMK7GNaRCz0qQV YeQKCoAGuAhT5VLNyI+q5bZcqGMg8XJ2MW3aGmfNIEUad7CBZ7Q4MdYGE9kmzm1oNBODFu AO75AXpvHwzZ5D7i0/2g0gqaGbct4ufNUTXPTzy162OZNeCVWiG/mQf0dXrZKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791230102; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bWPwTlSSlnx9J/gmUzCgI9JFRhwJXP8RvjmvE30xS7o=; b=YBAEgVgQxLMxFG86KCAEJ++//2lPN9UqiRgpvdMSfcY2tu57eoY2RuS9sdL01r8v++e1vq aS7HxZ4k0gEl/2n038igX1oOO9+GS/E+hN9eRtoDeEaIMEb9E2VKzjtDuj9wSjTp7u5YNg wcq6swVB9VvEwrIpzJS0Q7+cNqQNYqTOLJUYvKvRoxgqySUQbaQu3D+2Z7KR5bBkBVZhEi xHEZ5ciAa8jrjjVAeAlESMRxN4kF4llqjbdRT0GqsywOI6p19DgbCpG+H6D5r8cME1elJB fQvPZ8fWQ6YIUm0bfFbLS7lRCE36HUXrLKtuHsDVEdAZVJi59taAArY8sPfnRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from localhost (unknown [IPv6:2606:6d00:f3a:e490:b79c:2c74:cd48:7dc9]) (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: siva/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4hz98k4Rp6zjTd; Mon, 05 Oct 2026 19:55:02 +0000 (UTC) (envelope-from siva@freebsd.org) 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Mon, 05 Oct 2026 15:55:01 -0400 Message-Id: Subject: Re: git: fdd3f6f78888 - main - bsd.lib.mk: only ctfmerge if objfiles have a CTF section From: "Siva Mahadevan" Cc: , , To: "Mark Johnston" X-Mailer: aerc 0.22.0 References: <6ac3af3d.446b4.721d30f1@gitrepo.freebsd.org> In-Reply-To: On Mon Oct 5, 2026 at 106:00 UTC, Mark Johnston wrote: > On Mon, Oct 05, 2026 at 02:07:57PM +0000, Siva Mahadevan wrote: >> The branch main has been updated by siva: >>=20 >> URL: https://cgit.FreeBSD.org/src/commit/?id=3Dfdd3f6f78888b02a1bfa69a05= 72317413dc14a45 >>=20 >> commit fdd3f6f78888b02a1bfa69a0572317413dc14a45 >> Author: Siva Mahadevan >> AuthorDate: 2026-10-02 19:54:55 +0000 >> Commit: Siva Mahadevan >> CommitDate: 2026-10-05 14:07:44 +0000 >>=20 >> bsd.lib.mk: only ctfmerge if objfiles have a CTF section >> =20 >> PR: 299013 >> Reported by: Trond.Endrestol@ximalas.info >> Reviewed by: emaste >> Fixes: 222210c6a822 ("libgcc_s: add libgcc_s_asneeded.so wr= apper 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(-) >>=20 >> 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} !=3D "no" >> +.if ${MK_CTF} !=3D "no" && defined(SOBJS) && !empty(SOBJS) >> ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} >> .endif >> =20 >> 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 ?=3D cpp >> CTFFLAGS ?=3D -L VERSION >> =20 >> CTFCONVERT ?=3D ctfconvert >> -CTFMERGE ?=3D ctfmerge >> +CTFMERGE ?=3D 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. > >> =20 >> .if defined(CFLAGS) && (${CFLAGS:M-g} !=3D "") >> CTFFLAGS +=3D -g >>=20 It was intentional, but made with the wrong understanding, thanks for reporting this. I've submitted D60378 for review as a fix.