PERFORCE change 95362 for review

[John Birrell]

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

Change 95362 by jb at 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 *