From nobody Mon Mar 25 22:27:30 2024 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 4V3SH64yNwz5FRQR; Mon, 25 Mar 2024 22:27:30 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V3SH64S88z49ph; Mon, 25 Mar 2024 22:27:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711405650; 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=W0sSloBhYCOlMmChykv00b9iby6EQtpfvmwiY8UEeZQ=; b=X+4ofTOXUF2iVUdEV/vUV+kHBgll+UH1cWhm6JipJusq1eHTe5rwwRqngd6gYRs3gB75bD GJMhcoOyEWCqDRVpWbN+0aCPzTZhvFxf499dwG6ckb2VFSLn3QtBqybnGDOesi23RuqxAd CnQ8Et129zeIK8cJj1BEMxGKByFW/gZUhoY7cAR8YRxZ1sapLE7eZ9iN/1Z22hrDAnagmx kXEXRZ83DaOu0tKvykbsWGzmve2gArhS4UWs8yAgWZOx784bSYJxHOUzYSU1KzGyFPtEi+ hX36PPqgg8lxo6e6KlAMNLiLT7FhGnUmXx9JsF0rpiHRLh2N19iF3t50ikZXLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711405650; a=rsa-sha256; cv=none; b=NZBWTxuKeHbetSzIPOsW1Zo2Hr8moQ7KANMll1rvavWUHvsljJMVnDDeBYvnhnEZpDI3J7 UTc+0xiUwLt3y8rdkghk9u/cYjzoOtaQdtm40y6cQmWEJbpLOkksCI9bh7QZzBqz2f1RFy xC7VAkaPNqk++Zt+8WzENRR1vbIJiXob7q81Q8SrbnyJl9jprL1MwcBR16P5fyqUVCzvNt Q8dKQe/dnYo/iN4FU/Z3oBF6NoFhvb+1fN88jaDL4jsLSsvHK0qcPKAN+lnh2rEvq91a4B vi0K20gp9CBYpsnis65l/cll8pfY5utOfu7odu87ukaxK8fZLzt6tBTpA2iA7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711405650; 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=W0sSloBhYCOlMmChykv00b9iby6EQtpfvmwiY8UEeZQ=; b=pJqqkCudKT4URxJLvDKjIuWn19CaWI++b3Y0qncm7ppBA8BPytSxFLB4rXN1FR4TLT4sYr IVASWk2Zs0eYHmRumEo+oAQpD49kjQkcQD6tAuf4WICt32oklKYXqR3ymWoq46fZ4P84nj 5a9FDrLmk2r0yy/VFxL2GvXXKVBlQ6BT524thutVFoN6fXlsM7r+OnKaHFMkLpY1j9iizw QXOw3DWjqDWI3v0ZppKGWaC18hMkTM+oJbi2jVBx77I92E/7vx/csZc9SKpMfTVrOr03nv 23urSJAKXIBcL3bVSOfYic+MB46tJUQdqwHl2IhMfMSqitbcPiqQz044jkuWLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V3SH643XFzYtr; Mon, 25 Mar 2024 22:27:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42PMRUWj043326; Mon, 25 Mar 2024 22:27:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42PMRU4D043323; Mon, 25 Mar 2024 22:27:30 GMT (envelope-from git) Date: Mon, 25 Mar 2024 22:27:30 GMT Message-Id: <202403252227.42PMRU4D043323@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 49e126a03b6b - stable/14 - ctfmerge: demote "No ctf sections found" to a warning 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 49e126a03b6bebb17855fd830b2206c86f5eaa9a Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=49e126a03b6bebb17855fd830b2206c86f5eaa9a commit 49e126a03b6bebb17855fd830b2206c86f5eaa9a Author: Ed Maste AuthorDate: 2024-02-14 14:48:42 +0000 Commit: Ed Maste CommitDate: 2024-03-25 22:27:08 +0000 ctfmerge: demote "No ctf sections found" to a warning If there are no CTF sections then ctfmerge just has nothing to do; it should not be an error. Note that ctfmerge has an option to require CTF: -t Make sure that all object files have a CTF section. Before this change, this option explicitly exited without error if none of the object files have CTF sections, with the comment: If we're verifying that C files have CTF, it's safe to assume that in this case, we're building only from assembly inputs. PR: 276930 Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43878 (cherry picked from commit 95ca89cda1a6c4e0ef0b3f765c6563f1db0d23fa) --- cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c b/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c index 27aa4d01b03d..c5be22ecfa1b 100644 --- a/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c +++ b/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c @@ -912,14 +912,8 @@ main(int argc, char **argv) */ if (read_ctf(ifiles, nifiles, NULL, merge_ctf_cb, &wq, require_ctf) == 0) { - /* - * If we're verifying that C files have CTF, it's safe to - * assume that in this case, we're building only from assembly - * inputs. - */ - if (require_ctf) - exit(0); - terminate("No ctf sections found to merge\n"); + warning("No ctf sections found to merge\n"); + exit(0); } pthread_mutex_lock(&wq.wq_queue_lock);