From a6ff6bd83fb76903ea32db9092dc0503f3c6abea Mon Sep 17 00:00:00 2001 From: snj Date: Mon, 29 Jun 2015 17:18:10 +0000 Subject: [PATCH] Pull up following revision(s) (requested by chs in ticket #855): external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c: revision 1.11 don't fail for anonymous unions. --- external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c b/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c index fe44e941c5e9..ce65ed7ffe8c 100644 --- a/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c +++ b/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c @@ -1162,6 +1162,14 @@ die_sou_resolve(tdesc_t *tdp, tdesc_t **tdpp __unused, void *private) continue; } + /* + * anonymous union members are OK. + * XXX: we should consistently use NULL, instead of "" + */ + if (mt->t_type == UNION && + (mt->t_name == NULL || mt->t_name[0] == '\0')) + continue; + printf("%s unresolved type = %d (%s)\n", tdesc_name(tdp), mt->t_type, tdesc_name(mt)); dw->dw_nunres++;