From nobody Wed Feb 14 20:53:21 2024 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 4TZr4x3JkKz52sVy; Wed, 14 Feb 2024 20:53:21 +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 4TZr4x2nxsz4tYJ; Wed, 14 Feb 2024 20:53:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707944001; 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=ZMheKOdb+wb9ScQ60XzkbKfA/2TstGzWraeOBLdmwBQ=; b=kjE+Gz/MI7vh3s9uehA2rZVqs0qfMyeGV/AQiWmSqF1QOrMhxUh98VsHjN7yOrqZBw4ODW 9jvGDxTmv8gZPjjObbXKsEbI4qbxstbDwKgdXIqzDXOlWhAIOo0+Ztu/Vdkq5kx1NXT+vj 0hhbSf2B4uvyc7P93hgTCweDpA6iOuylPSSvWNjy10Q+LLrYCZUkbUuF7oWqZQwxCMKq0m ayBA/fUOdv5GQSqxEkect1p1klKacsPOLG7ToB0o8Hh/1zgrFG3MwfEq/1nCrDb5oquXiQ nT6RJ8AdhQxOEPsDaOk1CLVS7JLHCaFVWZDi6W7OF6WWnBjPNkR3jP4d9YEX8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707944001; a=rsa-sha256; cv=none; b=MvojYy5q7sjjkQfjvBN2QJh5UGAHNgXGTruCJn9XD/897LIgiBrTP2fKLdEbhgwg8xgtb2 7RNdR3EGoRwuMdpAybwFN4n62BN0rYjREqgVPv+xh7hin7Iy56d5rjtcfjvzWWG339qQU1 XgsW+LOWd+uG2Q8p8loTC20O/xCx29Uy+unr4vAEE/HfF1Ej17x6LivikJS9GSjBiNooYV TlmhVw9F8I6BuLWnUaMK+xAWUvcdNSbAae2WMdZ+lPMX9ZCyVZx6f/UVh/K4PK/4Ao0vpg LIZYN9sNPRO0DQtDifJ7w7WUQQBRVHVpfA616/00N6VP0e7wX2UlFSwC63R1sw== 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=1707944001; 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=ZMheKOdb+wb9ScQ60XzkbKfA/2TstGzWraeOBLdmwBQ=; b=rSkGZwjF2bUSYzs1uIuFirdkVwOf8Q1AIz9KZTcLwqN4jRbLT6BQm2+HU5VA+0/gdvT0lA 9l6hmYVKD84SNciBnpo3FhbEkJeA+LLTbXuaZfgDTC9rrr4PFlk2k9iCYQxOAf2AIEbRBK NZWVEq9cOVHVohY9CxBpqMyAYqNb+Um2CFg06nsqS4NQ6PcyuV/AxSCCbibGkpvgcLJIyf ViBD8/vPkAJPX7lPN4Aj2pre2jM5HM4AKk9JWwdfCGSF9f4bBANw+L9LdwzwfovdaEkRX7 yfvUYcDTrDcwB3x9UivKU9FxgttGIMM5UMCN9/Yk1JX8pvI0YvfrZ5+CIhN9lA== 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 4TZr4x1rnZz1Cmp; Wed, 14 Feb 2024 20:53:21 +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 41EKrLYQ085132; Wed, 14 Feb 2024 20:53:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41EKrLW2085129; Wed, 14 Feb 2024 20:53:21 GMT (envelope-from git) Date: Wed, 14 Feb 2024 20:53:21 GMT Message-Id: <202402142053.41EKrLW2085129@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 95ca89cda1a6 - main - ctfmerge: demote "No ctf sections found" to a warning 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 95ca89cda1a6c4e0ef0b3f765c6563f1db0d23fa Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=95ca89cda1a6c4e0ef0b3f765c6563f1db0d23fa commit 95ca89cda1a6c4e0ef0b3f765c6563f1db0d23fa Author: Ed Maste AuthorDate: 2024-02-14 14:48:42 +0000 Commit: Ed Maste CommitDate: 2024-02-14 20:53:11 +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 --- 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);