svn commit: r333885 - head/cddl/contrib/opensolaris/tools/ctf/cvt

Matt Macy mmacy at FreeBSD.org
Sat May 19 18:50:59 UTC 2018


Author: mmacy
Date: Sat May 19 18:50:58 2018
New Revision: 333885
URL: https://svnweb.freebsd.org/changeset/base/333885

Log:
  ctf dwarf: don't report "no dwarf entry" as if it were an error

Modified:
  head/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c

Modified: head/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c
==============================================================================
--- head/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c	Sat May 19 18:44:29 2018	(r333884)
+++ head/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c	Sat May 19 18:50:58 2018	(r333885)
@@ -1941,9 +1941,12 @@ dw_read(tdata_t *td, Elf *elf, char *filename __unused
 	}
 
 	if ((rc = dwarf_next_cu_header_b(dw.dw_dw, &hdrlen, &vers, &abboff,
-	    &addrsz, &offsz, NULL, &nxthdr, &dw.dw_err)) != DW_DLV_OK)
-		terminate("rc = %d %s\n", rc, dwarf_errmsg(dw.dw_err));
-
+		&addrsz, &offsz, NULL, &nxthdr, &dw.dw_err)) != DW_DLV_OK) {
+		if (dw.dw_err.err_error == 	DW_DLE_NO_ENTRY)
+			exit(0);
+		else
+			terminate("rc = %d %s\n", rc, dwarf_errmsg(dw.dw_err));
+	}
 	if ((cu = die_sibling(&dw, NULL)) == NULL ||
 	    (((child = die_child(&dw, cu)) == NULL) &&
 	    should_have_dwarf(elf))) {


More information about the svn-src-all mailing list