Module Name: src
Committed By: joerg
Date: Sat Feb 20 23:09:03 UTC 2016
Modified Files:
src/external/cddl/osnet/dist/tools/ctf/cvt: dwarf.c
Log Message:
Clang 3.7 and newer provide the array size via DW_AT_count, not via
DW_AT_upper_bound. Recognize the former as well as the latter.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c:1.16 src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c:1.17
--- src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c:1.16 Sat Feb 20 02:39:47 2016
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c Sat Feb 20 23:09:03 2016
@@ -693,6 +693,10 @@ tdesc_array_create(dwarf_t *dw, Dwarf_Di
ar->ad_nelems = uval + 1;
else if (die_signed(dw, dim, DW_AT_upper_bound, &sval, 0))
ar->ad_nelems = sval + 1;
+ if (die_unsigned(dw, dim, DW_AT_count, &uval, 0))
+ ar->ad_nelems = uval + 1;
+ else if (die_signed(dw, dim, DW_AT_count, &sval, 0))
+ ar->ad_nelems = sval + 1;
else
ar->ad_nelems = 0;
