From 3895dd38ecf4dc422d3e1656844a051e0aa5d06c Mon Sep 17 00:00:00 2001 From: mmacy Date: Sat, 19 May 2018 18:50:58 +0000 Subject: [PATCH] ctf dwarf: don't report "no dwarf entry" as if it were an error --- cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c b/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c index 8c958693e08e..d97d00e68c29 100644 --- a/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c +++ b/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c @@ -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))) {