diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2011-12-15 06:04:45 +0000 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2011-12-15 06:04:45 +0000 |
| commit | 7660940272c01cb2b7fd050a8536ae010e0dceaa (patch) | |
| tree | 1670564311068ff27eea4a2cdf405bdf7e337228 /usr/src/tools/ctf | |
| parent | 81ca4e34944095886c1bb147e9895a7975231577 (diff) | |
| parent | 7008f1545da64a57cad044b42e9841b3f53e75ee (diff) | |
| download | illumos-joyent-7660940272c01cb2b7fd050a8536ae010e0dceaa.tar.gz | |
Merge branch 'master' of http://github.com/illumos/illumos-gate into gcc/upgrade
Conflicts:
usr/src/uts/common/inet/ipf/netinet/ip_compat.h
usr/src/uts/i86pc/os/cpr_impl.c
Diffstat (limited to 'usr/src/tools/ctf')
| -rw-r--r-- | usr/src/tools/ctf/cvt/dwarf.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/usr/src/tools/ctf/cvt/dwarf.c b/usr/src/tools/ctf/cvt/dwarf.c index a7e97dfb23..ce8f6f9601 100644 --- a/usr/src/tools/ctf/cvt/dwarf.c +++ b/usr/src/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"); |