upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-04 06:15:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ctfmerge: demote "No ctf sections found" to a warning

Browse source 
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 95ca89cda1)
This commit is contained in:
Ed Maste 2024-02-14 09:48:42 -05:00
parent 8dd42c55ec
commit 49e126a03b
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c
View file

@ -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);