From owner-p4-projects@FreeBSD.ORG  Sat Apr 15 22:53:05 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8742216A405; Sat, 15 Apr 2006 22:53:05 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 44AAF16A402
	for <perforce@freebsd.org>; Sat, 15 Apr 2006 22:53:05 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0FD1543D46
	for <perforce@freebsd.org>; Sat, 15 Apr 2006 22:53:05 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3FMr4tn036024
	for <perforce@freebsd.org>; Sat, 15 Apr 2006 22:53:04 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3FMr4sG036012
	for perforce@freebsd.org; Sat, 15 Apr 2006 22:53:04 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 15 Apr 2006 22:53:04 GMT
Message-Id: <200604152253.k3FMr4sG036012@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 95362 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Apr 2006 22:53:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=95362

Change 95362 by jb@jb_freebsd2 on 2006/04/15 22:52:48

	Dwarf 3 no longer uses DW_ATE_SUN_imaginary_float. The Dwarf 3 library
	we are using is the one from the bzipped CPIO in the OpenSolaris
	distribution. It looks like that library is a bit more recent than the
	code in this file. Puzzling.
	
	Fix the last entry in the die_creators[] array to match the structure
	type.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/dwarf.c#2 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/dwarf.c#2 (text) ====

@@ -85,6 +85,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <strings.h>
 #include <errno.h>
 #include <libelf.h>
@@ -1303,8 +1304,11 @@
 	if (enc == DW_ATE_complex_float) {
 		mult = 2;
 		col = 1;
-	} else if (enc == DW_ATE_imaginary_float ||
-	    enc == DW_ATE_SUN_imaginary_float)
+	} else if (enc == DW_ATE_imaginary_float
+#if defined(sun)
+	    || enc == DW_ATE_SUN_imaginary_float
+#endif
+	    )
 		col = 2;
 
 	while (map->fsm_typesz[szidx] != 0) {
@@ -1352,8 +1356,10 @@
 	case DW_ATE_float:
 	case DW_ATE_complex_float:
 	case DW_ATE_imaginary_float:
+#if defined(sun)
 	case DW_ATE_SUN_imaginary_float:
 	case DW_ATE_SUN_interval_float:
+#endif
 		intr->intr_type = INTR_REAL;
 		intr->intr_signed = 1;
 		intr->intr_fformat = die_base_type2enc(dw, off, enc, sz);
@@ -1650,7 +1656,7 @@
 	{ DW_TAG_variable,		DW_F_NOTDP,	die_variable_create },
 	{ DW_TAG_volatile_type,		0,		die_volatile_create },
 	{ DW_TAG_restrict_type,		0,		die_restrict_create },
-	{ 0, NULL }
+	{ 0, 0, NULL }
 };
 
 static const die_creator_t *