[src/trunk]: src/external/cddl/osnet DTrace: Get the CTF tools building as pa...

[darran <darran%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/113ed97021ed
branches:  trunk
changeset: 752385:113ed97021ed
user:      darran <darran%NetBSD.org@localhost>
date:      Wed Feb 24 21:53:26 2010 +0000

description:
DTrace: Get the CTF tools building as part of the toolchain.

diffstat:

 external/cddl/osnet/dist/lib/libctf/common/ctf_lib.c  |  4 ++++
 external/cddl/osnet/dist/tools/ctf/common/symbol.c    |  4 ++++
 external/cddl/osnet/dist/tools/ctf/cvt/ctf.c          |  4 ++++
 external/cddl/osnet/dist/tools/ctf/cvt/ctfconvert.c   |  4 ++++
 external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c     |  6 ++++++
 external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c        |  4 ++++
 external/cddl/osnet/dist/tools/ctf/cvt/fixup_tdescs.c |  4 ++++
 external/cddl/osnet/dist/tools/ctf/cvt/iidesc.c       |  4 ++++
 external/cddl/osnet/dist/tools/ctf/cvt/input.c        |  4 ++++
 external/cddl/osnet/dist/tools/ctf/cvt/merge.c        |  4 ++++
 external/cddl/osnet/dist/tools/ctf/cvt/output.c       |  4 ++++
 external/cddl/osnet/dist/tools/ctf/cvt/st_parse.c     |  4 ++++
 external/cddl/osnet/dist/tools/ctf/cvt/stabs.c        |  4 ++++
 external/cddl/osnet/dist/tools/ctf/cvt/tdata.c        |  4 ++++
 external/cddl/osnet/dist/tools/ctf/cvt/traverse.c     |  4 ++++
 external/cddl/osnet/dist/tools/ctf/cvt/util.c         |  4 ++++
 external/cddl/osnet/sys/sys/types.h                   |  4 +++-
 17 files changed, 69 insertions(+), 1 deletions(-)

diffs (248 lines):

diff -r c297d4e0abbc -r 113ed97021ed external/cddl/osnet/dist/lib/libctf/common/ctf_lib.c
--- a/external/cddl/osnet/dist/lib/libctf/common/ctf_lib.c      Wed Feb 24 21:34:57 2010 +0000
+++ b/external/cddl/osnet/dist/lib/libctf/common/ctf_lib.c      Wed Feb 24 21:53:26 2010 +0000
@@ -26,6 +26,10 @@
 
 #pragma ident  "%Z%%M% %I%     %E% SMI"
 
+#if HAVE_NBTOOL_CONFIG_H
+# include "nbtool_config.h"
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
diff -r c297d4e0abbc -r 113ed97021ed external/cddl/osnet/dist/tools/ctf/common/symbol.c
--- a/external/cddl/osnet/dist/tools/ctf/common/symbol.c        Wed Feb 24 21:34:57 2010 +0000
+++ b/external/cddl/osnet/dist/tools/ctf/common/symbol.c        Wed Feb 24 21:53:26 2010 +0000
@@ -26,6 +26,10 @@
 
 #pragma ident  "%Z%%M% %I%     %E% SMI"
 
+#if HAVE_NBTOOL_CONFIG_H
+# include "nbtool_config.h"
+#endif
+
 #include <sys/types.h>
 #include <string.h>
 
diff -r c297d4e0abbc -r 113ed97021ed external/cddl/osnet/dist/tools/ctf/cvt/ctf.c
--- a/external/cddl/osnet/dist/tools/ctf/cvt/ctf.c      Wed Feb 24 21:34:57 2010 +0000
+++ b/external/cddl/osnet/dist/tools/ctf/cvt/ctf.c      Wed Feb 24 21:53:26 2010 +0000
@@ -29,6 +29,10 @@
  * Create and parse buffers containing CTF data.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
diff -r c297d4e0abbc -r 113ed97021ed external/cddl/osnet/dist/tools/ctf/cvt/ctfconvert.c
--- a/external/cddl/osnet/dist/tools/ctf/cvt/ctfconvert.c       Wed Feb 24 21:34:57 2010 +0000
+++ b/external/cddl/osnet/dist/tools/ctf/cvt/ctfconvert.c       Wed Feb 24 21:53:26 2010 +0000
@@ -30,6 +30,10 @@
  * CTF data, and replace the stabs sections with a CTF section.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+# include "nbtool_config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff -r c297d4e0abbc -r 113ed97021ed external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c
--- a/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c Wed Feb 24 21:34:57 2010 +0000
+++ b/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c Wed Feb 24 21:53:26 2010 +0000
@@ -171,9 +171,15 @@
  * this comment will not live to see the stock hit five.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+# include "nbtool_config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
+#define _NETBSD_SOURCE
 #include <unistd.h>
+#undef _NETBSD_SOURCE
 #include <pthread.h>
 #include <assert.h>
 #if defined(sun)
diff -r c297d4e0abbc -r 113ed97021ed external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c
--- a/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c    Wed Feb 24 21:34:57 2010 +0000
+++ b/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c    Wed Feb 24 21:53:26 2010 +0000
@@ -82,6 +82,10 @@
  * traversals.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+# include "nbtool_config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff -r c297d4e0abbc -r 113ed97021ed external/cddl/osnet/dist/tools/ctf/cvt/fixup_tdescs.c
--- a/external/cddl/osnet/dist/tools/ctf/cvt/fixup_tdescs.c     Wed Feb 24 21:34:57 2010 +0000
+++ b/external/cddl/osnet/dist/tools/ctf/cvt/fixup_tdescs.c     Wed Feb 24 21:53:26 2010 +0000
@@ -30,6 +30,10 @@
  * fixups.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+# include "nbtool_config.h"
+#endif
+
 #include <stdio.h>
 #include <strings.h>
 
diff -r c297d4e0abbc -r 113ed97021ed external/cddl/osnet/dist/tools/ctf/cvt/iidesc.c
--- a/external/cddl/osnet/dist/tools/ctf/cvt/iidesc.c   Wed Feb 24 21:34:57 2010 +0000
+++ b/external/cddl/osnet/dist/tools/ctf/cvt/iidesc.c   Wed Feb 24 21:53:26 2010 +0000
@@ -29,6 +29,10 @@
  * Routines for manipulating iidesc_t structures
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+# include "nbtool_config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <strings.h>
diff -r c297d4e0abbc -r 113ed97021ed external/cddl/osnet/dist/tools/ctf/cvt/input.c
--- a/external/cddl/osnet/dist/tools/ctf/cvt/input.c    Wed Feb 24 21:34:57 2010 +0000
+++ b/external/cddl/osnet/dist/tools/ctf/cvt/input.c    Wed Feb 24 21:53:26 2010 +0000
@@ -29,6 +29,10 @@
  * Routines for retrieving CTF data from a .SUNW_ctf ELF section
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+# include "nbtool_config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
diff -r c297d4e0abbc -r 113ed97021ed external/cddl/osnet/dist/tools/ctf/cvt/merge.c
--- a/external/cddl/osnet/dist/tools/ctf/cvt/merge.c    Wed Feb 24 21:34:57 2010 +0000
+++ b/external/cddl/osnet/dist/tools/ctf/cvt/merge.c    Wed Feb 24 21:53:26 2010 +0000
@@ -111,6 +111,10 @@
  * this comment.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+# include "nbtool_config.h"
+#endif
+
 #include <stdio.h>
 #include <strings.h>
 #include <assert.h>
diff -r c297d4e0abbc -r 113ed97021ed external/cddl/osnet/dist/tools/ctf/cvt/output.c
--- a/external/cddl/osnet/dist/tools/ctf/cvt/output.c   Wed Feb 24 21:34:57 2010 +0000
+++ b/external/cddl/osnet/dist/tools/ctf/cvt/output.c   Wed Feb 24 21:53:26 2010 +0000
@@ -30,6 +30,10 @@
  * for placing the resulting data into an output file.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+# include "nbtool_config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <strings.h>
diff -r c297d4e0abbc -r 113ed97021ed external/cddl/osnet/dist/tools/ctf/cvt/st_parse.c
--- a/external/cddl/osnet/dist/tools/ctf/cvt/st_parse.c Wed Feb 24 21:34:57 2010 +0000
+++ b/external/cddl/osnet/dist/tools/ctf/cvt/st_parse.c Wed Feb 24 21:53:26 2010 +0000
@@ -29,6 +29,10 @@
  * This file is a sewer.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+# include "nbtool_config.h"
+#endif
+
 #include <limits.h>
 #include <stdarg.h>
 #include <stdio.h>
diff -r c297d4e0abbc -r 113ed97021ed external/cddl/osnet/dist/tools/ctf/cvt/stabs.c
--- a/external/cddl/osnet/dist/tools/ctf/cvt/stabs.c    Wed Feb 24 21:34:57 2010 +0000
+++ b/external/cddl/osnet/dist/tools/ctf/cvt/stabs.c    Wed Feb 24 21:53:26 2010 +0000
@@ -30,6 +30,10 @@
  * based on the interesting parts of that data.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+# include "nbtool_config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
diff -r c297d4e0abbc -r 113ed97021ed external/cddl/osnet/dist/tools/ctf/cvt/tdata.c
--- a/external/cddl/osnet/dist/tools/ctf/cvt/tdata.c    Wed Feb 24 21:34:57 2010 +0000
+++ b/external/cddl/osnet/dist/tools/ctf/cvt/tdata.c    Wed Feb 24 21:53:26 2010 +0000
@@ -29,6 +29,10 @@
  * Routines for manipulating tdesc and tdata structures
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+# include "nbtool_config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <strings.h>
diff -r c297d4e0abbc -r 113ed97021ed external/cddl/osnet/dist/tools/ctf/cvt/traverse.c
--- a/external/cddl/osnet/dist/tools/ctf/cvt/traverse.c Wed Feb 24 21:34:57 2010 +0000
+++ b/external/cddl/osnet/dist/tools/ctf/cvt/traverse.c Wed Feb 24 21:53:26 2010 +0000
@@ -30,6 +30,10 @@
  * as the tree is traversed.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+# include "nbtool_config.h"
+#endif
+
 #include <stdio.h>
 #include <assert.h>
 
diff -r c297d4e0abbc -r 113ed97021ed external/cddl/osnet/dist/tools/ctf/cvt/util.c
--- a/external/cddl/osnet/dist/tools/ctf/cvt/util.c     Wed Feb 24 21:34:57 2010 +0000
+++ b/external/cddl/osnet/dist/tools/ctf/cvt/util.c     Wed Feb 24 21:53:26 2010 +0000
@@ -29,6 +29,10 @@
  * Utility functions
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+# include "nbtool_config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff -r c297d4e0abbc -r 113ed97021ed external/cddl/osnet/sys/sys/types.h
--- a/external/cddl/osnet/sys/sys/types.h       Wed Feb 24 21:34:57 2010 +0000
+++ b/external/cddl/osnet/sys/sys/types.h       Wed Feb 24 21:53:26 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: types.h,v 1.3 2010/02/21 01:46:36 darran Exp $ */
+/*     $NetBSD: types.h,v 1.4 2010/02/24 21:53:26 darran Exp $ */
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -65,7 +65,9 @@
  */
 
 #include <sys/stdint.h>
+#define _NETBSD_SOURCE         /* XXX TBD fix this */
 #include_next <sys/types.h>
+#undef _NETBSD_SOURCE
 #include_next <sys/ccompile.h>
 
 #ifndef _KERNEL