From owner-svn-src-stable-11@freebsd.org Wed Aug 31 01:26:22 2016 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ABCA5BC7206; Wed, 31 Aug 2016 01:26:22 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 713B5187; Wed, 31 Aug 2016 01:26:22 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7V1QLDU059080; Wed, 31 Aug 2016 01:26:21 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7V1QL5H059078; Wed, 31 Aug 2016 01:26:21 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201608310126.u7V1QL5H059078@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Wed, 31 Aug 2016 01:26:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r305105 - stable/11/cddl/contrib/opensolaris/tools/ctf/cvt X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Aug 2016 01:26:22 -0000 Author: markj Date: Wed Aug 31 01:26:21 2016 New Revision: 305105 URL: https://svnweb.freebsd.org/changeset/base/305105 Log: MFC r304055: Fix handling of forward enum declarations in the CTF tools. Modified: stable/11/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c stable/11/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Directory Properties: stable/11/ (props changed) Modified: stable/11/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c ============================================================================== --- stable/11/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Wed Aug 31 01:04:57 2016 (r305104) +++ stable/11/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Wed Aug 31 01:26:21 2016 (r305105) @@ -816,6 +816,11 @@ die_enum_create(dwarf_t *dw, Dwarf_Die d Dwarf_Unsigned uval; Dwarf_Signed sval; + if (die_isdecl(dw, die)) { + tdp->t_type = FORWARD; + return; + } + debug(3, "die %llu: creating enum\n", off); tdp->t_type = ENUM; Modified: stable/11/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c ============================================================================== --- stable/11/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Wed Aug 31 01:04:57 2016 (r305104) +++ stable/11/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Wed Aug 31 01:26:21 2016 (r305105) @@ -338,7 +338,8 @@ fwd_equiv(tdesc_t *ctdp, tdesc_t *mtdp) { tdesc_t *defn = (ctdp->t_type == FORWARD ? mtdp : ctdp); - return (defn->t_type == STRUCT || defn->t_type == UNION); + return (defn->t_type == STRUCT || defn->t_type == UNION || + defn->t_type == ENUM); } static int