From owner-svn-src-projects@FreeBSD.ORG Sat Jan 25 11:27:09 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9922626D; Sat, 25 Jan 2014 11:27:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 862C71854; Sat, 25 Jan 2014 11:27:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0PBR9h4070419; Sat, 25 Jan 2014 11:27:09 GMT (envelope-from kaiw@svn.freebsd.org) Received: (from kaiw@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PBR9mr070418; Sat, 25 Jan 2014 11:27:09 GMT (envelope-from kaiw@svn.freebsd.org) Message-Id: <201401251127.s0PBR9mr070418@svn.freebsd.org> From: Kai Wang Date: Sat, 25 Jan 2014 11:27:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r261154 - projects/elftoolchain/cddl/contrib/opensolaris/tools/ctf/cvt X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Jan 2014 11:27:09 -0000 Author: kaiw Date: Sat Jan 25 11:27:09 2014 New Revision: 261154 URL: http://svnweb.freebsd.org/changeset/base/261154 Log: Simplify DWARF version check. Submitted by: emaste Modified: projects/elftoolchain/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Modified: projects/elftoolchain/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c ============================================================================== --- projects/elftoolchain/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Sat Jan 25 10:43:47 2014 (r261153) +++ projects/elftoolchain/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Sat Jan 25 11:27:09 2014 (r261154) @@ -96,11 +96,6 @@ #include "list.h" #include "traverse.h" -/* The versions of DWARF which we support. */ -#define DWARF_VERSION 2 -#define DWARF_VERSION3 3 -#define DWARF_VERSION4 4 - /* * We need to define a couple of our own intrinsics, to smooth out some of the * differences between the GCC and DevPro DWARF emitters. See the referenced @@ -1983,10 +1978,9 @@ dw_read(tdata_t *td, Elf *elf, char *fil terminate("file contains too many types\n"); debug(1, "DWARF version: %d\n", vers); - if (vers != DWARF_VERSION && vers != DWARF_VERSION3 && - vers != DWARF_VERSION4) { + if (vers < 2 || vers > 4) { terminate("file contains incompatible version %d DWARF code " - "(version 2, 3, or 4 required)\n", vers); + "(version 2, 3 or 4 required)\n", vers); } if (die_string(&dw, cu, DW_AT_producer, &prod, 0)) {