CVS commit: src/external/cddl/osnet/lib/libdtrace

2021-04-13 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Tue Apr 13 09:20:55 UTC 2021

Modified Files:
src/external/cddl/osnet/lib/libdtrace: Makefile

Log Message:
XXX: ignore warning about overlapping buffers for sprintf().


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/external/cddl/osnet/lib/libdtrace/Makefile

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/lib/libdtrace/Makefile
diff -u src/external/cddl/osnet/lib/libdtrace/Makefile:1.29 src/external/cddl/osnet/lib/libdtrace/Makefile:1.30
--- src/external/cddl/osnet/lib/libdtrace/Makefile:1.29	Mon Mar 29 05:18:02 2021
+++ src/external/cddl/osnet/lib/libdtrace/Makefile	Tue Apr 13 09:20:55 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.29 2021/03/29 05:18:02 simonb Exp $
+#	$NetBSD: Makefile,v 1.30 2021/04/13 09:20:55 mrg Exp $
 
 # $FreeBSD: head/cddl/lib/libdtrace/Makefile 314654 2017-03-04 11:30:04Z ngie $
 
@@ -145,4 +145,6 @@ beforedepend:	dt_errtags.c dt_names.c
 
 LIBDPLIBS=	proc	${NETBSDSRCDIR}/external/bsd/libproc/lib
 
+COPTS.dt_link.c+=	${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -Wno-restrict :}
+
 .include

CVS commit: src/external/cddl/osnet/lib/libdtrace

2021-03-28 Thread Simon Burge 
Module Name:src
Committed By:   simonb
Date:   Mon Mar 29 05:18:02 UTC 2021

Modified Files:
src/external/cddl/osnet/lib/libdtrace: Makefile

Log Message:
Compile MIPS specific code.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/external/cddl/osnet/lib/libdtrace/Makefile

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/lib/libdtrace/Makefile
diff -u src/external/cddl/osnet/lib/libdtrace/Makefile:1.28 src/external/cddl/osnet/lib/libdtrace/Makefile:1.29
--- src/external/cddl/osnet/lib/libdtrace/Makefile:1.28	Tue Mar 17 01:36:29 2020
+++ src/external/cddl/osnet/lib/libdtrace/Makefile	Mon Mar 29 05:18:02 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.28 2020/03/17 01:36:29 fox Exp $
+#	$NetBSD: Makefile,v 1.29 2021/03/29 05:18:02 simonb Exp $
 
 # $FreeBSD: head/cddl/lib/libdtrace/Makefile 314654 2017-03-04 11:30:04Z ngie $
 
@@ -115,6 +115,9 @@ CPPFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/
 .elif ${MACHINE_CPU} == "arm"
 CPPFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/arm
 .PATH:		${.CURDIR}/../../dist/lib/libdtrace/arm
+.elif ${MACHINE_CPU} == "mips"
+CPPFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/mips
+.PATH:		${.CURDIR}/../../dist/lib/libdtrace/mips
 .endif
 COPTS.dt_link.c		+= ${GCC_NO_FORMAT_TRUNCATION}

CVS commit: src/external/cddl/osnet/lib/libdtrace

2020-03-16 Thread Santhosh Raju 
Module Name:src
Committed By:   fox
Date:   Tue Mar 17 01:36:29 UTC 2020

Modified Files:
src/external/cddl/osnet/lib/libdtrace: Makefile

Log Message:
external/cddl/osnet: Do not suppress the warning output for libdtrace.

Changed -Wno-maybe-uninitialized to -Wno-error=maybe-uninitialized to allow
warnings to be printed out during build.

Suggested by: christos@


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/external/cddl/osnet/lib/libdtrace/Makefile

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/lib/libdtrace/Makefile
diff -u src/external/cddl/osnet/lib/libdtrace/Makefile:1.27 src/external/cddl/osnet/lib/libdtrace/Makefile:1.28
--- src/external/cddl/osnet/lib/libdtrace/Makefile:1.27	Tue Mar 17 00:50:12 2020
+++ src/external/cddl/osnet/lib/libdtrace/Makefile	Tue Mar 17 01:36:29 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.27 2020/03/17 00:50:12 fox Exp $
+#	$NetBSD: Makefile,v 1.28 2020/03/17 01:36:29 fox Exp $
 
 # $FreeBSD: head/cddl/lib/libdtrace/Makefile 314654 2017-03-04 11:30:04Z ngie $
 
@@ -96,7 +96,7 @@ COPTS.dt_isadep.c	+= -Wno-unused-variabl
 
 .if (${MKLIBCSANITIZER:Uno} == "yes")
 .if (${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8)
-COPTS.dt_proc.c+=	-Wno-maybe-uninitialized
+COPTS.dt_proc.c+=	-Wno-error=maybe-uninitialized
 .endif
 .endif

CVS commit: src/external/cddl/osnet/lib/libdtrace

2020-03-16 Thread Santhosh Raju 
Module Name:src
Committed By:   fox
Date:   Tue Mar 17 00:50:12 UTC 2020

Modified Files:
src/external/cddl/osnet/lib/libdtrace: Makefile

Log Message:
external/cddl/osnet: Supress -Werror=maybe-uninitialized error in libdtrace.

It looks like this is a false positive, since the section of code triggering 
the error

external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.c:400:42:

is only accessed after "err" is initialized.

Error was reported when build.sh was run with MKLIBCSANITIZER=yes flag.

Reviewed by: kamil@


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/external/cddl/osnet/lib/libdtrace/Makefile

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/lib/libdtrace/Makefile
diff -u src/external/cddl/osnet/lib/libdtrace/Makefile:1.26 src/external/cddl/osnet/lib/libdtrace/Makefile:1.27
--- src/external/cddl/osnet/lib/libdtrace/Makefile:1.26	Tue Dec  3 22:10:56 2019
+++ src/external/cddl/osnet/lib/libdtrace/Makefile	Tue Mar 17 00:50:12 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.26 2019/12/03 22:10:56 jmcneill Exp $
+#	$NetBSD: Makefile,v 1.27 2020/03/17 00:50:12 fox Exp $
 
 # $FreeBSD: head/cddl/lib/libdtrace/Makefile 314654 2017-03-04 11:30:04Z ngie $
 
@@ -94,6 +94,12 @@ COPTS.dt_options.c	+= -Wno-parentheses
 COPTS.dt_pid.c		+= ${${ACTIVE_CC} == "gcc" :? -Wno-unused-but-set-variable :}
 COPTS.dt_isadep.c	+= -Wno-unused-variable
 
+.if (${MKLIBCSANITIZER:Uno} == "yes")
+.if (${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8)
+COPTS.dt_proc.c+=	-Wno-maybe-uninitialized
+.endif
+.endif
+
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 CPPFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
 CPPFLAGS+=	-I${.CURDIR}/../../dev/dtrace/x86

CVS commit: src/external/cddl/osnet/lib/libdtrace

2020-03-08 Thread Michał Górny 
Module Name:src
Committed By:   mgorny
Date:   Sun Mar  8 22:11:48 UTC 2020

Modified Files:
src/external/cddl/osnet/lib/libdtrace: errno.d
Added Files:
src/external/cddl/osnet/lib/libdtrace: make-errno-d.awk

Log Message:
Update dtrace errno.d mapping and add a script for it

Add a new script to autogenerate errno.d from errno.h, and use it
to regenerate the list to match NetBSD errno codes.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/lib/libdtrace/errno.d
cvs rdiff -u -r0 -r1.1 src/external/cddl/osnet/lib/libdtrace/make-errno-d.awk

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/lib/libdtrace/errno.d
diff -u src/external/cddl/osnet/lib/libdtrace/errno.d:1.3 src/external/cddl/osnet/lib/libdtrace/errno.d:1.4
--- src/external/cddl/osnet/lib/libdtrace/errno.d:1.3	Mon May 28 21:05:09 2018
+++ src/external/cddl/osnet/lib/libdtrace/errno.d	Sun Mar  8 22:11:48 2020
@@ -1,4 +1,10 @@
-/*	$NetBSD: errno.d,v 1.3 2018/05/28 21:05:09 chs Exp $	*/
+/*	$NetBSD: errno.d,v 1.4 2020/03/08 22:11:48 mgorny Exp $	*/
+
+/*
+ * This file is autogenerated.  Please call:
+ *   awk make-errno-d.awk < ../../../../../sys/sys/errno.h
+ * to get new data.
+ */
 
 /*
  * CDDL HEADER START
@@ -122,8 +128,6 @@ inline int ESOCKTNOSUPPORT = 44;
 #pragma D binding "1.0" ESOCKTNOSUPPORT
 inline int EOPNOTSUPP = 45;
 #pragma D binding "1.0" EOPNOTSUPP
-inline int ENOTSUP = EOPNOTSUPP;
-#pragma D binding "1.0" ENOTSUP
 inline int EPFNOSUPPORT = 46;
 #pragma D binding "1.0" EPFNOSUPPORT
 inline int EAFNOSUPPORT = 47;
@@ -202,29 +206,43 @@ inline int ENOMSG = 83;
 #pragma D binding "1.0" ENOMSG
 inline int EOVERFLOW = 84;
 #pragma D binding "1.0" EOVERFLOW
-inline int ECANCELED = 85;
-#pragma D binding "1.0" ECANCELED
-inline int EILSEQ = 86;
+inline int EILSEQ = 85;
 #pragma D binding "1.0" EILSEQ
-inline int ENOATTR = 87;
-#pragma D binding "1.0" ENOATTR
-inline int EDOOFUS = 88;
-#pragma D binding "1.0" EDOOFUS
-inline int EBADMSG = 89;
+inline int ENOTSUP = 86;
+#pragma D binding "1.0" ENOTSUP
+inline int ECANCELED = 87;
+#pragma D binding "1.0" ECANCELED
+inline int EBADMSG = 88;
 #pragma D binding "1.0" EBADMSG
-inline int EMULTIHOP = 90;
+inline int ENODATA = 89;
+#pragma D binding "1.0" ENODATA
+inline int ENOSR = 90;
+#pragma D binding "1.0" ENOSR
+inline int ENOSTR = 91;
+#pragma D binding "1.0" ENOSTR
+inline int ETIME = 92;
+#pragma D binding "1.0" ETIME
+inline int ENOATTR = 93;
+#pragma D binding "1.0" ENOATTR
+inline int EMULTIHOP = 94;
 #pragma D binding "1.0" EMULTIHOP
-inline int ENOLINK = 91;
+inline int ENOLINK = 95;
 #pragma D binding "1.0" ENOLINK
-inline int EPROTO = 92;
+inline int EPROTO = 96;
 #pragma D binding "1.0" EPROTO
-inline int ELAST = 92;
+inline int EOWNERDEAD = 97;
+#pragma D binding "1.0" EOWNERDEAD
+inline int ENOTRECOVERABLE = 98;
+#pragma D binding "1.0" ENOTRECOVERABLE
+inline int ELAST = 98;
 #pragma D binding "1.0" ELAST
-inline int ERESTART = -1;
-#pragma D binding "1.0" ERESTART
 inline int EJUSTRETURN = -2;
 #pragma D binding "1.0" EJUSTRETURN
-inline int ENOIOCTL = -3;
-#pragma D binding "1.0" ENOIOCTL
-inline int EDIRIOCTL = -4;
-#pragma D binding "1.0" EDIRIOCTL
+inline int ERESTART = -3;
+#pragma D binding "1.0" ERESTART
+inline int EPASSTHROUGH = -4;
+#pragma D binding "1.0" EPASSTHROUGH
+inline int EDUPFD = -5;
+#pragma D binding "1.0" EDUPFD
+inline int EMOVEFD = -6;
+#pragma D binding "1.0" EMOVEFD

Added files:

Index: src/external/cddl/osnet/lib/libdtrace/make-errno-d.awk
diff -u /dev/null src/external/cddl/osnet/lib/libdtrace/make-errno-d.awk:1.1
--- /dev/null	Sun Mar  8 22:11:48 2020
+++ src/external/cddl/osnet/lib/libdtrace/make-errno-d.awk	Sun Mar  8 22:11:48 2020
@@ -0,0 +1,45 @@
+BEGIN {
+	print "/*	$NetBSD: make-errno-d.awk,v 1.1 2020/03/08 22:11:48 mgorny Exp $	*/"
+	print ""
+	print "/*"
+	print " * This file is autogenerated.  Please call:"
+	print " *   awk make-errno-d.awk < ../../../../../sys/sys/errno.h"
+	print " * to get new data."
+	print " */"
+	print ""
+	print "/*"
+	print " * CDDL HEADER START"
+	print " *"
+	print " * The contents of this file are subject to the terms of the"
+	print " * Common Development and Distribution License, Version 1.0 only"
+	print " * (the \"License\").  You may not use this file except in compliance"
+	print " * with the License."
+	print " *"
+	print " * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE"
+	print " * or http://www.opensolaris.org/os/licensing.;
+	print " * See the License for the specific language governing permissions"
+	print " * and limitations under the License."
+	print " *"
+	print " * When distributing Covered Code, include this CDDL HEADER in each"
+	print " * file and include the License file at usr/src/OPENSOLARIS.LICENSE."
+	print " * If applicable, add the following below this CDDL HEADER, with the"
+	print " *

CVS commit: src/external/cddl/osnet/lib/libdtrace

2019-02-11 Thread Tobias Nygren 
Module Name:src
Committed By:   tnn
Date:   Mon Feb 11 17:49:37 UTC 2019

Modified Files:
src/external/cddl/osnet/lib/libdtrace: Makefile

Log Message:
-Wno-format-truncation is only needed when using GCC


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/external/cddl/osnet/lib/libdtrace/Makefile

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/lib/libdtrace/Makefile
diff -u src/external/cddl/osnet/lib/libdtrace/Makefile:1.20 src/external/cddl/osnet/lib/libdtrace/Makefile:1.21
--- src/external/cddl/osnet/lib/libdtrace/Makefile:1.20	Wed Feb  6 04:23:16 2019
+++ src/external/cddl/osnet/lib/libdtrace/Makefile	Mon Feb 11 17:49:37 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.20 2019/02/06 04:23:16 christos Exp $
+#	$NetBSD: Makefile,v 1.21 2019/02/11 17:49:37 tnn Exp $
 
 # $FreeBSD: head/cddl/lib/libdtrace/Makefile 314654 2017-03-04 11:30:04Z ngie $
 
@@ -105,7 +105,7 @@ CPPFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/
 CPPFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/arm
 .PATH:		${.CURDIR}/../../dist/lib/libdtrace/arm
 .endif
-COPTS.dt_link.c	+= -Wno-format-truncation
+COPTS.dt_link.c	+= ${${ACTIVE_CC} == "gcc" :? -Wno-format-truncation :}
 
 LFLAGS+=-l

CVS commit: src/external/cddl/osnet/lib/libdtrace

2019-02-05 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Feb  6 04:23:16 UTC 2019

Modified Files:
src/external/cddl/osnet/lib/libdtrace: Makefile

Log Message:
uses the idiom len = snprintf(, 1, ...) to compute length.
needs -Wno-format-truncation


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/cddl/osnet/lib/libdtrace/Makefile

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/lib/libdtrace/Makefile
diff -u src/external/cddl/osnet/lib/libdtrace/Makefile:1.19 src/external/cddl/osnet/lib/libdtrace/Makefile:1.20
--- src/external/cddl/osnet/lib/libdtrace/Makefile:1.19	Thu Jun  7 09:21:44 2018
+++ src/external/cddl/osnet/lib/libdtrace/Makefile	Tue Feb  5 23:23:16 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.19 2018/06/07 13:21:44 kamil Exp $
+#	$NetBSD: Makefile,v 1.20 2019/02/06 04:23:16 christos Exp $
 
 # $FreeBSD: head/cddl/lib/libdtrace/Makefile 314654 2017-03-04 11:30:04Z ngie $
 
@@ -105,6 +105,7 @@ CPPFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/
 CPPFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/arm
 .PATH:		${.CURDIR}/../../dist/lib/libdtrace/arm
 .endif
+COPTS.dt_link.c	+= -Wno-format-truncation
 
 LFLAGS+=-l

CVS commit: src/external/cddl/osnet/lib/libzfs

2019-01-12 Thread Juergen Hannken-Illjes 
Module Name:src
Committed By:   hannken
Date:   Sat Jan 12 10:44:05 UTC 2019

Modified Files:
src/external/cddl/osnet/lib/libzfs: zmount.c

Log Message:
Pass unmount flags down to syscall, "zfs unmount -f" now works.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/lib/libzfs/zmount.c

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/lib/libzfs/zmount.c
diff -u src/external/cddl/osnet/lib/libzfs/zmount.c:1.1 src/external/cddl/osnet/lib/libzfs/zmount.c:1.2
--- src/external/cddl/osnet/lib/libzfs/zmount.c:1.1	Fri Aug  7 20:57:56 2009
+++ src/external/cddl/osnet/lib/libzfs/zmount.c	Sat Jan 12 10:44:05 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: zmount.c,v 1.1 2009/08/07 20:57:56 haad Exp $	*/
+/*	$NetBSD: zmount.c,v 1.2 2019/01/12 10:44:05 hannken Exp $	*/
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -69,5 +69,5 @@ int
 umount2(const char *spec, int mflag)
 {
 
-	return unmount(spec, 0);
+	return unmount(spec, mflag);
 }

CVS commit: src/external/cddl/osnet/lib/libdtrace

2018-06-06 Thread Kamil Rytarowski 
Module Name:src
Committed By:   kamil
Date:   Wed Jun  6 14:18:39 UTC 2018

Modified Files:
src/external/cddl/osnet/lib/libdtrace: Makefile

Log Message:
Make cddl/osnet/lib/libdtrace buildable with MKLLVM=yes

Clang/LLVM does not recognize:
 - -Wno-maybe-uninitialized
 - -Wno-unused-but-set-variable

MKGCC=yes still builds the distribution.

This is a step forward functional MKLLVM=yes HAVE_LLVM=yes build.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/cddl/osnet/lib/libdtrace/Makefile

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/lib/libdtrace/Makefile
diff -u src/external/cddl/osnet/lib/libdtrace/Makefile:1.17 src/external/cddl/osnet/lib/libdtrace/Makefile:1.18
--- src/external/cddl/osnet/lib/libdtrace/Makefile:1.17	Mon May 28 21:05:09 2018
+++ src/external/cddl/osnet/lib/libdtrace/Makefile	Wed Jun  6 14:18:39 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.17 2018/05/28 21:05:09 chs Exp $
+#	$NetBSD: Makefile,v 1.18 2018/06/06 14:18:39 kamil Exp $
 
 # $FreeBSD: head/cddl/lib/libdtrace/Makefile 314654 2017-03-04 11:30:04Z ngie $
 
@@ -86,9 +86,14 @@ COPTS.dt_program.c	+= -Wno-stack-protect
 COPTS.dt_provider.c	+= -Wno-stack-protector
 COPTS.dt_subr.c		+= -Wno-stack-protector
 
-COPTS.dt_consume.c	+= -Wno-parentheses -Wno-maybe-uninitialized
+COPTS.dt_consume.c	+= -Wno-parentheses
+.if defined(HAVE_GCC)
+COPTS.dt_consume.c	+= -Wno-maybe-uninitialized
+.endif
 COPTS.dt_options.c	+= -Wno-parentheses
+.if defined(HAVE_GCC)
 COPTS.dt_pid.c		+= -Wno-unused-but-set-variable
+.endif
 COPTS.dt_isadep.c	+= -Wno-unused-variable
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
@@ -96,7 +101,10 @@ CPPFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/
 CPPFLAGS+=	-I${.CURDIR}/../../dev/dtrace/x86
 .PATH:		${.CURDIR}/../../dist/lib/libdtrace/i386 ${.CURDIR}/../../dev/dtrace/x86
 SRCS+=		dis_tables.c
-COPTS.dis_tables.c	+= -Wno-parentheses -Wno-maybe-uninitialized
+COPTS.dis_tables.c	+= -Wno-parentheses
+.if defined(HAVE_GCC)
+COPTS.dis_tables.c	+= -Wno-maybe-uninitialized
+.endif
 .elif ${MACHINE_ARCH} == "sparc64"
 CPPFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc
 .elif ${MACHINE_CPU} == "arm"

CVS commit: src/external/cddl/osnet/lib/libdtrace

2016-12-18 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Mon Dec 19 01:26:31 UTC 2016

Modified Files:
src/external/cddl/osnet/lib/libdtrace: Makefile

Log Message:
arrange for .in files to be rebuilt.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/cddl/osnet/lib/libdtrace/Makefile

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/lib/libdtrace/Makefile
diff -u src/external/cddl/osnet/lib/libdtrace/Makefile:1.15 src/external/cddl/osnet/lib/libdtrace/Makefile:1.16
--- src/external/cddl/osnet/lib/libdtrace/Makefile:1.15	Thu Aug  4 13:07:24 2016
+++ src/external/cddl/osnet/lib/libdtrace/Makefile	Sun Dec 18 20:26:31 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2016/08/04 17:07:24 christos Exp $
+#	$NetBSD: Makefile,v 1.16 2016/12/19 01:26:31 christos Exp $
 
 # $FreeBSD: src/cddl/lib/libdtrace/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $
 
@@ -119,6 +119,12 @@ beforedepend:	dt_errtags.c dt_names.c
 foo:
 	echo ${OPENSOLARIS_USR_DISTDIR}
 
+.SUFFIXES: .in
+.in:
+	${CPP} -D_KERNEL ${CPPFLAGS} $< | tr -d ' ' | tr '"' '@' | \
+	${TOOL_SED} -e 's/\&/\\\&/g' | grep '^s/' > ${.TARGET}
+
+
 FILES=		${DSRCS}
 FILESDIR=	/usr/lib/dtrace

CVS commit: src/external/cddl/osnet/lib

2016-08-04 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Aug  4 17:07:24 UTC 2016

Modified Files:
src/external/cddl/osnet/lib: Makefile.inc
src/external/cddl/osnet/lib/drti: Makefile
src/external/cddl/osnet/lib/libavl: Makefile
src/external/cddl/osnet/lib/libctf: Makefile
src/external/cddl/osnet/lib/libdtrace: Makefile
src/external/cddl/osnet/lib/libnvpair: Makefile
src/external/cddl/osnet/lib/libumem: Makefile
src/external/cddl/osnet/lib/libuutil: Makefile
src/external/cddl/osnet/lib/libzfs: Makefile
src/external/cddl/osnet/lib/libzpool: Makefile

Log Message:
include bsd.init.mnk for consistency and set NOLINT since this overrides
MKLINT which can be re-set from /etc/mk.conf.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/lib/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/lib/drti/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/lib/libavl/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/cddl/osnet/lib/libctf/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/cddl/osnet/lib/libdtrace/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/lib/libnvpair/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/lib/libumem/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/lib/libuutil/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/lib/libzfs/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/cddl/osnet/lib/libzpool/Makefile

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/lib/Makefile.inc
diff -u src/external/cddl/osnet/lib/Makefile.inc:1.4 src/external/cddl/osnet/lib/Makefile.inc:1.5
--- src/external/cddl/osnet/lib/Makefile.inc:1.4	Sat Jan 23 16:22:45 2016
+++ src/external/cddl/osnet/lib/Makefile.inc	Thu Aug  4 13:07:23 2016
@@ -1,5 +1,5 @@
-#	$NetBSD: Makefile.inc,v 1.4 2016/01/23 21:22:45 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.5 2016/08/04 17:07:23 christos Exp $
 
-MKLINT=no
-MKLINTLIB=no
+NOLINT=
+.include "../Makefile.inc"
 CPPFLAGS+=	-D_KERNTYPES

Index: src/external/cddl/osnet/lib/drti/Makefile
diff -u src/external/cddl/osnet/lib/drti/Makefile:1.5 src/external/cddl/osnet/lib/drti/Makefile:1.6
--- src/external/cddl/osnet/lib/drti/Makefile:1.5	Fri Mar 11 00:02:32 2016
+++ src/external/cddl/osnet/lib/drti/Makefile	Thu Aug  4 13:07:23 2016
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.5 2016/03/11 05:02:32 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2016/08/04 17:07:23 christos Exp $
 .include	
-.include	"../../Makefile.inc"
 
 #.if ${MKPIC} == "yes"
 CFLAGS+=-fPIC

Index: src/external/cddl/osnet/lib/libavl/Makefile
diff -u src/external/cddl/osnet/lib/libavl/Makefile:1.4 src/external/cddl/osnet/lib/libavl/Makefile:1.5
--- src/external/cddl/osnet/lib/libavl/Makefile:1.4	Thu Jan 13 18:18:24 2011
+++ src/external/cddl/osnet/lib/libavl/Makefile	Thu Aug  4 13:07:24 2016
@@ -1,4 +1,6 @@
-#	$NetBSD: Makefile,v 1.4 2011/01/13 23:18:24 haad Exp $
+#	$NetBSD: Makefile,v 1.5 2016/08/04 17:07:24 christos Exp $
+
+.include 
 
 .PATH:	${.CURDIR}/../../dist/common/avl
 

Index: src/external/cddl/osnet/lib/libctf/Makefile
diff -u src/external/cddl/osnet/lib/libctf/Makefile:1.8 src/external/cddl/osnet/lib/libctf/Makefile:1.9
--- src/external/cddl/osnet/lib/libctf/Makefile:1.8	Thu Sep 24 10:36:54 2015
+++ src/external/cddl/osnet/lib/libctf/Makefile	Thu Aug  4 13:07:24 2016
@@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.8 2015/09/24 14:36:54 christos Exp $
+#	$NetBSD: Makefile,v 1.9 2016/08/04 17:07:24 christos Exp $
 
 # $FreeBSD: src/cddl/lib/libctf/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $
 
-.include	"../../Makefile.inc"
+.include 
 
 LIB=		ctf
 MAN=		ctf.5

Index: src/external/cddl/osnet/lib/libdtrace/Makefile
diff -u src/external/cddl/osnet/lib/libdtrace/Makefile:1.14 src/external/cddl/osnet/lib/libdtrace/Makefile:1.15
--- src/external/cddl/osnet/lib/libdtrace/Makefile:1.14	Mon Oct  5 13:49:10 2015
+++ src/external/cddl/osnet/lib/libdtrace/Makefile	Thu Aug  4 13:07:24 2016
@@ -1,11 +1,9 @@
-#	$NetBSD: Makefile,v 1.14 2015/10/05 17:49:10 christos Exp $
+#	$NetBSD: Makefile,v 1.15 2016/08/04 17:07:24 christos Exp $
 
 # $FreeBSD: src/cddl/lib/libdtrace/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $
 
 WARNS=1
-.include 
-
-.include	"../../Makefile.inc"
+.include 
 
 LIB=		dtrace
 

Index: src/external/cddl/osnet/lib/libnvpair/Makefile
diff -u src/external/cddl/osnet/lib/libnvpair/Makefile:1.7 src/external/cddl/osnet/lib/libnvpair/Makefile:1.8
--- src/external/cddl/osnet/lib/libnvpair/Makefile:1.7	Fri Apr 10 18:44:20 2015
+++ src/external/cddl/osnet/lib/libnvpair/Makefile	Thu Aug  4 13:07:24 2016
@@ -1,4 +1,6 @@
-#	$NetBSD: Makefile,v 1.7 2015/04/10 22:44:20 riastradh Exp $
+#	$NetBSD: Makefile,v 1.8 2016/08/04 17:07:24 christos Exp $
+
+.include 
 
 .PATH:  ${.CURDIR}/../../dist/lib/libnvpair
 .PATH:

CVS commit: src/external/cddl/osnet/lib/drti

2016-03-10 Thread Joerg Sonnenberger 
Module Name:src
Committed By:   joerg
Date:   Fri Mar 11 05:02:32 UTC 2016

Modified Files:
src/external/cddl/osnet/lib/drti: Makefile

Log Message:
Drop FreeBSD RCS ID, add NetBSD's.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/lib/drti/Makefile

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/lib/drti/Makefile
diff -u src/external/cddl/osnet/lib/drti/Makefile:1.4 src/external/cddl/osnet/lib/drti/Makefile:1.5
--- src/external/cddl/osnet/lib/drti/Makefile:1.4	Tue Mar  1 21:45:10 2016
+++ src/external/cddl/osnet/lib/drti/Makefile	Fri Mar 11 05:02:32 2016
@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/lib/drti/Makefile,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
+# $NetBSD: Makefile,v 1.5 2016/03/11 05:02:32 joerg Exp $
 .include	
 .include	"../../Makefile.inc"

CVS commit: src/external/cddl/osnet/lib/drti

2016-03-01 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Tue Mar  1 21:45:10 UTC 2016

Modified Files:
src/external/cddl/osnet/lib/drti: Makefile

Log Message:
remove comment I used to test.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/lib/drti/Makefile

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/lib/drti/Makefile
diff -u src/external/cddl/osnet/lib/drti/Makefile:1.3 src/external/cddl/osnet/lib/drti/Makefile:1.4
--- src/external/cddl/osnet/lib/drti/Makefile:1.3	Tue Mar  1 16:30:40 2016
+++ src/external/cddl/osnet/lib/drti/Makefile	Tue Mar  1 16:45:10 2016
@@ -3,7 +3,7 @@
 .include	"../../Makefile.inc"
 
 #.if ${MKPIC} == "yes"
-#CFLAGS+=-fPIC
+CFLAGS+=-fPIC
 #.endif
 
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common

CVS commit: src/external/cddl/osnet/lib/drti

2016-03-01 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Tue Mar  1 21:30:40 UTC 2016

Modified Files:
src/external/cddl/osnet/lib/drti: Makefile

Log Message:
Build as PIC if requested


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/lib/drti/Makefile

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/lib/drti/Makefile
diff -u src/external/cddl/osnet/lib/drti/Makefile:1.2 src/external/cddl/osnet/lib/drti/Makefile:1.3
--- src/external/cddl/osnet/lib/drti/Makefile:1.2	Sun Feb 28 14:10:10 2016
+++ src/external/cddl/osnet/lib/drti/Makefile	Tue Mar  1 16:30:40 2016
@@ -2,6 +2,10 @@
 .include	
 .include	"../../Makefile.inc"
 
+#.if ${MKPIC} == "yes"
+#CFLAGS+=-fPIC
+#.endif
+
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common
 
 SRCS=		drti.c

CVS commit: src/external/cddl/osnet/lib

2016-02-29 Thread Taylor R Campbell 
Module Name:src
Committed By:   riastradh
Date:   Mon Feb 29 17:46:54 UTC 2016

Modified Files:
src/external/cddl/osnet/lib: Makefile

Log Message:
Let MKCTF alone control whether we build libctf.

If MKDTRACE=yes MKCTF=no makes no sense, we can express that
somewhere else, not as a confusing set lists error at the end -- as
far as I know, there's no way to express MKDTRACE *or* MKCTF as a
condition for set list entries.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/lib/Makefile

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/lib/Makefile
diff -u src/external/cddl/osnet/lib/Makefile:1.7 src/external/cddl/osnet/lib/Makefile:1.8
--- src/external/cddl/osnet/lib/Makefile:1.7	Sun Feb 28 19:10:10 2016
+++ src/external/cddl/osnet/lib/Makefile	Mon Feb 29 17:46:54 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2016/02/28 19:10:10 christos Exp $
+#	$NetBSD: Makefile,v 1.8 2016/02/29 17:46:54 riastradh Exp $
 #
 #
 
@@ -8,7 +8,7 @@
 SUBDIR+=	libdtrace
 SUBDIR+=	drti
 .endif
-.if ${MKDTRACE:Uno} != "no" || ${MKCTF:Uno} != "no"
+.if ${MKCTF:Uno} != "no"
 SUBDIR+=	libctf
 .endif

CVS commit: src/external/cddl/osnet/lib

2016-02-28 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Feb 28 19:10:10 UTC 2016

Modified Files:
src/external/cddl/osnet/lib: Makefile
src/external/cddl/osnet/lib/drti: Makefile

Log Message:
hook drti


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/lib/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/lib/drti/Makefile

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/lib/Makefile
diff -u src/external/cddl/osnet/lib/Makefile:1.6 src/external/cddl/osnet/lib/Makefile:1.7
--- src/external/cddl/osnet/lib/Makefile:1.6	Tue Mar 25 05:52:55 2014
+++ src/external/cddl/osnet/lib/Makefile	Sun Feb 28 14:10:10 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2014/03/25 09:52:55 ozaki-r Exp $
+#	$NetBSD: Makefile,v 1.7 2016/02/28 19:10:10 christos Exp $
 #
 #
 
@@ -6,6 +6,7 @@
 
 .if (defined(MKDTRACE) && ${MKDTRACE} != "no")
 SUBDIR+=	libdtrace
+SUBDIR+=	drti
 .endif
 .if ${MKDTRACE:Uno} != "no" || ${MKCTF:Uno} != "no"
 SUBDIR+=	libctf

Index: src/external/cddl/osnet/lib/drti/Makefile
diff -u src/external/cddl/osnet/lib/drti/Makefile:1.1 src/external/cddl/osnet/lib/drti/Makefile:1.2
--- src/external/cddl/osnet/lib/drti/Makefile:1.1	Sat Feb 20 19:49:57 2010
+++ src/external/cddl/osnet/lib/drti/Makefile	Sun Feb 28 14:10:10 2016
@@ -1,11 +1,12 @@
 # $FreeBSD: src/cddl/lib/drti/Makefile,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
-
+.include	
 .include	"../../Makefile.inc"
 
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common
 
 SRCS=		drti.c
-FILES=		${SRCS:R:S/$/.o/g}
+OBJS=		${SRCS:R:S/$/.o/g}
+FILES=		${OBJS}
 FILESOWN=	${LIBOWN}
 FILESGRP=	${LIBGRP}
 FILESMODE=	${LIBMODE}
@@ -13,11 +14,11 @@ FILESDIR=	${LIBDIR}/dtrace
 WARNS?=		6
 CLEANFILES=	${FILES}
 
-CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
-		-I${.CURDIR}/../../../cddl/compat/opensolaris/include \
-		-I${OPENSOLARIS_USR_DISTDIR}/head \
-		-I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \
-		-I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \
-		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
+CPPFLAGS+=	-I${.CURDIR}/../../dist/lib/libdtrace/common \
+		-I${.CURDIR}/../../include \
+		-I${.CURDIR}/../../sys  \
+		-I${.CURDIR}/../../dist/uts/common
+
+realall: ${OBJS}
 
 .include

CVS commit: src/external/cddl/osnet/lib/libdtrace

2015-10-06 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Tue Oct  6 22:12:09 UTC 2015

Modified Files:
src/external/cddl/osnet/lib/libdtrace: psinfo.d

Log Message:
almost fixed... Need to figure out what to do with curlwp.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/lib/libdtrace/psinfo.d

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/lib/libdtrace/psinfo.d
diff -u src/external/cddl/osnet/lib/libdtrace/psinfo.d:1.3 src/external/cddl/osnet/lib/libdtrace/psinfo.d:1.4
--- src/external/cddl/osnet/lib/libdtrace/psinfo.d:1.3	Mon Oct  5 13:49:40 2015
+++ src/external/cddl/osnet/lib/libdtrace/psinfo.d	Tue Oct  6 18:12:09 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: psinfo.d,v 1.3 2015/10/05 17:49:40 christos Exp $	*/
+/*	$NetBSD: psinfo.d,v 1.4 2015/10/06 22:12:09 christos Exp $	*/
 
 /*
  * CDDL HEADER START
@@ -53,15 +53,13 @@ translator psinfo_t < struct proc *T > {
 	pr_ppid = (T->p_pptr == 0) ? 0 : T->p_pptr->p_pid;
 	pr_pgid = (T->p_pgrp->pg_session->s_leader == 0) ? 0 : T->p_pgrp->pg_session->s_leader->p_pid;
 	pr_sid = (T->p_pgrp == 0) ? 0 : ((T->p_pgrp->pg_session == 0) ? 0 : T->p_pgrp->pg_session->s_sid);
-/* XXX: struct kauth_cred is not public
-	pr_uid = T->p_cred->cr_ruid;
-	pr_euid = T->p_cred->cr_uid;
-	pr_gid = T->p_cred->cr_rgid;
-	pr_egid = T->p_cred->cr_groups[0];
- */
+	pr_uid = T->p_cred->cr_uid;
+	pr_euid = T->p_cred->cr_euid;
+	pr_gid = T->p_cred->cr_gid;
+	pr_egid = T->p_cred->cr_egid;
 	pr_addr = 0;
-	pr_psargs = stringof(T->p_args->ar_args);
-	pr_arglen = T->p_args->ar_length;
+	pr_psargs = stringof(T->p_comm);
+	pr_arglen = strlen(T->p_comm);
 };
 
 typedef struct lwpsinfo {
@@ -78,22 +76,24 @@ typedef struct lwpsinfo {
 } lwpsinfo_t;
 
 #pragma D binding "1.0" translator
-translator lwpsinfo_t < struct thread *T > {
-	pr_lwpid = T->td_tid;
-	pr_pri = T->td_priority;
-	pr_flag = T->td_flags;
-	pr_state = 0; /* XXX */
-	pr_sname = '?'; /* XXX */
+translator lwpsinfo_t < struct lwp *T > {
+	pr_lwpid = T->l_lid;
+	pr_pri = T->l_priority;
+	pr_flag = T->l_flag;
+	pr_state = T->l_stat;
+	pr_sname = '?';	/* XXX */
 	pr_syscall = 0; /* XXX */
 	pr_addr = (uintptr_t)T;
-	pr_wchan = (uintptr_t)T->td_wchan;
+	pr_wchan = (uintptr_t)T->l_wchan;
 };
 
-inline psinfo_t *curpsinfo = xlate  (curthread->td_proc);
+/* XXX: does not work with multprocessor, since it needs curcpu() */
+/*
+inline psinfo_t *curpsinfo = xlate  (curlwp->l_proc);
 #pragma D attributes Stable/Stable/Common curpsinfo
 #pragma D binding "1.0" curpsinfo
 
-inline lwpsinfo_t *curlwpsinfo = xlate  (curthread);
+inline lwpsinfo_t *curlwpsinfo = xlate  (curlwp);
 #pragma D attributes Stable/Stable/Common curlwpsinfo
 #pragma D binding "1.0" curlwpsinfo
-
+*/

CVS commit: src/external/cddl/osnet/lib/libdtrace

2015-10-06 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Oct  7 00:35:23 UTC 2015

Modified Files:
src/external/cddl/osnet/lib/libdtrace: psinfo.d

Log Message:
fix the remaining problem with pcinfo; the dtracetoolkit execsnoop script
works.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/lib/libdtrace/psinfo.d

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/lib/libdtrace/psinfo.d
diff -u src/external/cddl/osnet/lib/libdtrace/psinfo.d:1.4 src/external/cddl/osnet/lib/libdtrace/psinfo.d:1.5
--- src/external/cddl/osnet/lib/libdtrace/psinfo.d:1.4	Tue Oct  6 18:12:09 2015
+++ src/external/cddl/osnet/lib/libdtrace/psinfo.d	Tue Oct  6 20:35:23 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: psinfo.d,v 1.4 2015/10/06 22:12:09 christos Exp $	*/
+/*	$NetBSD: psinfo.d,v 1.5 2015/10/07 00:35:23 christos Exp $	*/
 
 /*
  * CDDL HEADER START
@@ -87,13 +87,10 @@ translator lwpsinfo_t < struct lwp *T > 
 	pr_wchan = (uintptr_t)T->l_wchan;
 };
 
-/* XXX: does not work with multprocessor, since it needs curcpu() */
-/*
-inline psinfo_t *curpsinfo = xlate  (curlwp->l_proc);
+inline psinfo_t *curpsinfo = xlate  (curthread->l_proc);
 #pragma D attributes Stable/Stable/Common curpsinfo
 #pragma D binding "1.0" curpsinfo
 
-inline lwpsinfo_t *curlwpsinfo = xlate  (curlwp);
+inline lwpsinfo_t *curlwpsinfo = xlate  (curthread);
 #pragma D attributes Stable/Stable/Common curlwpsinfo
 #pragma D binding "1.0" curlwpsinfo
-*/

CVS commit: src/external/cddl/osnet/lib/libdtrace

2015-10-05 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Mon Oct  5 17:49:10 UTC 2015

Modified Files:
src/external/cddl/osnet/lib/libdtrace: Makefile

Log Message:
Arrange to install the dtrace files (some are broken, sets will need to be
fixed)


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/cddl/osnet/lib/libdtrace/Makefile

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/lib/libdtrace/Makefile
diff -u src/external/cddl/osnet/lib/libdtrace/Makefile:1.13 src/external/cddl/osnet/lib/libdtrace/Makefile:1.14
--- src/external/cddl/osnet/lib/libdtrace/Makefile:1.13	Tue Sep 29 20:17:09 2015
+++ src/external/cddl/osnet/lib/libdtrace/Makefile	Mon Oct  5 13:49:10 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2015/09/30 00:17:09 christos Exp $
+#	$NetBSD: Makefile,v 1.14 2015/10/05 17:49:10 christos Exp $
 
 # $FreeBSD: src/cddl/lib/libdtrace/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $
 
@@ -121,12 +121,8 @@ beforedepend:	dt_errtags.c dt_names.c
 foo:
 	echo ${OPENSOLARIS_USR_DISTDIR}
 
-#beforeinstall:
-#.if exists(${DESTDIR}/usr/lib/dtrace)
-#.for file in ${DSRCS}
-#	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} ${.CURDIR}/${file} ${DESTDIR}/usr/lib/dtrace
-#.endfor
-#.endif
+FILES=		${DSRCS}
+FILESDIR=	/usr/lib/dtrace
 
 LIBDPLIBS=	proc	${NETBSDSRCDIR}/external/bsd/libproc/lib

CVS commit: src/external/cddl/osnet/lib/libdtrace

2015-10-05 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Mon Oct  5 17:49:40 UTC 2015

Modified Files:
src/external/cddl/osnet/lib/libdtrace: psinfo.d

Log Message:
Start matching some of the field names to NetBSD's
XXX: needs work


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/lib/libdtrace/psinfo.d

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/lib/libdtrace/psinfo.d
diff -u src/external/cddl/osnet/lib/libdtrace/psinfo.d:1.2 src/external/cddl/osnet/lib/libdtrace/psinfo.d:1.3
--- src/external/cddl/osnet/lib/libdtrace/psinfo.d:1.2	Sat Feb 20 20:46:35 2010
+++ src/external/cddl/osnet/lib/libdtrace/psinfo.d	Mon Oct  5 13:49:40 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: psinfo.d,v 1.2 2010/02/21 01:46:35 darran Exp $	*/
+/*	$NetBSD: psinfo.d,v 1.3 2015/10/05 17:49:40 christos Exp $	*/
 
 /*
  * CDDL HEADER START
@@ -48,15 +48,17 @@ typedef struct psinfo {
 
 #pragma D binding "1.0" translator
 translator psinfo_t < struct proc *T > {
-	pr_nlwp = T->p_numthreads;
+	pr_nlwp = T->p_nlwps;
 	pr_pid = T->p_pid;
 	pr_ppid = (T->p_pptr == 0) ? 0 : T->p_pptr->p_pid;
-	pr_pgid = (T->p_leader == 0) ? 0 : T->p_leader->p_pid;
+	pr_pgid = (T->p_pgrp->pg_session->s_leader == 0) ? 0 : T->p_pgrp->pg_session->s_leader->p_pid;
 	pr_sid = (T->p_pgrp == 0) ? 0 : ((T->p_pgrp->pg_session == 0) ? 0 : T->p_pgrp->pg_session->s_sid);
-	pr_uid = T->p_ucred->cr_ruid;
-	pr_euid = T->p_ucred->cr_uid;
-	pr_gid = T->p_ucred->cr_rgid;
-	pr_egid = T->p_ucred->cr_groups[0];
+/* XXX: struct kauth_cred is not public
+	pr_uid = T->p_cred->cr_ruid;
+	pr_euid = T->p_cred->cr_uid;
+	pr_gid = T->p_cred->cr_rgid;
+	pr_egid = T->p_cred->cr_groups[0];
+ */
 	pr_addr = 0;
 	pr_psargs = stringof(T->p_args->ar_args);
 	pr_arglen = T->p_args->ar_length;

CVS commit: src/external/cddl/osnet/lib/libdtrace

2015-09-29 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Sep 30 00:17:09 UTC 2015

Modified Files:
src/external/cddl/osnet/lib/libdtrace: Makefile

Log Message:
do the stack protector stuff like the other files.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/cddl/osnet/lib/libdtrace/Makefile

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/lib/libdtrace/Makefile
diff -u src/external/cddl/osnet/lib/libdtrace/Makefile:1.12 src/external/cddl/osnet/lib/libdtrace/Makefile:1.13
--- src/external/cddl/osnet/lib/libdtrace/Makefile:1.12	Tue Sep 29 19:50:17 2015
+++ src/external/cddl/osnet/lib/libdtrace/Makefile	Tue Sep 29 20:17:09 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2015/09/29 23:50:17 christos Exp $
+#	$NetBSD: Makefile,v 1.13 2015/09/30 00:17:09 christos Exp $
 
 # $FreeBSD: src/cddl/lib/libdtrace/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $
 
@@ -83,6 +83,7 @@ COPTS.dt_link.c		+= -Wno-stack-protector
 COPTS.dt_options.c	+= -Wno-stack-protector
 COPTS.dt_parser.c	+= -Wno-stack-protector
 COPTS.dt_pragma.c	+= -Wno-stack-protector
+COPTS.dt_print.c	+= -Wno-stack-protector
 COPTS.dt_printf.c	+= -Wno-stack-protector
 COPTS.dt_program.c	+= -Wno-stack-protector
 COPTS.dt_provider.c	+= -Wno-stack-protector
@@ -107,10 +108,6 @@ YFLAGS+=-d
 
 CLEANFILES=	dt_errtags.c dt_names.c dt_grammar.h
 
-.if ${_HOST_OSNAME} == "Darwin"
-COPTS.dt_print.c+=	-fno-stack-protector
-.endif
-
 MKERRTAGS=${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common/mkerrtags.sh 
 dt_errtags.c: ${MKERRTAGS} ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common/dt_errtags.h 
 	sh ${MKERRTAGS} < ${.ALLSRC:M*.h} > ${.TARGET}

CVS commit: src/external/cddl/osnet/lib/libdtrace

2015-09-29 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Tue Sep 29 23:50:17 UTC 2015

Modified Files:
src/external/cddl/osnet/lib/libdtrace: Makefile

Log Message:
- make the generated file rules depend on the source files
- hack for clang on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/cddl/osnet/lib/libdtrace/Makefile

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/lib/libdtrace/Makefile
diff -u src/external/cddl/osnet/lib/libdtrace/Makefile:1.11 src/external/cddl/osnet/lib/libdtrace/Makefile:1.12
--- src/external/cddl/osnet/lib/libdtrace/Makefile:1.11	Thu Sep 24 10:36:54 2015
+++ src/external/cddl/osnet/lib/libdtrace/Makefile	Tue Sep 29 19:50:17 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2015/09/24 14:36:54 christos Exp $
+#	$NetBSD: Makefile,v 1.12 2015/09/29 23:50:17 christos Exp $
 
 # $FreeBSD: src/cddl/lib/libdtrace/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $
 
@@ -107,11 +107,17 @@ YFLAGS+=-d
 
 CLEANFILES=	dt_errtags.c dt_names.c dt_grammar.h
 
-dt_errtags.c:
-	sh ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common/mkerrtags.sh < ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common/dt_errtags.h > dt_errtags.c
+.if ${_HOST_OSNAME} == "Darwin"
+COPTS.dt_print.c+=	-fno-stack-protector
+.endif
 
-dt_names.c:
-	sh ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common/mknames.sh < ${OPENSOLARIS_SYS_DISTDIR}/uts/common/sys/dtrace.h > dt_names.c
+MKERRTAGS=${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common/mkerrtags.sh 
+dt_errtags.c: ${MKERRTAGS} ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common/dt_errtags.h 
+	sh ${MKERRTAGS} < ${.ALLSRC:M*.h} > ${.TARGET}
+
+MKNAMES=${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common/mknames.sh
+dt_names.c: ${MKNAMES} ${OPENSOLARIS_SYS_DISTDIR}/uts/common/sys/dtrace.h
+	sh ${MKNAMES} < ${.ALLSRC:M*.h} > ${.TARGET}
 
 beforedepend:	dt_errtags.c dt_names.c

CVS commit: src/external/cddl/osnet/lib/libctf

2015-09-16 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Sep 16 19:47:14 UTC 2015

Modified Files:
src/external/cddl/osnet/lib/libctf: Makefile

Log Message:
no need for LIBDPLIBS here


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/lib/libctf/Makefile

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/lib/libctf/Makefile
diff -u src/external/cddl/osnet/lib/libctf/Makefile:1.5 src/external/cddl/osnet/lib/libctf/Makefile:1.6
--- src/external/cddl/osnet/lib/libctf/Makefile:1.5	Tue Sep 15 14:38:41 2015
+++ src/external/cddl/osnet/lib/libctf/Makefile	Wed Sep 16 15:47:14 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2015/09/15 18:38:41 christos Exp $
+#	$NetBSD: Makefile,v 1.6 2015/09/16 19:47:14 christos Exp $
 
 # $FreeBSD: src/cddl/lib/libctf/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $
 
@@ -30,7 +30,8 @@ CPPFLAGS+=	-I${OSNETDIR}/sys \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 
-LIBDPLIBS+=	z	${NETBSDSRCDIR}/lib/libz
+LDADD+=	-lz
+DPADD+= ${LIBZ}
 
 .include

CVS commit: src/external/cddl/osnet/lib/libctf

2015-09-16 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Sep 17 01:53:48 UTC 2015

Modified Files:
src/external/cddl/osnet/lib/libctf: Makefile

Log Message:
don't depend on the installed version of libz


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/lib/libctf/Makefile

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/lib/libctf/Makefile
diff -u src/external/cddl/osnet/lib/libctf/Makefile:1.6 src/external/cddl/osnet/lib/libctf/Makefile:1.7
--- src/external/cddl/osnet/lib/libctf/Makefile:1.6	Wed Sep 16 15:47:14 2015
+++ src/external/cddl/osnet/lib/libctf/Makefile	Wed Sep 16 21:53:48 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2015/09/16 19:47:14 christos Exp $
+#	$NetBSD: Makefile,v 1.7 2015/09/17 01:53:48 christos Exp $
 
 # $FreeBSD: src/cddl/lib/libctf/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $
 
@@ -30,8 +30,7 @@ CPPFLAGS+=	-I${OSNETDIR}/sys \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 
-LDADD+=	-lz
-DPADD+= ${LIBZ}
+LIBDPLIBS+=	z	${NETBSDSRCDIR}/lib/libz
 
 .include

CVS commit: src/external/cddl/osnet/lib/libctf

2015-09-15 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Tue Sep 15 18:38:41 UTC 2015

Modified Files:
src/external/cddl/osnet/lib/libctf: Makefile

Log Message:
libctf depends on libz


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/lib/libctf/Makefile

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/lib/libctf/Makefile
diff -u src/external/cddl/osnet/lib/libctf/Makefile:1.4 src/external/cddl/osnet/lib/libctf/Makefile:1.5
--- src/external/cddl/osnet/lib/libctf/Makefile:1.4	Tue Sep 10 07:23:20 2013
+++ src/external/cddl/osnet/lib/libctf/Makefile	Tue Sep 15 14:38:41 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2013/09/10 11:23:20 christos Exp $
+#	$NetBSD: Makefile,v 1.5 2015/09/15 18:38:41 christos Exp $
 
 # $FreeBSD: src/cddl/lib/libctf/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $
 
@@ -30,5 +30,7 @@ CPPFLAGS+=	-I${OSNETDIR}/sys \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 
+LIBDPLIBS+=	z	${NETBSDSRCDIR}/lib/libz
+
 .include

CVS commit: src/external/cddl/osnet/lib/libzpool

2015-04-10 Thread Taylor R Campbell 
Module Name:src
Committed By:   riastradh
Date:   Fri Apr 10 22:36:50 UTC 2015

Modified Files:
src/external/cddl/osnet/lib/libzpool: Makefile

Log Message:
One usually puts .c, not .o, files in SRCS.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/cddl/osnet/lib/libzpool/Makefile

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/lib/libzpool/Makefile
diff -u src/external/cddl/osnet/lib/libzpool/Makefile:1.9 src/external/cddl/osnet/lib/libzpool/Makefile:1.10
--- src/external/cddl/osnet/lib/libzpool/Makefile:1.9	Tue Apr 22 15:02:38 2014
+++ src/external/cddl/osnet/lib/libzpool/Makefile	Fri Apr 10 22:36:50 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2014/04/22 15:02:38 christos Exp $
+#	$NetBSD: Makefile,v 1.10 2015/04/10 22:36:50 riastradh Exp $
 
 .include ${.CURDIR}/../../dist/uts/common/Makefile.files
 .include ../../Makefile.zfs
@@ -26,7 +26,7 @@ SRCS=		kernel.c kernel2.c atomic.c
 # Sun stuff
 SRCS+=		${ZFS_COMMON_OBJS:C/.o$/.c/}
 SRCS+=		${ZFS_SHARED_OBJS:C/.o$/.c/}
-SRCS+=		taskq.c util.c list.o u8_textprep.o
+SRCS+=		taskq.c util.c list.c u8_textprep.c
 
 print:
 	echo ${LIST_SRCS} ${LIST_OBJS}

CVS commit: src/external/cddl/osnet/lib/libdtrace

2014-03-16 Thread Ryota Ozaki 
Module Name:src
Committed By:   ozaki-r
Date:   Sun Mar 16 06:51:43 UTC 2014

Modified Files:
src/external/cddl/osnet/lib/libdtrace: Makefile

Log Message:
Use MACHINE_CPU instead of MACHINE_ARCH with pattern matching

Include bsd.own.mk to use MACHINE_CPU.

Advised by matt@


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/cddl/osnet/lib/libdtrace/Makefile

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/lib/libdtrace/Makefile
diff -u src/external/cddl/osnet/lib/libdtrace/Makefile:1.8 src/external/cddl/osnet/lib/libdtrace/Makefile:1.9
--- src/external/cddl/osnet/lib/libdtrace/Makefile:1.8	Sun Mar 16 05:11:19 2014
+++ src/external/cddl/osnet/lib/libdtrace/Makefile	Sun Mar 16 06:51:43 2014
@@ -1,7 +1,9 @@
-#	$NetBSD: Makefile,v 1.8 2014/03/16 05:11:19 ozaki-r Exp $
+#	$NetBSD: Makefile,v 1.9 2014/03/16 06:51:43 ozaki-r Exp $
 
 # $FreeBSD: src/cddl/lib/libdtrace/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $
 
+.include bsd.own.mk
+
 .include	../../Makefile.inc
 
 LIB=		dtrace
@@ -86,7 +88,7 @@ COPTS.dt_subr.c		+= -Wno-stack-protector
 CPPFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
 .elif ${MACHINE_ARCH} == sparc64
 CPPFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc
-.elif !empty(MACHINE_ARCH:M*arm*)
+.elif ${MACHINE_CPU} == arm
 CPPFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/arm
 .PATH:		${.CURDIR}/../../dist/lib/libdtrace/arm
 SRCS+=	dt_isadep.c

CVS commit: src/external/cddl/osnet/lib/libdtrace

2014-03-15 Thread Ryota Ozaki 
Module Name:src
Committed By:   ozaki-r
Date:   Sun Mar 16 05:11:19 UTC 2014

Modified Files:
src/external/cddl/osnet/lib/libdtrace: Makefile

Log Message:
Look up arm directory on MACHINE_ARCH=*arm*


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/lib/libdtrace/Makefile

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/lib/libdtrace/Makefile
diff -u src/external/cddl/osnet/lib/libdtrace/Makefile:1.7 src/external/cddl/osnet/lib/libdtrace/Makefile:1.8
--- src/external/cddl/osnet/lib/libdtrace/Makefile:1.7	Fri Jun 21 19:16:01 2013
+++ src/external/cddl/osnet/lib/libdtrace/Makefile	Sun Mar 16 05:11:19 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2013/06/21 19:16:01 christos Exp $
+#	$NetBSD: Makefile,v 1.8 2014/03/16 05:11:19 ozaki-r Exp $
 
 # $FreeBSD: src/cddl/lib/libdtrace/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $
 
@@ -86,7 +86,7 @@ COPTS.dt_subr.c		+= -Wno-stack-protector
 CPPFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
 .elif ${MACHINE_ARCH} == sparc64
 CPPFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc
-.elif ${MACHINE_ARCH} == arm
+.elif !empty(MACHINE_ARCH:M*arm*)
 CPPFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/arm
 .PATH:		${.CURDIR}/../../dist/lib/libdtrace/arm
 SRCS+=	dt_isadep.c

CVS commit: src/external/cddl/osnet/lib/libctf

2013-09-10 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Tue Sep 10 11:23:20 UTC 2013

Modified Files:
src/external/cddl/osnet/lib/libctf: Makefile

Log Message:
-D and -I are CPPFLAGS


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/lib/libctf/Makefile

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/lib/libctf/Makefile
diff -u src/external/cddl/osnet/lib/libctf/Makefile:1.3 src/external/cddl/osnet/lib/libctf/Makefile:1.4
--- src/external/cddl/osnet/lib/libctf/Makefile:1.3	Sat Apr  3 14:35:49 2010
+++ src/external/cddl/osnet/lib/libctf/Makefile	Tue Sep 10 07:23:20 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2010/04/03 18:35:49 christos Exp $
+#	$NetBSD: Makefile,v 1.4 2013/09/10 11:23:20 christos Exp $
 
 # $FreeBSD: src/cddl/lib/libctf/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $
 
@@ -21,9 +21,9 @@ SRCS=		ctf_create.c \
 .PATH:		${.CURDIR}/../../dist/common/ctf
 .PATH:		${.CURDIR}/../../dist/lib/libctf/common
 
-CFLAGS+=	-DCTF_OLD_VERSIONS
+CPPFLAGS+=	-DCTF_OLD_VERSIONS
 
-CFLAGS+=	-I${OSNETDIR}/sys \
+CPPFLAGS+=	-I${OSNETDIR}/sys \
 		-I${OSNETDIR}/include \
 		-I${OPENSOLARIS_USR_DISTDIR}/head \
 		-I${OPENSOLARIS_USR_DISTDIR}/common/ctf \

CVS commit: src/external/cddl/osnet/lib/libzpool

2013-01-01 Thread David Laight 
Module Name:src
Committed By:   dsl
Date:   Tue Jan  1 19:03:26 UTC 2013

Modified Files:
src/external/cddl/osnet/lib/libzpool: kernel.c

Log Message:
Comment out the unused 'struct proc p0;'
This is userspace, it isn't supposed to know what a 'struct proc' is.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/lib/libzpool/kernel.c

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/lib/libzpool/kernel.c
diff -u src/external/cddl/osnet/lib/libzpool/kernel.c:1.5 src/external/cddl/osnet/lib/libzpool/kernel.c:1.6
--- src/external/cddl/osnet/lib/libzpool/kernel.c:1.5	Tue Dec 28 13:36:09 2010
+++ src/external/cddl/osnet/lib/libzpool/kernel.c	Tue Jan  1 19:03:26 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kernel.c,v 1.5 2010/12/28 13:36:09 haad Exp $  */
+/* $NetBSD: kernel.c,v 1.6 2013/01/01 19:03:26 dsl Exp $  */
 
 /*
  * CDDL HEADER START
@@ -29,7 +29,7 @@
 #pragma ident	%Z%%M%	%I%	%E% SMI
 
 #include sys/cdefs.h
-__RCSID($NetBSD: kernel.c,v 1.5 2010/12/28 13:36:09 haad Exp $);
+__RCSID($NetBSD: kernel.c,v 1.6 2013/01/01 19:03:26 dsl Exp $);
 
 #include sys/zfs_context.h
 #include sys/sysctl.h
@@ -65,7 +65,7 @@ struct utsname utsname = {
 };
 
 /* this only exists to have its address taken */
-struct proc p0;
+// struct proc p0;
 
 /*
  * =

CVS commit: src/external/cddl/osnet/lib/libzfs

2012-07-05 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Jul  5 13:55:58 UTC 2012

Modified Files:
src/external/cddl/osnet/lib/libzfs: deviceid.c

Log Message:
PR/46660: Henning Petersen: Fix typo in deviceid.c


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/lib/libzfs/deviceid.c

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/lib/libzfs/deviceid.c
diff -u src/external/cddl/osnet/lib/libzfs/deviceid.c:1.1 src/external/cddl/osnet/lib/libzfs/deviceid.c:1.2
--- src/external/cddl/osnet/lib/libzfs/deviceid.c:1.1	Fri Aug  7 16:57:56 2009
+++ src/external/cddl/osnet/lib/libzfs/deviceid.c	Thu Jul  5 09:55:58 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: deviceid.c,v 1.1 2009/08/07 20:57:56 haad Exp $	*/
+/*	$NetBSD: deviceid.c,v 1.2 2012/07/05 13:55:58 christos Exp $	*/
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
 
 #include sys/cdefs.h
 /* __FBSDID($FreeBSD: src/compat/opensolaris/misc/deviceid.c,v 1.1 2007/05/06 01:39:38 pjd Exp $); */
-__RCSID($NetBSD: deviceid.c,v 1.1 2009/08/07 20:57:56 haad Exp $);
+__RCSID($NetBSD: deviceid.c,v 1.2 2012/07/05 13:55:58 christos Exp $);
 
 #include sys/param.h
 #include sys/ioctl.h
@@ -78,7 +78,7 @@ devid_str_decode(char *devidstr, ddi_dev
 		return (EINVAL);
 	}
 	*retminor_name = strdup();
-	if (*retminor_name == NULL);
+	if (*retminor_name == NULL)
 		return (ENOMEM);
 	return (0);
 }

CVS commit: src/external/cddl/osnet/lib/libdtrace

2012-02-13 Thread Thomas Klausner 
Module Name:src
Committed By:   wiz
Date:   Mon Feb 13 12:52:54 UTC 2012

Modified Files:
src/external/cddl/osnet/lib/libdtrace: Makefile

Log Message:
Use the correct MACHINE_ARCH for amd64.
Remove temporary hack while here.
From Henning Petersen in PR 46001.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/lib/libdtrace/Makefile

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/lib/libdtrace/Makefile
diff -u src/external/cddl/osnet/lib/libdtrace/Makefile:1.5 src/external/cddl/osnet/lib/libdtrace/Makefile:1.6
--- src/external/cddl/osnet/lib/libdtrace/Makefile:1.5	Sat Apr  3 18:34:19 2010
+++ src/external/cddl/osnet/lib/libdtrace/Makefile	Mon Feb 13 12:52:54 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2010/04/03 18:34:19 christos Exp $
+#	$NetBSD: Makefile,v 1.6 2012/02/13 12:52:54 wiz Exp $
 
 # $FreeBSD: src/cddl/lib/libdtrace/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $
 
@@ -82,13 +82,10 @@ COPTS.dt_program.c	+= -Wno-stack-protect
 COPTS.dt_provider.c	+= -Wno-stack-protector
 COPTS.dt_subr.c		+= -Wno-stack-protector
 
-.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == amd64
+.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64
 CPPFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
 .elif ${MACHINE_ARCH} == sparc64
 CPPFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc
-.else
-# temporary hack
-CPPFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
 .endif
 
 LFLAGS+=-l

CVS commit: src/external/cddl/osnet/lib/libzpool

2010-12-14 Thread Adam Hamsik 
Module Name:src
Committed By:   haad
Date:   Tue Dec 14 09:19:15 UTC 2010

Modified Files:
src/external/cddl/osnet/lib/libzpool: Makefile

Log Message:
Use only cas versions of 64 bit atomic ops.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/lib/libzpool/Makefile

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/lib/libzpool/Makefile
diff -u src/external/cddl/osnet/lib/libzpool/Makefile:1.4 src/external/cddl/osnet/lib/libzpool/Makefile:1.5
--- src/external/cddl/osnet/lib/libzpool/Makefile:1.4	Sun Feb 21 01:46:35 2010
+++ src/external/cddl/osnet/lib/libzpool/Makefile	Tue Dec 14 09:19:14 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2010/02/21 01:46:35 darran Exp $
+#	$NetBSD: Makefile,v 1.5 2010/12/14 09:19:14 haad Exp $
 
 .include ${.CURDIR}/../../dist/uts/common/Makefile.files
 .include ../../Makefile.zfs
@@ -13,6 +13,7 @@
 DPADD=		${LIBPTHREAD} ${LIBZ}
 LDADD=		-lpthread -lz
 CPPFLAGS+=	-std=c99
+#CPPFLAGS+=-Wall -Wno-unknown-pragmas
 
 # Local stuff
 SRCS=		kernel.c kernel2.c
@@ -26,7 +27,7 @@
 .if ${MACHINE_ARCH} == i386
 CPPFLAGS+=	-D__HAVE_ATOMIC64_OPS	# add NetBSD 64 add operations on i386
 .PATH: ${NETBSDSRCDIR}/common/lib/libc/atomic
-SRCS+= atomic_add_64_cas.c atomic_add_64_nv_cas.c atomic_inc_64_add.c atomic_dec_64_add.c
+SRCS+= atomic_add_64_cas.c atomic_add_64_nv_cas.c atomic_inc_64_cas.c atomic_dec_64_cas.c
 .endif
 
 print:

CVS commit: src/external/cddl/osnet/lib/libzpool

2010-12-14 Thread Adam Hamsik 
Module Name:src
Committed By:   haad
Date:   Tue Dec 14 23:39:11 UTC 2010

Modified Files:
src/external/cddl/osnet/lib/libzpool: Makefile

Log Message:
Do not built 64b atomic ops to libzpool they are in libc again.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/lib/libzpool/Makefile

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/lib/libzpool/Makefile
diff -u src/external/cddl/osnet/lib/libzpool/Makefile:1.5 src/external/cddl/osnet/lib/libzpool/Makefile:1.6
--- src/external/cddl/osnet/lib/libzpool/Makefile:1.5	Tue Dec 14 09:19:14 2010
+++ src/external/cddl/osnet/lib/libzpool/Makefile	Tue Dec 14 23:39:11 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2010/12/14 09:19:14 haad Exp $
+#	$NetBSD: Makefile,v 1.6 2010/12/14 23:39:11 haad Exp $
 
 .include ${.CURDIR}/../../dist/uts/common/Makefile.files
 .include ../../Makefile.zfs
@@ -23,13 +23,6 @@
 SRCS+=		${ZFS_SHARED_OBJS:C/.o$/.c/}
 SRCS+=		taskq.c util.c list.o u8_textprep.o
 
-# Add opensolaris atomic functions and use fakedones if we do not support them
-.if ${MACHINE_ARCH} == i386
-CPPFLAGS+=	-D__HAVE_ATOMIC64_OPS	# add NetBSD 64 add operations on i386
-.PATH: ${NETBSDSRCDIR}/common/lib/libc/atomic
-SRCS+= atomic_add_64_cas.c atomic_add_64_nv_cas.c atomic_inc_64_cas.c atomic_dec_64_cas.c
-.endif
-
 print:
 	echo ${LIST_SRCS} ${LIST_OBJS}

CVS commit: src/external/cddl/osnet/lib/libumem

2010-12-13 Thread Adam Hamsik 
Module Name:src
Committed By:   haad
Date:   Tue Dec 14 01:25:37 UTC 2010

Modified Files:
src/external/cddl/osnet/lib/libumem: stub_stand.c

Log Message:
Define mutex_owned.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/lib/libumem/stub_stand.c

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/lib/libumem/stub_stand.c
diff -u src/external/cddl/osnet/lib/libumem/stub_stand.c:1.1 src/external/cddl/osnet/lib/libumem/stub_stand.c:1.2
--- src/external/cddl/osnet/lib/libumem/stub_stand.c:1.1	Sun Feb 28 22:45:45 2010
+++ src/external/cddl/osnet/lib/libumem/stub_stand.c	Tue Dec 14 01:25:37 2010
@@ -55,6 +55,12 @@
 	return (1);
 }
 
+int
+mutex_owned(mutex_t *mp)
+{
+	return (1);
+}
+
 /*ARGSUSED*/
 int
 mutex_lock(mutex_t *mp)

CVS commit: src/external/cddl/osnet/lib/libzpool

2010-05-11 Thread Adam Hamsik 
Module Name:src
Committed By:   haad
Date:   Tue May 11 22:18:10 UTC 2010

Modified Files:
src/external/cddl/osnet/lib/libzpool: kernel2.c

Log Message:
Fix userspace cv_timedwait implementation to work on NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/lib/libzpool/kernel2.c

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/lib/libzpool/kernel2.c
diff -u src/external/cddl/osnet/lib/libzpool/kernel2.c:1.1 src/external/cddl/osnet/lib/libzpool/kernel2.c:1.2
--- src/external/cddl/osnet/lib/libzpool/kernel2.c:1.1	Fri Aug  7 20:57:56 2009
+++ src/external/cddl/osnet/lib/libzpool/kernel2.c	Tue May 11 22:18:10 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: kernel2.c,v 1.1 2009/08/07 20:57:56 haad Exp $	*/
+/*	$NetBSD: kernel2.c,v 1.2 2010/05/11 22:18:10 haad Exp $	*/
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__RCSID($NetBSD: kernel2.c,v 1.1 2009/08/07 20:57:56 haad Exp $);
+__RCSID($NetBSD: kernel2.c,v 1.2 2010/05/11 22:18:10 haad Exp $);
 
 #include sys/zfs_context.h
 
@@ -239,6 +239,7 @@
 clock_t
 cv_timedwait(kcondvar_t *cv, kmutex_t *mp, clock_t abstime)
 {
+	struct timespec nowts;
 	struct timespec ts;
 	uint64_t when;
 	int error;
@@ -247,10 +248,14 @@
 		cv_init(cv, NULL, 0, NULL);
 	}
 
+	clock_gettime(CLOCK_REALTIME, nowts);
+	
 	/* convert back from 119hz to nanoseconds. */
-	when = abstime  23;
+	when = (uint64_t)abstime  23;
 	ts.tv_sec = (long)(abstime / 10);
 	ts.tv_nsec = (long)(abstime % 10);
+
+	timespecadd(ts, nowts, ts);
 	
 	do {
 		error = pthread_cond_timedwait(GET(cv), GET(mp), ts);

CVS commit: src/external/cddl/osnet/lib/libumem

2010-05-10 Thread Adam Hamsik 
Module Name:src
Committed By:   haad
Date:   Mon May 10 06:27:57 UTC 2010

Modified Files:
src/external/cddl/osnet/lib/libumem: Makefile

Log Message:
Disable building of stub_stand.c we build all locking primitives in libzpool.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/lib/libumem/Makefile

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/lib/libumem/Makefile
diff -u src/external/cddl/osnet/lib/libumem/Makefile:1.4 src/external/cddl/osnet/lib/libumem/Makefile:1.5
--- src/external/cddl/osnet/lib/libumem/Makefile:1.4	Sun Feb 28 22:45:45 2010
+++ src/external/cddl/osnet/lib/libumem/Makefile	Mon May 10 06:27:57 2010
@@ -1,7 +1,7 @@
-#	$NetBSD: Makefile,v 1.4 2010/02/28 22:45:45 haad Exp $
+#	$NetBSD: Makefile,v 1.5 2010/05/10 06:27:57 haad Exp $
 
 LIB=	umem
-SRCS=	umem.c stub_stand.c
+SRCS=	umem.c
 
 .include ../../Makefile.zfs
 .include bsd.lib.mk

CVS commit: src/external/cddl/osnet/lib/libzpool

2010-05-02 Thread Adam Hamsik 
Module Name:src
Committed By:   haad
Date:   Sun May  2 23:50:34 UTC 2010

Modified Files:
src/external/cddl/osnet/lib/libzpool: kernel.c

Log Message:
Initialize system_taskq during taskq init. This fixes ztest crash in 
taskq_dispatch.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/lib/libzpool/kernel.c

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/lib/libzpool/kernel.c
diff -u src/external/cddl/osnet/lib/libzpool/kernel.c:1.3 src/external/cddl/osnet/lib/libzpool/kernel.c:1.4
--- src/external/cddl/osnet/lib/libzpool/kernel.c:1.3	Mon Mar  1 21:13:10 2010
+++ src/external/cddl/osnet/lib/libzpool/kernel.c	Sun May  2 23:50:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kernel.c,v 1.3 2010/03/01 21:13:10 haad Exp $  */
+/* $NetBSD: kernel.c,v 1.4 2010/05/02 23:50:34 haad Exp $  */
 
 /*
  * CDDL HEADER START
@@ -29,7 +29,7 @@
 #pragma ident	%Z%%M%	%I%	%E% SMI
 
 #include sys/cdefs.h
-__RCSID($NetBSD: kernel.c,v 1.3 2010/03/01 21:13:10 haad Exp $);
+__RCSID($NetBSD: kernel.c,v 1.4 2010/05/02 23:50:34 haad Exp $);
 
 #include sys/zfs_context.h
 #include sys/sysctl.h
@@ -597,6 +597,8 @@
 
 	snprintf(hw_serial, sizeof (hw_serial), %ld, gethostid());
 
+	system_taskq_init();
+
 	spa_init(mode);
 }

CVS commit: src/external/cddl/osnet/lib/libumem

2010-05-02 Thread Adam Hamsik 
Module Name:src
Committed By:   haad
Date:   Sun May  2 23:59:54 UTC 2010

Modified Files:
src/external/cddl/osnet/lib/libumem: umem.c

Log Message:
In NetBSD pool cache constructor/destructor routines has inverted arguments.

C


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/lib/libumem/umem.c

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/lib/libumem/umem.c
diff -u src/external/cddl/osnet/lib/libumem/umem.c:1.1 src/external/cddl/osnet/lib/libumem/umem.c:1.2
--- src/external/cddl/osnet/lib/libumem/umem.c:1.1	Fri Aug  7 20:57:56 2009
+++ src/external/cddl/osnet/lib/libumem/umem.c	Sun May  2 23:59:54 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: umem.c,v 1.1 2009/08/07 20:57:56 haad Exp $	*/
+/*	$NetBSD: umem.c,v 1.2 2010/05/02 23:59:54 haad Exp $	*/
 
 /*
  * CDDL HEADER START
@@ -135,7 +135,8 @@
 	}
 
 	if(cache-constructor != NULL) {
-		if(cache-constructor(buf, cache-callback_data, flags) != 0) {
+		/* XXX NetBSD pool cache costructor has switched arguments. */
+		if(cache-constructor(cache-callback_data, buf, flags) != 0) {
 			free(buf);
 			if(!(flags  UMEM_NOFAIL))
 return NULL;
@@ -155,7 +156,8 @@
 void umem_cache_free(umem_cache_t *cache, void *buffer)
 {
 	if(cache-destructor != NULL)
-		cache-destructor(buffer, cache-callback_data);
+		/* XXX NetBSD pool cache costructor has switched arguments. */
+		cache-destructor(cache-callback_data, buffer);
 
 	free(buffer);
 }

CVS commit: src/external/cddl/osnet/lib/libdtrace

2010-04-03 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sat Apr  3 18:34:20 UTC 2010

Modified Files:
src/external/cddl/osnet/lib/libdtrace: Makefile

Log Message:
- use CPPFLAGS instead of CFLAGS
- use relative .PATH


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/lib/libdtrace/Makefile

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/lib/libdtrace/Makefile
diff -u src/external/cddl/osnet/lib/libdtrace/Makefile:1.4 src/external/cddl/osnet/lib/libdtrace/Makefile:1.5
--- src/external/cddl/osnet/lib/libdtrace/Makefile:1.4	Wed Feb 24 10:40:54 2010
+++ src/external/cddl/osnet/lib/libdtrace/Makefile	Sat Apr  3 14:34:19 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2010/02/24 15:40:54 tron Exp $
+#	$NetBSD: Makefile,v 1.5 2010/04/03 18:34:19 christos Exp $
 
 # $FreeBSD: src/cddl/lib/libdtrace/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $
 
@@ -52,10 +52,10 @@
 		signal.d		\
 		unistd.d
 
-.PATH:		${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common
-.PATH:		${OPENSOLARIS_USR_DISTDIR}/lib/libgen/common
+.PATH:		${.CURDIR}/../../dist/lib/libgen/common
+.PATH:		${.CURDIR}/../../dist/lib/libdtrace/common
 
-CFLAGS+=	-I${.OBJDIR} \
+CPPFLAGS+=	-I${.OBJDIR} \
 		-I${OSNETDIR}/sys \
 		-I${OSNETDIR}/include \
 		-I${OPENSOLARIS_USR_DISTDIR}/head \
@@ -83,12 +83,12 @@
 COPTS.dt_subr.c		+= -Wno-stack-protector
 
 .if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == amd64
-CFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
+CPPFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
 .elif ${MACHINE_ARCH} == sparc64
-CFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc
+CPPFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc
 .else
 # temporary hack
-CFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
+CPPFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
 .endif
 
 LFLAGS+=-l
@@ -105,6 +105,9 @@
 
 beforedepend:	dt_errtags.c dt_names.c
 
+foo:
+	echo ${OPENSOLARIS_USR_DISTDIR}
+
 #beforeinstall:
 #.if exists(${DESTDIR}/usr/lib/dtrace)
 #.for file in ${DSRCS}

CVS commit: src/external/cddl/osnet/lib/libctf

2010-04-03 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sat Apr  3 18:35:49 UTC 2010

Modified Files:
src/external/cddl/osnet/lib/libctf: Makefile

Log Message:
use relative .PATH, and remove one that is not needed.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/lib/libctf/Makefile

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/lib/libctf/Makefile
diff -u src/external/cddl/osnet/lib/libctf/Makefile:1.2 src/external/cddl/osnet/lib/libctf/Makefile:1.3
--- src/external/cddl/osnet/lib/libctf/Makefile:1.2	Sat Feb 20 20:46:35 2010
+++ src/external/cddl/osnet/lib/libctf/Makefile	Sat Apr  3 14:35:49 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2010/02/21 01:46:35 darran Exp $
+#	$NetBSD: Makefile,v 1.3 2010/04/03 18:35:49 christos Exp $
 
 # $FreeBSD: src/cddl/lib/libctf/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $
 
@@ -18,9 +18,8 @@
 		ctf_types.c \
 		ctf_util.c
 
-.PATH:		${OPENSOLARIS_USR_DISTDIR}/common/ctf
-.PATH:		${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common
-.PATH:		${OPENSOLARIS_SYS_DISTDIR}/common/ctf
+.PATH:		${.CURDIR}/../../dist/common/ctf
+.PATH:		${.CURDIR}/../../dist/lib/libctf/common
 
 CFLAGS+=	-DCTF_OLD_VERSIONS

CVS commit: src/external/cddl/osnet/lib

2010-02-24 Thread Matthias Scheler 
Module Name:src
Committed By:   tron
Date:   Wed Feb 24 12:18:37 UTC 2010

Modified Files:
src/external/cddl/osnet/lib: Makefile

Log Message:
Include bsd.own.mk before checking MKDTRACE to allow setting it
in /etc/mk.conf.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/lib/Makefile

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/lib/Makefile
diff -u src/external/cddl/osnet/lib/Makefile:1.3 src/external/cddl/osnet/lib/Makefile:1.4
--- src/external/cddl/osnet/lib/Makefile:1.3	Sun Feb 21 01:46:34 2010
+++ src/external/cddl/osnet/lib/Makefile	Wed Feb 24 12:18:37 2010
@@ -1,7 +1,9 @@
-#	$NetBSD: Makefile,v 1.3 2010/02/21 01:46:34 darran Exp $
+#	$NetBSD: Makefile,v 1.4 2010/02/24 12:18:37 tron Exp $
 #
 #
 
+.include bsd.own.mk
+
 .if (defined(MKDTRACE)  ${MKDTRACE} != no)
 SUBDIR+=	libdtrace
 SUBDIR+=	libctf

CVS commit: src/external/cddl/osnet/lib/libnvpair

2010-02-17 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Feb 17 17:36:32 UTC 2010

Modified Files:
src/external/cddl/osnet/lib/libnvpair: Makefile

Log Message:
Fix build issue with our make system building libnvpair.so from libnvpair.c
and libnvpair.so from *.so by renaming libnvpair.c to lib_nvpair.c


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/lib/libnvpair/Makefile

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/lib/libnvpair/Makefile
diff -u src/external/cddl/osnet/lib/libnvpair/Makefile:1.1 src/external/cddl/osnet/lib/libnvpair/Makefile:1.2
--- src/external/cddl/osnet/lib/libnvpair/Makefile:1.1	Fri Aug  7 16:57:56 2009
+++ src/external/cddl/osnet/lib/libnvpair/Makefile	Wed Feb 17 12:36:32 2010
@@ -1,11 +1,17 @@
-#	$NetBSD: Makefile,v 1.1 2009/08/07 20:57:56 haad Exp $
+#	$NetBSD: Makefile,v 1.2 2010/02/17 17:36:32 christos Exp $
 
 .PATH:  ${.CURDIR}/../../dist/lib/libnvpair
 .PATH:  ${.CURDIR}/../../dist/common/nvpair
 
 LIB=	nvpair
 
-SRCS=	libnvpair.c nvpair_alloc_system.c nvpair_alloc_fixed.c nvpair.c
+SRCS=	lib_nvpair.c nvpair_alloc_system.c nvpair_alloc_fixed.c nvpair.c
+
+lib_nvpair.c: libnvpair.c
+	@rm -f ${.TARGET}
+	@ln -s ${.ALLSRC} ${.TARGET}
+
+CLEANFILES+=lib_nvpair.c
 
 .include ../../Makefile.zfs
 .include bsd.lib.mk

CVS commit: src/external/cddl/osnet/lib/libzpool

2009-10-06 Thread Adam Hamsik 
Module Name:src
Committed By:   haad
Date:   Tue Oct  6 16:28:10 UTC 2009

Modified Files:
src/external/cddl/osnet/lib/libzpool: Makefile

Log Message:
Enable build of 64 bit atomic ops in userspace for i386. This is needed for
all 32 bit archs which doesn't have a 64 atomic ops. This change enable MKZFS
build for a i386.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/lib/libzpool/Makefile

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/lib/libzpool/Makefile
diff -u src/external/cddl/osnet/lib/libzpool/Makefile:1.1 src/external/cddl/osnet/lib/libzpool/Makefile:1.2
--- src/external/cddl/osnet/lib/libzpool/Makefile:1.1	Fri Aug  7 20:57:56 2009
+++ src/external/cddl/osnet/lib/libzpool/Makefile	Tue Oct  6 16:28:10 2009
@@ -1,6 +1,7 @@
-#	$NetBSD: Makefile,v 1.1 2009/08/07 20:57:56 haad Exp $
+#	$NetBSD: Makefile,v 1.2 2009/10/06 16:28:10 haad Exp $
 
 .include ${.CURDIR}/../../dist/uts/common/Makefile.files
+.include ../../Makefile.zfs
 
 .PATH: ${.CURDIR}/../../dist/common/zfs
 .PATH: ${.CURDIR}/../../dist/common/unicode
@@ -21,8 +22,15 @@
 SRCS+=		${ZFS_SHARED_OBJS:C/.o$/.c/}
 SRCS+=		taskq.c util.c list.o u8_textprep.o
 
+# Add opensolaris atomic functions and use fakedones if we do not support them
+.if ${MACHINE_ARCH} == i386
+CPPFLAGS+=	-D__HAVE_ATOMIC64_OPS	# add NetBSD 64 add operations on i386
+.PATH: ${NETBSDSRCDIR}/common/lib/libc/atomic
+SRCS+= atomic_add_64_cas.c atomic_add_64_nv_cas.c atomic_inc_64_add.c atomic_dec_64_add.c
+.endif
+
 print:
 	echo ${LIST_SRCS} ${LIST_OBJS}
 
-.include ../../Makefile.zfs
+
 .include bsd.lib.mk

CVS commit: src/external/cddl/osnet/lib/libzfs

2009-08-10 Thread Adam Hamsik 
Module Name:src
Committed By:   haad
Date:   Mon Aug 10 22:44:41 UTC 2009

Modified Files:
src/external/cddl/osnet/lib/libzfs: fsshare.c

Log Message:
Rename getline to zgetline to avoid clashes with NetBSD getline.

Problem found by za...@.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/lib/libzfs/fsshare.c

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/lib/libzfs/fsshare.c
diff -u src/external/cddl/osnet/lib/libzfs/fsshare.c:1.1 src/external/cddl/osnet/lib/libzfs/fsshare.c:1.2
--- src/external/cddl/osnet/lib/libzfs/fsshare.c:1.1	Fri Aug  7 20:57:56 2009
+++ src/external/cddl/osnet/lib/libzfs/fsshare.c	Mon Aug 10 22:44:41 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: fsshare.c,v 1.1 2009/08/07 20:57:56 haad Exp $	*/
+/*	$NetBSD: fsshare.c,v 1.2 2009/08/10 22:44:41 haad Exp $	*/
 
 /*-
  * Copyright (c) 2007 Pawel Jakub Dawidek p...@freebsd.org
@@ -28,7 +28,7 @@
 
 #include sys/cdefs.h
 /* __FBSDID($FreeBSD: src/compat/opensolaris/misc/fsshare.c,v 1.2 2007/04/21 13:17:23 pjd Exp $); */
-__RCSID($NetBSD: fsshare.c,v 1.1 2009/08/07 20:57:56 haad Exp $);
+__RCSID($NetBSD: fsshare.c,v 1.2 2009/08/10 22:44:41 haad Exp $);
 
 #include sys/param.h
 #include stdio.h
@@ -65,7 +65,7 @@
  * mountpoint specified in the 'skip' argument.
  */
 static char *
-getline(FILE *fd, const char *skip)
+zgetline(FILE *fd, const char *skip)
 {
 	static char line[MAXLINESIZE];
 	size_t len, skiplen;
@@ -196,7 +196,7 @@
 
 	/* Place big, fat warning at the begining of the file. */
 	fprintf(newfd, %s, FILE_HEADER);
-	while (oldfd != NULL  (line = getline(oldfd, mountpoint)) != NULL)
+	while (oldfd != NULL  (line = zgetline(oldfd, mountpoint)) != NULL)
 		fprintf(newfd, %s\n, line);
 	if (oldfd != NULL  ferror(oldfd) != 0) {
 		error = ferror(oldfd);