Module Name: src
Committed By: darran
Date: Wed Feb 24 21:53:26 UTC 2010
Modified Files:
src/external/cddl/osnet/dist/lib/libctf/common: ctf_lib.c
src/external/cddl/osnet/dist/tools/ctf/common: symbol.c
src/external/cddl/osnet/dist/tools/ctf/cvt: ctf.c ctfconvert.c
ctfmerge.c dwarf.c fixup_tdescs.c iidesc.c input.c merge.c output.c
st_parse.c stabs.c tdata.c traverse.c util.c
src/external/cddl/osnet/sys/sys: types.h
Log Message:
DTrace: Get the CTF tools building as part of the toolchain.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/cddl/osnet/dist/lib/libctf/common/ctf_lib.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/cddl/osnet/dist/tools/ctf/common/symbol.c
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/dist/tools/ctf/cvt/ctf.c \
src/external/cddl/osnet/dist/tools/ctf/cvt/ctfconvert.c \
src/external/cddl/osnet/dist/tools/ctf/cvt/fixup_tdescs.c \
src/external/cddl/osnet/dist/tools/ctf/cvt/iidesc.c \
src/external/cddl/osnet/dist/tools/ctf/cvt/input.c \
src/external/cddl/osnet/dist/tools/ctf/cvt/merge.c \
src/external/cddl/osnet/dist/tools/ctf/cvt/st_parse.c \
src/external/cddl/osnet/dist/tools/ctf/cvt/stabs.c \
src/external/cddl/osnet/dist/tools/ctf/cvt/tdata.c \
src/external/cddl/osnet/dist/tools/ctf/cvt/traverse.c \
src/external/cddl/osnet/dist/tools/ctf/cvt/util.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c \
src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c \
src/external/cddl/osnet/dist/tools/ctf/cvt/output.c
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/sys/sys/types.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/lib/libctf/common/ctf_lib.c
diff -u src/external/cddl/osnet/dist/lib/libctf/common/ctf_lib.c:1.3 src/external/cddl/osnet/dist/lib/libctf/common/ctf_lib.c:1.4
--- src/external/cddl/osnet/dist/lib/libctf/common/ctf_lib.c:1.3 Sun Feb 21 01:46:34 2010
+++ src/external/cddl/osnet/dist/lib/libctf/common/ctf_lib.c Wed Feb 24 21:53:26 2010
@@ -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>
Index: src/external/cddl/osnet/dist/tools/ctf/common/symbol.c
diff -u src/external/cddl/osnet/dist/tools/ctf/common/symbol.c:1.1.1.1 src/external/cddl/osnet/dist/tools/ctf/common/symbol.c:1.2
--- src/external/cddl/osnet/dist/tools/ctf/common/symbol.c:1.1.1.1 Sat Feb 20 04:34:41 2010
+++ src/external/cddl/osnet/dist/tools/ctf/common/symbol.c Wed Feb 24 21:53:26 2010
@@ -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>
Index: src/external/cddl/osnet/dist/tools/ctf/cvt/ctf.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/ctf.c:1.2 src/external/cddl/osnet/dist/tools/ctf/cvt/ctf.c:1.3
--- src/external/cddl/osnet/dist/tools/ctf/cvt/ctf.c:1.2 Sun Feb 21 00:49:55 2010
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/ctf.c Wed Feb 24 21:53:26 2010
@@ -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>
Index: src/external/cddl/osnet/dist/tools/ctf/cvt/ctfconvert.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/ctfconvert.c:1.2 src/external/cddl/osnet/dist/tools/ctf/cvt/ctfconvert.c:1.3
--- src/external/cddl/osnet/dist/tools/ctf/cvt/ctfconvert.c:1.2 Sun Feb 21 00:49:55 2010
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/ctfconvert.c Wed Feb 24 21:53:26 2010
@@ -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>
Index: src/external/cddl/osnet/dist/tools/ctf/cvt/fixup_tdescs.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/fixup_tdescs.c:1.2 src/external/cddl/osnet/dist/tools/ctf/cvt/fixup_tdescs.c:1.3
--- src/external/cddl/osnet/dist/tools/ctf/cvt/fixup_tdescs.c:1.2 Sun Feb 21 00:49:56 2010
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/fixup_tdescs.c Wed Feb 24 21:53:26 2010
@@ -30,6 +30,10 @@
* fixups.
*/
+#if HAVE_NBTOOL_CONFIG_H
+# include "nbtool_config.h"
+#endif
+
#include <stdio.h>
#include <strings.h>
Index: src/external/cddl/osnet/dist/tools/ctf/cvt/iidesc.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/iidesc.c:1.2 src/external/cddl/osnet/dist/tools/ctf/cvt/iidesc.c:1.3
--- src/external/cddl/osnet/dist/tools/ctf/cvt/iidesc.c:1.2 Sun Feb 21 00:49:56 2010
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/iidesc.c Wed Feb 24 21:53:26 2010
@@ -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>
Index: src/external/cddl/osnet/dist/tools/ctf/cvt/input.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/input.c:1.2 src/external/cddl/osnet/dist/tools/ctf/cvt/input.c:1.3
--- src/external/cddl/osnet/dist/tools/ctf/cvt/input.c:1.2 Sun Feb 21 00:49:56 2010
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/input.c Wed Feb 24 21:53:26 2010
@@ -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>
Index: src/external/cddl/osnet/dist/tools/ctf/cvt/merge.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/merge.c:1.2 src/external/cddl/osnet/dist/tools/ctf/cvt/merge.c:1.3
--- src/external/cddl/osnet/dist/tools/ctf/cvt/merge.c:1.2 Sun Feb 21 00:49:56 2010
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/merge.c Wed Feb 24 21:53:26 2010
@@ -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>
Index: src/external/cddl/osnet/dist/tools/ctf/cvt/st_parse.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/st_parse.c:1.2 src/external/cddl/osnet/dist/tools/ctf/cvt/st_parse.c:1.3
--- src/external/cddl/osnet/dist/tools/ctf/cvt/st_parse.c:1.2 Sun Feb 21 00:49:56 2010
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/st_parse.c Wed Feb 24 21:53:26 2010
@@ -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>
Index: src/external/cddl/osnet/dist/tools/ctf/cvt/stabs.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/stabs.c:1.2 src/external/cddl/osnet/dist/tools/ctf/cvt/stabs.c:1.3
--- src/external/cddl/osnet/dist/tools/ctf/cvt/stabs.c:1.2 Sun Feb 21 00:49:56 2010
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/stabs.c Wed Feb 24 21:53:26 2010
@@ -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>
Index: src/external/cddl/osnet/dist/tools/ctf/cvt/tdata.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/tdata.c:1.2 src/external/cddl/osnet/dist/tools/ctf/cvt/tdata.c:1.3
--- src/external/cddl/osnet/dist/tools/ctf/cvt/tdata.c:1.2 Sun Feb 21 00:49:56 2010
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/tdata.c Wed Feb 24 21:53:26 2010
@@ -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>
Index: src/external/cddl/osnet/dist/tools/ctf/cvt/traverse.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/traverse.c:1.2 src/external/cddl/osnet/dist/tools/ctf/cvt/traverse.c:1.3
--- src/external/cddl/osnet/dist/tools/ctf/cvt/traverse.c:1.2 Sun Feb 21 00:49:56 2010
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/traverse.c Wed Feb 24 21:53:26 2010
@@ -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>
Index: src/external/cddl/osnet/dist/tools/ctf/cvt/util.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/util.c:1.2 src/external/cddl/osnet/dist/tools/ctf/cvt/util.c:1.3
--- src/external/cddl/osnet/dist/tools/ctf/cvt/util.c:1.2 Sun Feb 21 00:49:56 2010
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/util.c Wed Feb 24 21:53:26 2010
@@ -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>
Index: src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c:1.3 src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c:1.4
--- src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c:1.3 Sun Feb 21 01:46:34 2010
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c Wed Feb 24 21:53:26 2010
@@ -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)
Index: src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c:1.3 src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c:1.4
--- src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c:1.3 Sun Feb 21 01:46:34 2010
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c Wed Feb 24 21:53:26 2010
@@ -82,6 +82,10 @@
* traversals.
*/
+#if HAVE_NBTOOL_CONFIG_H
+# include "nbtool_config.h"
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Index: src/external/cddl/osnet/dist/tools/ctf/cvt/output.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/output.c:1.3 src/external/cddl/osnet/dist/tools/ctf/cvt/output.c:1.4
--- src/external/cddl/osnet/dist/tools/ctf/cvt/output.c:1.3 Sun Feb 21 01:46:34 2010
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/output.c Wed Feb 24 21:53:26 2010
@@ -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>
Index: src/external/cddl/osnet/sys/sys/types.h
diff -u src/external/cddl/osnet/sys/sys/types.h:1.3 src/external/cddl/osnet/sys/sys/types.h:1.4
--- src/external/cddl/osnet/sys/sys/types.h:1.3 Sun Feb 21 01:46:36 2010
+++ src/external/cddl/osnet/sys/sys/types.h Wed Feb 24 21:53:26 2010
@@ -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
