aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2012-07-18 10:19:06 +0000
committerMartin Matuska <mm@FreeBSD.org>2012-07-18 10:19:06 +0000
commitcb34095d8e1a1332b2757534f521866cf353a3d6 (patch)
tree6c2bfcc046208a747abbe38e03b45ff7b6aa3664 /tools
parent95fb2d6060707209df9ac0ef54c175e0332fd5dc (diff)
downloadsrc-cb34095d8e1a1332b2757534f521866cf353a3d6.tar.gz
src-cb34095d8e1a1332b2757534f521866cf353a3d6.zip
Update vendor/illumos/dist to pre libzfs_core state (dtrace and ctf part)
illumos-gate revision 13742:b6bbdd77139c Obtained from: ssh://anonhg@hg.illumos.org/illumos-gate
Notes
Notes: svn path=/vendor/illumos/dist/; revision=238582
Diffstat (limited to 'tools')
-rw-r--r--tools/ctf/cvt/dwarf.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/ctf/cvt/dwarf.c b/tools/ctf/cvt/dwarf.c
index a7e97dfb23a1..ce8f6f960166 100644
--- a/tools/ctf/cvt/dwarf.c
+++ b/tools/ctf/cvt/dwarf.c
@@ -23,8 +23,6 @@
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/*
* DWARF to tdata conversion
*
@@ -1832,8 +1830,11 @@ dw_read(tdata_t *td, Elf *elf, const char *filename)
}
if ((rc = dwarf_next_cu_header(dw.dw_dw, &hdrlen, &vers, &abboff,
- &addrsz, &nxthdr, &dw.dw_err)) != DW_DLV_OK ||
- (cu = die_sibling(&dw, NULL)) == NULL ||
+ &addrsz, &nxthdr, &dw.dw_err)) != DW_DLV_OK)
+ terminate("file does not contain valid DWARF data: %s\n",
+ dwarf_errmsg(dw.dw_err));
+
+ if ((cu = die_sibling(&dw, NULL)) == NULL ||
(child = die_child(&dw, cu)) == NULL)
terminate("file does not contain dwarf type data "
"(try compiling with -g)\n");