D43878.diff
No OneTemporary
Actions

Size

683 B

Referenced Files

None

Subscribers

None

D43878.diff
View Options

	diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c b/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c
	--- a/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c
	+++ b/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c
	@@ -912,14 +912,8 @@
	*/
	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);