PERFORCE change 127679 for review

[John Birrell]

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

Change 127679 by jb at jb_freebsd1 on 2007/10/18 09:19:16

	Merge the DTrace userland libraries and programs back in.

Affected files ...

.. //depot/projects/dtrace/src/cddl/Makefile.inc#6 edit
.. //depot/projects/dtrace/src/cddl/lib/Makefile#9 edit
.. //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#14 edit
.. //depot/projects/dtrace/src/cddl/lib/libproc/Makefile#2 edit
.. //depot/projects/dtrace/src/cddl/usr.bin/Makefile#6 edit
.. //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#13 edit
.. //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/xalloc.c#2 delete
.. //depot/projects/dtrace/src/cddl/usr.bin/ctfdump/Makefile#5 edit
.. //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#10 edit
.. //depot/projects/dtrace/src/cddl/usr.sbin/Makefile#5 edit

Differences ...

==== //depot/projects/dtrace/src/cddl/Makefile.inc#6 (text+ko) ====

@@ -1,3 +1,8 @@
 # $FreeBSD: src/cddl/Makefile.inc,v 1.2 2007/04/16 21:20:24 ru Exp $
 
+OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../contrib/opensolaris
+OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/contrib/opensolaris
+
 CFLAGS+= -D_SOLARIS_C_SOURCE
+
+IGNORE_PRAGMA=	YES

==== //depot/projects/dtrace/src/cddl/lib/Makefile#9 (text+ko) ====

@@ -3,7 +3,10 @@
 .include <bsd.own.mk>
 
 SUBDIR=	libavl \
+	libctf \
+	libdtrace \
 	libnvpair \
+	libproc \
 	libumem \
 	libuutil \
 	${_libzfs} \

==== //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#14 (text+ko) ====

@@ -56,7 +56,7 @@
 		-I${.CURDIR}/../libproc \
 		-I${.CURDIR}/../../../contrib \
 		-I${.CURDIR}/../../../sys/contrib \
-		-I${.CURDIR}/../../../sys \
+		-I${.CURDIR}/../../../sys/compat/opensolaris \
 		-I${OPENSOLARIS_USR_DISTDIR}/head \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \

==== //depot/projects/dtrace/src/cddl/lib/libproc/Makefile#2 (text+ko) ====

@@ -16,6 +16,7 @@
 CFLAGS+=	-I${.CURDIR}/../../../contrib \
 		-I${.CURDIR}/../../../sys/contrib \
 		-I${.CURDIR}/../../../sys \
+		-I${.CURDIR}/../../../sys/compat/opensolaris \
 		-I${OPENSOLARIS_USR_DISTDIR}/head \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common

==== //depot/projects/dtrace/src/cddl/usr.bin/Makefile#6 (text+ko) ====

@@ -2,7 +2,12 @@
 
 .include <bsd.own.mk>
 
-SUBDIR=	${_ztest}
+SUBDIR= \
+	ctfconvert \
+	ctfdump \
+	ctfmerge \
+	sgsmsg \
+	${_ztest}
 
 .if ${MK_ZFS} != "no"
 .if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no"

==== //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#13 (text+ko) ====

@@ -4,7 +4,7 @@
 
 .include	"../../Makefile.inc"
 
-WARNS=		1
+DEBUG_FLAGS=	-g
 
 PROG=		ctfconvert
 
@@ -17,6 +17,7 @@
 		iidesc.c \
 		input.c \
 		list.c \
+		memory.c \
 		merge.c \
 		output.c \
 		st_parse.c \
@@ -26,13 +27,13 @@
 		symbol.c \
 		tdata.c \
 		traverse.c \
-		util.c \
-		xalloc.c
+		util.c
 
-WARNS?=		1
+WARNS?=		6
 
 CFLAGS+=	-I${.CURDIR}/../../../contrib/libdwarf \
 		-I${.CURDIR}/../../../contrib \
+		-I${.CURDIR}/../../../sys/compat/opensolaris \
 		-I${.CURDIR}/../../../sys/contrib \
 		-I${OPENSOLARIS_USR_DISTDIR} \
 		-I${OPENSOLARIS_SYS_DISTDIR} \

==== //depot/projects/dtrace/src/cddl/usr.bin/ctfdump/Makefile#5 (text+ko) ====

@@ -4,16 +4,17 @@
 
 PROG=		ctfdump
 
-SRCS=		die.c \
-		dump.c \
-		symbol.c
+SRCS=		dump.c \
+		symbol.c \
+		utils.c
 
-WARNS=		1
+WARNS?=		6
 
 CFLAGS+=	-I${OPENSOLARIS_USR_DISTDIR} \
 		-I${OPENSOLARIS_SYS_DISTDIR} \
 		-I${OPENSOLARIS_USR_DISTDIR}/head \
 		-I${OPENSOLARIS_USR_DISTDIR}/cmd/mdb/tools/common \
+		-I${.CURDIR}/../../../sys/compat/opensolaris \
 		-I${.CURDIR}/../../../sys/contrib \
 		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
@@ -22,7 +23,6 @@
 
 LDADD+=		-lelf -lz
 
-.PATH:		${OPENSOLARIS_USR_DISTDIR}/cmd/mdb/tools/common
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/dump
 

==== //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#10 (text+ko) ====

@@ -17,19 +17,20 @@
 		iidesc.c \
 		input.c \
 		list.c \
+		memory.c \
 		merge.c \
 		output.c \
 		strtab.c \
 		symbol.c \
 		tdata.c \
 		traverse.c \
-		util.c \
-		xalloc.c
+		util.c
 
-WARNS?=		1
+WARNS?=		6
 
 CFLAGS+=	-I${.CURDIR}/../../../contrib/libdwarf \
 		-I${.CURDIR}/../../../contrib \
+		-I${.CURDIR}/../../../sys/compat/opensolaris \
 		-I${.CURDIR}/../../../sys/contrib \
 		-I${OPENSOLARIS_USR_DISTDIR} \
 		-I${OPENSOLARIS_SYS_DISTDIR} \
@@ -40,7 +41,6 @@
 
 LDADD+=		-lctf -ldwarf -lelf -lz -lthr
 
-.PATH:		${.CURDIR}/../ctfconvert
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt
 

==== //depot/projects/dtrace/src/cddl/usr.sbin/Makefile#5 (text+ko) ====

@@ -2,7 +2,8 @@
 
 .include <bsd.own.mk>
 
-SUBDIR=	${_zdb}
+SUBDIR=	dtrace \
+	${_zdb}
 
 .if ${MK_ZFS} != "no"
 .if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no"