From nobody Mon Oct 05 14:07:57 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 4hz1SF6LbVz6jv1Y for ; Mon, 05 Oct 2026 14:07:57 +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 4hz1SF5jfQz3D6p for ; Mon, 05 Oct 2026 14:07:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791209277; 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=Q2jklzUOzJWRFSDg+4PZQZe3VxjZR46t3HI8zb6/H3M=; b=n2nJvZzkMroAdiXM0hlRGyoZDS+3MmY5ZYY0bTNXXPKRGvz+VMOQeMG2PuDNU6eLD8YN4K 6SsfUi1CKSXQWcY69AxcngaERxeykgTJ16PgZRovYLuD3k6Gb5KJ6LKV+WFYUOjKCjNS9k +ooax0oQx+SfaRx5DO+suX3F1s+/msMCa0rwtYd4VhboGGhyEL2yJUN00Z95Og6HE00pdH wP4bJMThv3tBXaEGlhLxG2eVonRhgldcBTbmFxfZmPSh86caDpBVKJqukCSK7ZnZN1jtYH Vxzx4FZKq2VNp8Mb+Oyt7sg8RbqtWQJRPzc6sAjjwgONYbSce5uLVQwb0sbF6g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791209277; b=ff0kZYabXsd2y/LlbL8+61xlTc/10SpZYS9UXr2aS553VKwnAHJ0zl3xlL2wHmuYXAh6Y9 pFq6YFQbMQiInopGq54JADcVgG3n6nz2/vS8Y6In1yYKlNbg5zyrPTPZLU7G/lzBJg5c/A 2qVhLnpsj0OmzEx6SnCv3a1LRQzAHfYTXsQm79Zd8CFYSWPGZaqEegi+y1L9nmO4k7CLm5 RSFGLYuE2A0UjhAmeUGzINJJYhqHTIs0GGvKI+Vocz0LKPCeoe+hnfnUDFOUWPA7JTcVpv YlIz5NO4459lYoKcnzesHp9JKbZZwhUeRQs1wSUEhXr9lA6soiPasVyseGmNtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791209277; 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=Q2jklzUOzJWRFSDg+4PZQZe3VxjZR46t3HI8zb6/H3M=; b=jMWNK+CJ04xozW5cMbhZGS6xT8LgfFLOcC5KZglWet8r7Pp62yOP9IMgsYe/cmE3miITzr MB6UzwikP0HigP4ByWeQkI15WhNZa1Qv2vTc4tQD3+6ZOfBDqocEERF2xJ5IYpwU3mBxFI hoyFYiwXBL4U4yTWsZgX49FWtGF1cTyrd2QCmAGEc+KU8+M5fzWJXMXuVJycmKzoma0B1W h1YiyH6yQI+ob7jrgD17lqo11MOpz4SNRKhfq9Chq5x/lkSyK6jmZcXhx9vfSCmreq0Bk5 bB/kWeR48Fwz0tjs296o806HL0OmO9LwWmV7JouFz/MmVdXKDcaVo9heVk69wg== 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 4hz1SF4mnbzMbY for ; Mon, 05 Oct 2026 14:07:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 446b4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 05 Oct 2026 14:07:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Siva Mahadevan Subject: git: fdd3f6f78888 - main - bsd.lib.mk: only ctfmerge if objfiles have a CTF section 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fdd3f6f78888b02a1bfa69a0572317413dc14a45 Auto-Submitted: auto-generated Date: Mon, 05 Oct 2026 14:07:57 +0000 Message-Id: <6ac3af3d.446b4.721d30f1@gitrepo.freebsd.org> 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 .if defined(CFLAGS) && (${CFLAGS:M-g} != "") CTFFLAGS += -g