From nobody Mon Oct 05 20:13:55 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 4hz9ZX24n2z6vLLQ for ; Mon, 05 Oct 2026 20:13:56 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hz9ZX157wz4ypm for ; Mon, 05 Oct 2026 20:13:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791231236; 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=i6FfsEYYzx1L30WND7YDFYrWbAQTN77Y/8tomx4zVHk=; b=qoclaNpGyBzlrHUer1xOZd4IZQ5j9HKkDw5Fxi6YmPlAyHPqFPF/rQirH+hyMm5Xzjia86 zmGRo/YTN+FKDAhvvRvHUuNAASZ2u+xJZaK0UqsZELvGdz8sYlFj1pOr6t6Ps83hYDfXJe L7J+xv6d6fbwg51wGz55ot7eY8KtjUWblKLH1Rg1JUlveEdTtOczAIgvKOREsMTqmXeHpB GDhAM/iU9tb5vR9pMkoRPQCDg0yRpG6Vwo4hZSnA3pbzP4KNMYlnJvTVXx1a3TlhlBhFi0 GuxNs5AQRxkollypJGI3MWO92kdOYXGoRYjGgTXG6jgzQdNsR94dvWegpz0VHQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791231236; b=nUiP+VZGp55hi32/+OJnVcCMF/UnXmNouJN4oq33t2NXNThNCrn650P1rTOJconYbBsxzW vtKxzrfglMfaINWMVJVUg6wr/QGQLM4fTufp2w0ZRXWXVktpHpO0pUY0mMm2NepblvW/9D jab+wlZ1T9WaOv4SRWVBhZAU4WSNicL/bzXnstwPxCcptgmliTaoCzJWQV3TVbY2/s3uFn yvWRtZBNPHZ/9Zr3XTxVYoyBRI/BOAHO71+T+nHcen82TQdXuG6VsHsEVJXECLshyOQLZD nNPjAz76p0Fx76+pHnaLGkfWNKKy0U2637nIGtlmhPdILGL2KvOadPjULQQOKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791231236; 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=i6FfsEYYzx1L30WND7YDFYrWbAQTN77Y/8tomx4zVHk=; b=ZlqudDdOuWsNn5H602hsH3xVwNa383LFGZwQmqlUfTqNrZyotWnvkgfzDHJywRke1WWZxd kba8LoWrcuUdoqhOdbq7caso6ncCdu6k83FAucW5YvyglZk6HmEgw3A8+3/zZKyY/ol+W9 vmhP9Jhi8ClTPLZHYpghoLFnbkupuL4nyhwEBOBcjbMtoL6ZzxcvIATYQEMv2BdtMhxtgZ 8F3W1RIHnAs7N6z8KHbtDyM3ehEOrx3RJGTa+Gsb3CXMOpOBWyk4iWSLXNJc38rLlF1T5o gsQrrl4Zov5rkZ2SsMFFMdX66geZgx2nc9nrCjCvZzeoHwdy3zGa8VnIIle1iA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hz9ZW6YbXzc7R for ; Mon, 05 Oct 2026 20:13:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 459b2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 05 Oct 2026 20:13:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Siva Mahadevan Subject: git: b45d14d3d665 - main - sys.mk: CTFMERGE: don't assume objfiles always have CTF sections 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b45d14d3d665e0253391924e5c0595c259b8a773 Auto-Submitted: auto-generated Date: Mon, 05 Oct 2026 20:13:55 +0000 Message-Id: <6ac40503.459b2.1f2f63c2@gitrepo.freebsd.org> The branch main has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=b45d14d3d665e0253391924e5c0595c259b8a773 commit b45d14d3d665e0253391924e5c0595c259b8a773 Author: Siva Mahadevan AuthorDate: 2026-10-05 20:13:16 +0000 Commit: Siva Mahadevan CommitDate: 2026-10-05 20:13:36 +0000 sys.mk: CTFMERGE: don't assume objfiles always have CTF sections There are many instances, e.g. in the kernel, where object files don't have CTF sections, but still need to be merged into one that does have a CTF section. This fixes cases like the following: -------------------------------------------------------------- >>> stage 3.1: building everything -------------------------------------------------------------- linking kernel.full ctfmerge -t -L VERSION -g -o kernel.full ... ERROR: ctfmerge: Input file force-dynamic-hack.pico was partially built from C sources, but no CTF data was present Removing kernel.full kernel.full --- [kernel.full] Error code 1 This partially reverts commit fdd3f6f78888b02a1bfa69a0572317413dc14a45. PR: 299013 Reported by: markj Reviewed by: markj, emaste Fixes: fdd3f6f78888 ("bsd.lib.mk: only ctfmerge if objfiles have a CTF section") Differential Revision: https://reviews.freebsd.org/D60378 --- share/mk/sys.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/sys.mk b/share/mk/sys.mk index f63223e8464e..bb943d2b1519 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -165,7 +165,7 @@ CPP ?= cpp CTFFLAGS ?= -L VERSION CTFCONVERT ?= ctfconvert -CTFMERGE ?= ctfmerge -t +CTFMERGE ?= ctfmerge .if defined(CFLAGS) && (${CFLAGS:M-g} != "") CTFFLAGS += -g