CVS commit: src/sys/modules/dtrace

2021-04-25 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Apr 25 23:41:23 UTC 2021

Modified Files:
src/sys/modules/dtrace: Makefile

Log Message:
Handle mipsn64


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/modules/dtrace/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/dtrace/Makefile
diff -u src/sys/modules/dtrace/Makefile:1.9 src/sys/modules/dtrace/Makefile:1.10
--- src/sys/modules/dtrace/Makefile:1.9	Sat Apr 10 11:34:05 2021
+++ src/sys/modules/dtrace/Makefile	Sun Apr 25 19:41:23 2021
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.9 2021/04/10 15:34:05 simonb Exp $
+#	$NetBSD: Makefile,v 1.10 2021/04/25 23:41:23 christos Exp $
 # $FreeBSD: src/sys/modules/dtrace/Makefile,v 1.6.2.1 2009/08/03 08:13:06 kensmith Exp $
 
 .include 
 
 SUBDIR=		dtrace sdt fbt lockstat profile syscall
 
-.if ${MACHINE_ARCH} == "x86_64" || !empty(MACHINE_ARCH:Mmips64*)
+.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_MIPS64}
 SUBDIR+=	netbsd32_syscall
 .endif
 



CVS commit: src/sys/modules/dtrace

2021-04-13 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Tue Apr 13 19:16:51 UTC 2021

Modified Files:
src/sys/modules/dtrace/netbsd32_syscall: Makefile
src/sys/modules/dtrace/syscall: Makefile

Log Message:
apply -Wno-error=array-bounds for GCC 10.

these trigger "pointer to end of array" issues, and i'm not
entirely sure what is happening in the code generated for the
two "INDIR" system calls from syscalls.master.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/modules/dtrace/netbsd32_syscall/Makefile
cvs rdiff -u -r1.7 -r1.8 src/sys/modules/dtrace/syscall/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/dtrace/netbsd32_syscall/Makefile
diff -u src/sys/modules/dtrace/netbsd32_syscall/Makefile:1.7 src/sys/modules/dtrace/netbsd32_syscall/Makefile:1.8
--- src/sys/modules/dtrace/netbsd32_syscall/Makefile:1.7	Sun Feb 17 04:05:48 2019
+++ src/sys/modules/dtrace/netbsd32_syscall/Makefile	Tue Apr 13 19:16:51 2021
@@ -16,6 +16,7 @@ WARNS=		4
 CPPFLAGS+=	-Wno-unknown-pragmas
 
 CPPFLAGS+=	${${ACTIVE_CC} == "gcc" :? -Wno-discarded-qualifiers :}
+CPPFLAGS+=	${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -Wno-error=array-bounds :}
 CPPFLAGS+=	${${ACTIVE_CC} == "clang" :? -Wno-incompatible-pointer-types-discards-qualifiers :}
 
 .include 

Index: src/sys/modules/dtrace/syscall/Makefile
diff -u src/sys/modules/dtrace/syscall/Makefile:1.7 src/sys/modules/dtrace/syscall/Makefile:1.8
--- src/sys/modules/dtrace/syscall/Makefile:1.7	Sun Feb 17 04:05:48 2019
+++ src/sys/modules/dtrace/syscall/Makefile	Tue Apr 13 19:16:51 2021
@@ -16,6 +16,7 @@ WARNS=		4
 CPPFLAGS+=	-Wno-unknown-pragmas
 
 CPPFLAGS+=	${${ACTIVE_CC} == "gcc" :? -Wno-discarded-qualifiers :}
+CPPFLAGS+=	${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -Wno-error=array-bounds :}
 CPPFLAGS+=	${${ACTIVE_CC} == "clang" :? -Wno-incompatible-pointer-types-discards-qualifiers :}
 
 .include 



CVS commit: src/sys/modules/dtrace

2021-04-10 Thread Simon Burge
Module Name:src
Committed By:   simonb
Date:   Sat Apr 10 15:34:05 UTC 2021

Modified Files:
src/sys/modules/dtrace: Makefile

Log Message:
Build the netbsd32_syscall module if mips64.
Don't build the linux_syscall module if mips*


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/modules/dtrace/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/dtrace/Makefile
diff -u src/sys/modules/dtrace/Makefile:1.8 src/sys/modules/dtrace/Makefile:1.9
--- src/sys/modules/dtrace/Makefile:1.8	Wed Dec  4 10:12:47 2019
+++ src/sys/modules/dtrace/Makefile	Sat Apr 10 15:34:05 2021
@@ -1,16 +1,19 @@
-#	$NetBSD: Makefile,v 1.8 2019/12/04 10:12:47 martin Exp $
+#	$NetBSD: Makefile,v 1.9 2021/04/10 15:34:05 simonb Exp $
 # $FreeBSD: src/sys/modules/dtrace/Makefile,v 1.6.2.1 2009/08/03 08:13:06 kensmith Exp $
 
 .include 
 
 SUBDIR=		dtrace sdt fbt lockstat profile syscall
 
-.if ${MACHINE_ARCH} != "aarch64"
+.if ${MACHINE_ARCH} == "x86_64" || !empty(MACHINE_ARCH:Mmips64*)
+SUBDIR+=	netbsd32_syscall
+.endif
+
+.if ${MACHINE_ARCH} != "aarch64" && ${MACHINE_CPU} != "mips"
 SUBDIR+=	linux_syscall
 .endif
 
 .if ${MACHINE_ARCH} == "x86_64"
-SUBDIR+=	netbsd32_syscall
 SUBDIR+=	linux32_syscall
 .endif
 



CVS commit: src/sys/modules/dtrace

2019-12-04 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Dec  4 10:12:47 UTC 2019

Modified Files:
src/sys/modules/dtrace: Makefile

Log Message:
Add syscall_linux back for other arm architectures (accidently removed
in previous)


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/modules/dtrace/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/dtrace/Makefile
diff -u src/sys/modules/dtrace/Makefile:1.7 src/sys/modules/dtrace/Makefile:1.8
--- src/sys/modules/dtrace/Makefile:1.7	Tue Dec  3 22:10:56 2019
+++ src/sys/modules/dtrace/Makefile	Wed Dec  4 10:12:47 2019
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.7 2019/12/03 22:10:56 jmcneill Exp $
+#	$NetBSD: Makefile,v 1.8 2019/12/04 10:12:47 martin Exp $
 # $FreeBSD: src/sys/modules/dtrace/Makefile,v 1.6.2.1 2009/08/03 08:13:06 kensmith Exp $
 
 .include 
 
 SUBDIR=		dtrace sdt fbt lockstat profile syscall
 
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+.if ${MACHINE_ARCH} != "aarch64"
 SUBDIR+=	linux_syscall
 .endif
 



CVS commit: src/sys/modules/dtrace/linux_syscall

2018-06-06 Thread Kamil Rytarowski
Module Name:src
Committed By:   kamil
Date:   Wed Jun  6 17:54:33 UTC 2018

Modified Files:
src/sys/modules/dtrace/linux_syscall: Makefile

Log Message:
Really disable unsupported $CC flag for LLVM

The build of kernel modules works now:

  ./build.sh -V MKLLVM=yes -V MKGCC=no -V HAVE_LLVM=yes modules

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/dtrace/linux_syscall/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/dtrace/linux_syscall/Makefile
diff -u src/sys/modules/dtrace/linux_syscall/Makefile:1.4 src/sys/modules/dtrace/linux_syscall/Makefile:1.5
--- src/sys/modules/dtrace/linux_syscall/Makefile:1.4	Wed Jun  6 15:01:13 2018
+++ src/sys/modules/dtrace/linux_syscall/Makefile	Wed Jun  6 17:54:33 2018
@@ -11,8 +11,7 @@ CPPFLAGS+=	-I${NETBSDSRCDIR}/external/cd
 		-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common \
 		-I${NETBSDSRCDIR}/external/cddl/osnet/dev/dtrace
 
-CPPFLAGS+=	-Wno-unknown-pragmas \
-		-Wno-discarded-qualifiers
+CPPFLAGS+=	-Wno-unknown-pragmas
 
 .if defined(HAVE_GCC)
 CPPFLAGS+=	-Wno-discarded-qualifiers



CVS commit: src/sys/modules/dtrace/dtrace

2018-06-06 Thread Kamil Rytarowski
Module Name:src
Committed By:   kamil
Date:   Wed Jun  6 15:15:41 UTC 2018

Modified Files:
src/sys/modules/dtrace/dtrace: Makefile

Log Message:
Restrict -Wno-unused-but-set-variable in sys/modules/dtrace/dtrace to GCC

Clang/LLVM does not recognize it.

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.7 -r1.8 src/sys/modules/dtrace/dtrace/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/dtrace/dtrace/Makefile
diff -u src/sys/modules/dtrace/dtrace/Makefile:1.7 src/sys/modules/dtrace/dtrace/Makefile:1.8
--- src/sys/modules/dtrace/dtrace/Makefile:1.7	Wed Jun  6 15:01:13 2018
+++ src/sys/modules/dtrace/dtrace/Makefile	Wed Jun  6 15:15:41 2018
@@ -54,8 +54,10 @@ COPTS.dis_tables.c+= \
 		-Wno-parentheses \
 		-Wno-uninitialized
 
+.if defined(HAVE_GCC)
 COPTS.dtrace.c+= \
-		-Wno-unused-but-set-variable \
+		-Wno-unused-but-set-variable
+.endif
 
 COPTS.dtrace_subr.c+= \
 		-Wno-unused-value



CVS commit: src/sys/modules/dtrace

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

Modified Files:
src/sys/modules/dtrace/dtrace: Makefile
src/sys/modules/dtrace/linux32_syscall: Makefile
src/sys/modules/dtrace/linux_syscall: Makefile
src/sys/modules/dtrace/netbsd32_syscall: Makefile
src/sys/modules/dtrace/profile: Makefile
src/sys/modules/dtrace/syscall: Makefile

Log Message:
Restrict -Wno-discarded-qualifiers in sys/modules/dtrace/* to GCC

Clang/LLVM does not recognize it.

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.5 -r1.6 src/sys/modules/dtrace/dtrace/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/dtrace/linux32_syscall/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/dtrace/linux_syscall/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/dtrace/netbsd32_syscall/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/dtrace/profile/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/dtrace/syscall/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/dtrace/dtrace/Makefile
diff -u src/sys/modules/dtrace/dtrace/Makefile:1.5 src/sys/modules/dtrace/dtrace/Makefile:1.6
--- src/sys/modules/dtrace/dtrace/Makefile:1.5	Mon May 28 21:05:01 2018
+++ src/sys/modules/dtrace/dtrace/Makefile	Wed Jun  6 14:57:38 2018
@@ -42,9 +42,12 @@ CPPFLAGS+=	-I${OSNETDIR}/sys \
 CPPFLAGS+=	-Wno-unknown-pragmas \
 		-Wno-shadow \
 		-Wno-unused-variable \
-		-Wno-discarded-qualifiers \
 		-Wno-unused-function
 
+.if defined(HAVE_LLVM)
+CPPFLAGS+=	 -Wno-discarded-qualifiers
+.endif
+
 COPTS.dis_tables.c+= \
 		-Wno-missing-field-initializers \
 		-Wno-cast-qual \

Index: src/sys/modules/dtrace/linux32_syscall/Makefile
diff -u src/sys/modules/dtrace/linux32_syscall/Makefile:1.2 src/sys/modules/dtrace/linux32_syscall/Makefile:1.3
--- src/sys/modules/dtrace/linux32_syscall/Makefile:1.2	Mon May 28 21:05:01 2018
+++ src/sys/modules/dtrace/linux32_syscall/Makefile	Wed Jun  6 14:57:38 2018
@@ -11,7 +11,10 @@ CPPFLAGS+=	-I${NETBSDSRCDIR}/external/cd
 		-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common \
 		-I${NETBSDSRCDIR}/external/cddl/osnet/dev/dtrace
 
-CPPFLAGS+=	-Wno-unknown-pragmas \
-		-Wno-discarded-qualifiers
+CPPFLAGS+=	-Wno-unknown-pragmas
+
+.if defined(HAVE_LLVM)
+CPPFLAGS+=	-Wno-discarded-qualifiers
+.endif
 
 .include 

Index: src/sys/modules/dtrace/linux_syscall/Makefile
diff -u src/sys/modules/dtrace/linux_syscall/Makefile:1.2 src/sys/modules/dtrace/linux_syscall/Makefile:1.3
--- src/sys/modules/dtrace/linux_syscall/Makefile:1.2	Mon May 28 21:05:01 2018
+++ src/sys/modules/dtrace/linux_syscall/Makefile	Wed Jun  6 14:57:38 2018
@@ -14,4 +14,8 @@ CPPFLAGS+=	-I${NETBSDSRCDIR}/external/cd
 CPPFLAGS+=	-Wno-unknown-pragmas \
 		-Wno-discarded-qualifiers
 
+.if defined(HAVE_LLVM)
+CPPFLAGS+=	-Wno-discarded-qualifiers
+.endif
+
 .include 

Index: src/sys/modules/dtrace/netbsd32_syscall/Makefile
diff -u src/sys/modules/dtrace/netbsd32_syscall/Makefile:1.2 src/sys/modules/dtrace/netbsd32_syscall/Makefile:1.3
--- src/sys/modules/dtrace/netbsd32_syscall/Makefile:1.2	Mon May 28 21:05:01 2018
+++ src/sys/modules/dtrace/netbsd32_syscall/Makefile	Wed Jun  6 14:57:38 2018
@@ -11,7 +11,10 @@ CPPFLAGS+=	-I${NETBSDSRCDIR}/external/cd
 		-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common \
 		-I${NETBSDSRCDIR}/external/cddl/osnet/dev/dtrace
 
-CPPFLAGS+=	-Wno-unknown-pragmas \
-		-Wno-discarded-qualifiers
+CPPFLAGS+=	-Wno-unknown-pragmas
+
+.if defined(HAVE_LLVM)
+CPPFLAGS+=	-Wno-discarded-qualifiers
+.endif
 
 .include 

Index: src/sys/modules/dtrace/profile/Makefile
diff -u src/sys/modules/dtrace/profile/Makefile:1.3 src/sys/modules/dtrace/profile/Makefile:1.4
--- src/sys/modules/dtrace/profile/Makefile:1.3	Mon May 28 21:05:01 2018
+++ src/sys/modules/dtrace/profile/Makefile	Wed Jun  6 14:57:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/05/28 21:05:01 chs Exp $
+# $NetBSD: Makefile,v 1.4 2018/06/06 14:57:38 kamil Exp $
 
 .include "../../Makefile.inc"
 
@@ -11,6 +11,10 @@ CPPFLAGS+=	-I${NETBSDSRCDIR}/external/cd
 		-I${NETBSDSRCDIR}/external/cddl/osnet/dev/profile \
 		-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common
 
-CPPFLAGS+=	-Wno-unknown-pragmas -Wno-cast-qual -Wno-discarded-qualifiers
+CPPFLAGS+=	-Wno-unknown-pragmas -Wno-cast-qual
+
+.if defined(HAVE_LLVM)
+CPPFLAGS+=	-Wno-discarded-qualifiers
+.endif
 
 .include 

Index: src/sys/modules/dtrace/syscall/Makefile
diff -u src/sys/modules/dtrace/syscall/Makefile:1.2 src/sys/modules/dtrace/syscall/Makefile:1.3
--- src/sys/modules/dtrace/syscall/Makefile:1.2	Mon May 28 21:05:01 2018
+++ src/sys/modules/dtrace/syscall/Makefile	Wed Jun  6 14:57:38 2018
@@ -11,7 +11,10 @@ CPPFLAGS+=	-I${NETBSDSRCDIR}/external/cd
 		-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common \
 		-I${NETBSDSRCDIR}/external/cddl/osnet/dev/dtrace
 

CVS commit: src/sys/modules/dtrace/lockstat

2016-01-25 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon Jan 25 12:44:52 UTC 2016

Modified Files:
src/sys/modules/dtrace/lockstat: Makefile

Log Message:
Map "earm" to armv5


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/dtrace/lockstat/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/dtrace/lockstat/Makefile
diff -u src/sys/modules/dtrace/lockstat/Makefile:1.5 src/sys/modules/dtrace/lockstat/Makefile:1.6
--- src/sys/modules/dtrace/lockstat/Makefile:1.5	Sun Jan 24 16:44:16 2016
+++ src/sys/modules/dtrace/lockstat/Makefile	Mon Jan 25 12:44:52 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2016/01/24 16:44:16 christos Exp $
+#	$NetBSD: Makefile,v 1.6 2016/01/25 12:44:52 martin Exp $
 
 .include "../../Makefile.inc"
 
@@ -11,7 +11,9 @@ CPPFLAGS+=	-I${NETBSDSRCDIR}/external/cd
 CPPFLAGS+=	-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common
 CPPFLAGS+=	-DKDTRACE_HOOKS
 
-.if !empty(MACHINE_ARCH:Mearm*)
+.if ${MACHINE_ARCH} == "earm"
+ARMV:= 5
+.elif !empty(MACHINE_ARCH:Mearm*)
 ARMV:= ${MACHINE_ARCH:S/earmv//:S/eb//:S/hf//}
 .elif !empty(MACHINE_ARCH:Marm*)
 ARMV:= ${MACHINE_ARCH:S/armv//:S/eb//:S/hf//}



CVS commit: src/sys/modules/dtrace/lockstat

2016-01-25 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Jan 25 13:31:48 UTC 2016

Modified Files:
src/sys/modules/dtrace/lockstat: Makefile

Log Message:
Handle also the earm{ev,hf}...


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/modules/dtrace/lockstat/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/dtrace/lockstat/Makefile
diff -u src/sys/modules/dtrace/lockstat/Makefile:1.6 src/sys/modules/dtrace/lockstat/Makefile:1.7
--- src/sys/modules/dtrace/lockstat/Makefile:1.6	Mon Jan 25 07:44:52 2016
+++ src/sys/modules/dtrace/lockstat/Makefile	Mon Jan 25 08:31:48 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2016/01/25 12:44:52 martin Exp $
+#	$NetBSD: Makefile,v 1.7 2016/01/25 13:31:48 christos Exp $
 
 .include "../../Makefile.inc"
 
@@ -11,12 +11,12 @@ CPPFLAGS+=	-I${NETBSDSRCDIR}/external/cd
 CPPFLAGS+=	-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common
 CPPFLAGS+=	-DKDTRACE_HOOKS
 
-.if ${MACHINE_ARCH} == "earm"
-ARMV:= 5
-.elif !empty(MACHINE_ARCH:Mearm*)
+.if !empty(MACHINE_ARCH:Mearmv*)
 ARMV:= ${MACHINE_ARCH:S/earmv//:S/eb//:S/hf//}
-.elif !empty(MACHINE_ARCH:Marm*)
+.elif !empty(MACHINE_ARCH:Marmv*)
 ARMV:= ${MACHINE_ARCH:S/armv//:S/eb//:S/hf//}
+.elif !empry(MACHINE_ARCH:Mearm*)
+ARMV:= 5
 .else
 ARMV:= 0
 .endif



CVS commit: src/sys/modules/dtrace/lockstat

2016-01-25 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Jan 25 15:37:21 UTC 2016

Modified Files:
src/sys/modules/dtrace/lockstat: Makefile

Log Message:
spell empty.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/modules/dtrace/lockstat/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/dtrace/lockstat/Makefile
diff -u src/sys/modules/dtrace/lockstat/Makefile:1.7 src/sys/modules/dtrace/lockstat/Makefile:1.8
--- src/sys/modules/dtrace/lockstat/Makefile:1.7	Mon Jan 25 08:31:48 2016
+++ src/sys/modules/dtrace/lockstat/Makefile	Mon Jan 25 10:37:21 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2016/01/25 13:31:48 christos Exp $
+#	$NetBSD: Makefile,v 1.8 2016/01/25 15:37:21 christos Exp $
 
 .include "../../Makefile.inc"
 
@@ -15,7 +15,7 @@ CPPFLAGS+=	-DKDTRACE_HOOKS
 ARMV:= ${MACHINE_ARCH:S/earmv//:S/eb//:S/hf//}
 .elif !empty(MACHINE_ARCH:Marmv*)
 ARMV:= ${MACHINE_ARCH:S/armv//:S/eb//:S/hf//}
-.elif !empry(MACHINE_ARCH:Mearm*)
+.elif !empty(MACHINE_ARCH:Mearm*)
 ARMV:= 5
 .else
 ARMV:= 0



CVS commit: src/sys/modules/dtrace/lockstat

2016-01-25 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Jan 25 21:56:27 UTC 2016

Modified Files:
src/sys/modules/dtrace/lockstat: Makefile

Log Message:
earm (iyonix and zaurus) don't have cpu_counter.h


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/modules/dtrace/lockstat/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/dtrace/lockstat/Makefile
diff -u src/sys/modules/dtrace/lockstat/Makefile:1.8 src/sys/modules/dtrace/lockstat/Makefile:1.9
--- src/sys/modules/dtrace/lockstat/Makefile:1.8	Mon Jan 25 10:37:21 2016
+++ src/sys/modules/dtrace/lockstat/Makefile	Mon Jan 25 16:56:27 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2016/01/25 15:37:21 christos Exp $
+#	$NetBSD: Makefile,v 1.9 2016/01/25 21:56:27 christos Exp $
 
 .include "../../Makefile.inc"
 
@@ -15,8 +15,6 @@ CPPFLAGS+=	-DKDTRACE_HOOKS
 ARMV:= ${MACHINE_ARCH:S/earmv//:S/eb//:S/hf//}
 .elif !empty(MACHINE_ARCH:Marmv*)
 ARMV:= ${MACHINE_ARCH:S/armv//:S/eb//:S/hf//}
-.elif !empty(MACHINE_ARCH:Mearm*)
-ARMV:= 5
 .else
 ARMV:= 0
 .endif



CVS commit: src/sys/modules/dtrace/lockstat

2016-01-24 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Jan 24 16:44:17 UTC 2016

Modified Files:
src/sys/modules/dtrace/lockstat: Makefile

Log Message:
Remove hf and eb. Rin Okuyama


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/dtrace/lockstat/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/dtrace/lockstat/Makefile
diff -u src/sys/modules/dtrace/lockstat/Makefile:1.4 src/sys/modules/dtrace/lockstat/Makefile:1.5
--- src/sys/modules/dtrace/lockstat/Makefile:1.4	Sat Jan 23 20:12:06 2016
+++ src/sys/modules/dtrace/lockstat/Makefile	Sun Jan 24 11:44:16 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2016/01/24 01:12:06 christos Exp $
+#	$NetBSD: Makefile,v 1.5 2016/01/24 16:44:16 christos Exp $
 
 .include "../../Makefile.inc"
 
@@ -12,9 +12,9 @@ CPPFLAGS+=	-I${NETBSDSRCDIR}/external/cd
 CPPFLAGS+=	-DKDTRACE_HOOKS
 
 .if !empty(MACHINE_ARCH:Mearm*)
-ARMV:= ${MACHINE_ARCH:S/earmv//}
+ARMV:= ${MACHINE_ARCH:S/earmv//:S/eb//:S/hf//}
 .elif !empty(MACHINE_ARCH:Marm*)
-ARMV:= ${MACHINE_ARCH:S/armv//}
+ARMV:= ${MACHINE_ARCH:S/armv//:S/eb//:S/hf//}
 .else
 ARMV:= 0
 .endif



CVS commit: src/sys/modules/dtrace/lockstat

2016-01-23 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Jan 24 01:12:06 UTC 2016

Modified Files:
src/sys/modules/dtrace/lockstat: Makefile

Log Message:
Grr. arm is different.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/dtrace/lockstat/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/dtrace/lockstat/Makefile
diff -u src/sys/modules/dtrace/lockstat/Makefile:1.3 src/sys/modules/dtrace/lockstat/Makefile:1.4
--- src/sys/modules/dtrace/lockstat/Makefile:1.3	Sat Jan 23 20:01:43 2016
+++ src/sys/modules/dtrace/lockstat/Makefile	Sat Jan 23 20:12:06 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2016/01/24 01:01:43 christos Exp $
+#	$NetBSD: Makefile,v 1.4 2016/01/24 01:12:06 christos Exp $
 
 .include "../../Makefile.inc"
 
@@ -10,7 +10,16 @@ SRCS=		lockstat.c
 CPPFLAGS+=	-I${NETBSDSRCDIR}/external/cddl/osnet/sys
 CPPFLAGS+=	-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common
 CPPFLAGS+=	-DKDTRACE_HOOKS
-.if exists(${DESTDIR}/usr/include/machine/cpu_counter.h)
+
+.if !empty(MACHINE_ARCH:Mearm*)
+ARMV:= ${MACHINE_ARCH:S/earmv//}
+.elif !empty(MACHINE_ARCH:Marm*)
+ARMV:= ${MACHINE_ARCH:S/armv//}
+.else
+ARMV:= 0
+.endif
+
+.if ${ARMV} > 4
 CPPFLAGS+=	-D__HAVE_CPU_COUNTER
 .endif
 



CVS commit: src/sys/modules/dtrace/lockstat

2016-01-23 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Jan 24 01:01:43 UTC 2016

Modified Files:
src/sys/modules/dtrace/lockstat: Makefile

Log Message:
Instead of hard-coding who has cpu counters why don't you look for them?


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/dtrace/lockstat/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/dtrace/lockstat/Makefile
diff -u src/sys/modules/dtrace/lockstat/Makefile:1.2 src/sys/modules/dtrace/lockstat/Makefile:1.3
--- src/sys/modules/dtrace/lockstat/Makefile:1.2	Thu Sep 10 15:57:48 2015
+++ src/sys/modules/dtrace/lockstat/Makefile	Sat Jan 23 20:01:43 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2015/09/10 19:57:48 riz Exp $
+#	$NetBSD: Makefile,v 1.3 2016/01/24 01:01:43 christos Exp $
 
 .include "../../Makefile.inc"
 
@@ -10,7 +10,7 @@ SRCS=		lockstat.c
 CPPFLAGS+=	-I${NETBSDSRCDIR}/external/cddl/osnet/sys
 CPPFLAGS+=	-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common
 CPPFLAGS+=	-DKDTRACE_HOOKS
-.if (!empty(MACHINE_ARCH:Mearm*) || !empty(MACHINE_ARCH:Marm*))
+.if exists(${DESTDIR}/usr/include/machine/cpu_counter.h)
 CPPFLAGS+=	-D__HAVE_CPU_COUNTER
 .endif
 



CVS commit: src/sys/modules/dtrace/lockstat

2015-09-10 Thread Jeff Rizzo
Module Name:src
Committed By:   riz
Date:   Thu Sep 10 19:57:48 UTC 2015

Modified Files:
src/sys/modules/dtrace/lockstat: Makefile

Log Message:
Evil hack to ensure dtrace lockstat module builds on arm.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/dtrace/lockstat/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/dtrace/lockstat/Makefile
diff -u src/sys/modules/dtrace/lockstat/Makefile:1.1 src/sys/modules/dtrace/lockstat/Makefile:1.2
--- src/sys/modules/dtrace/lockstat/Makefile:1.1	Sun Mar  8 04:15:22 2015
+++ src/sys/modules/dtrace/lockstat/Makefile	Thu Sep 10 19:57:48 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2015/03/08 04:15:22 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2015/09/10 19:57:48 riz Exp $
 
 .include "../../Makefile.inc"
 
@@ -10,5 +10,8 @@ SRCS=		lockstat.c
 CPPFLAGS+=	-I${NETBSDSRCDIR}/external/cddl/osnet/sys
 CPPFLAGS+=	-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common
 CPPFLAGS+=	-DKDTRACE_HOOKS
+.if (!empty(MACHINE_ARCH:Mearm*) || !empty(MACHINE_ARCH:Marm*))
+CPPFLAGS+=	-D__HAVE_CPU_COUNTER
+.endif
 
 .include 



CVS commit: src/sys/modules/dtrace

2015-03-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Mar  8 17:11:57 UTC 2015

Modified Files:
src/sys/modules/dtrace: Makefile
Added Files:
src/sys/modules/dtrace/linux32_syscall: Makefile emultrace.h

Log Message:
dtrace syscall for linux32


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/dtrace/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/dtrace/linux32_syscall/Makefile \
src/sys/modules/dtrace/linux32_syscall/emultrace.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/dtrace/Makefile
diff -u src/sys/modules/dtrace/Makefile:1.5 src/sys/modules/dtrace/Makefile:1.6
--- src/sys/modules/dtrace/Makefile:1.5	Sat Mar  7 10:13:04 2015
+++ src/sys/modules/dtrace/Makefile	Sun Mar  8 13:11:57 2015
@@ -1,14 +1,14 @@
-#	$NetBSD: Makefile,v 1.5 2015/03/07 15:13:04 christos Exp $
+#	$NetBSD: Makefile,v 1.6 2015/03/08 17:11:57 christos Exp $
 # $FreeBSD: src/sys/modules/dtrace/Makefile,v 1.6.2.1 2009/08/03 08:13:06 kensmith Exp $
 
 .include bsd.own.mk
 
-SUBDIR=		dtrace sdt fbt profile syscall
+SUBDIR=		dtrace sdt fbt lockstat profile syscall
 SUBDIR+=	linux_syscall
 
 .if ${MACHINE_ARCH} == x86_64
 SUBDIR+=	netbsd32_syscall
-#SUBDIR+=	linux32_syscall
+SUBDIR+=	linux32_syscall
 .endif
 
 .include bsd.subdir.mk

Added files:

Index: src/sys/modules/dtrace/linux32_syscall/Makefile
diff -u /dev/null src/sys/modules/dtrace/linux32_syscall/Makefile:1.1
--- /dev/null	Sun Mar  8 13:11:57 2015
+++ src/sys/modules/dtrace/linux32_syscall/Makefile	Sun Mar  8 13:11:57 2015
@@ -0,0 +1,15 @@
+# $FreeBSD: src/sys/modules/dtrace/sdt/Makefile,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
+
+.include ../../Makefile.inc
+
+.PATH: ${NETBSDSRCDIR}/external/cddl/osnet/dev/systrace
+
+KMOD=		dtrace_syscall_linux32
+SRCS=		systrace.c
+
+CPPFLAGS+=	-I${NETBSDSRCDIR}/external/cddl/osnet/sys \
+		-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common 
+
+CPPFLAGS+=	-Wno-unknown-pragmas
+
+.include bsd.kmodule.mk
Index: src/sys/modules/dtrace/linux32_syscall/emultrace.h
diff -u /dev/null src/sys/modules/dtrace/linux32_syscall/emultrace.h:1.1
--- /dev/null	Sun Mar  8 13:11:57 2015
+++ src/sys/modules/dtrace/linux32_syscall/emultrace.h	Sun Mar  8 13:11:57 2015
@@ -0,0 +1,22 @@
+/*
+ * The syscall arguments are processed into a DTrace argument array
+ * using a generated function. See sys/kern/makesyscalls.sh.
+ */
+#define COMPAT_NETBSD32
+
+#include compat/netbsd32/netbsd32.h
+#include compat/netbsd32/netbsd32_syscallargs.h
+
+#include compat/linux/common/linux_types.h
+#include compat/linux/common/linux_mmap.h
+#include compat/linux/common/linux_signal.h
+#include compat/linux/linux_syscallargs.h
+
+#include compat/linux32/common/linux32_types.h
+#include compat/linux32/common/linux32_signal.h
+#include compat/linux32/linux32_syscall.h
+#include compat/linux32/linux32_syscallargs.h
+#include compat/linux32/linux32_systrace_args.c
+
+#define emulname	linux32
+#define EMULNAME	LINUX32



CVS commit: src/sys/modules/dtrace

2015-03-07 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Mar  7 15:13:04 UTC 2015

Modified Files:
src/sys/modules/dtrace: Makefile
Added Files:
src/sys/modules/dtrace/linux_syscall: Makefile emultrace.h
src/sys/modules/dtrace/netbsd32_syscall: Makefile emultrace.h
src/sys/modules/dtrace/syscall: Makefile emultrace.h

Log Message:
Add syscall provider build glue, unhooked.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/dtrace/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/dtrace/linux_syscall/Makefile \
src/sys/modules/dtrace/linux_syscall/emultrace.h
cvs rdiff -u -r0 -r1.1 src/sys/modules/dtrace/netbsd32_syscall/Makefile \
src/sys/modules/dtrace/netbsd32_syscall/emultrace.h
cvs rdiff -u -r0 -r1.1 src/sys/modules/dtrace/syscall/Makefile \
src/sys/modules/dtrace/syscall/emultrace.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/dtrace/Makefile
diff -u src/sys/modules/dtrace/Makefile:1.4 src/sys/modules/dtrace/Makefile:1.5
--- src/sys/modules/dtrace/Makefile:1.4	Sat Dec  1 20:05:17 2012
+++ src/sys/modules/dtrace/Makefile	Sat Mar  7 10:13:04 2015
@@ -1,8 +1,14 @@
-#	$NetBSD: Makefile,v 1.4 2012/12/02 01:05:17 chs Exp $
+#	$NetBSD: Makefile,v 1.5 2015/03/07 15:13:04 christos Exp $
 # $FreeBSD: src/sys/modules/dtrace/Makefile,v 1.6.2.1 2009/08/03 08:13:06 kensmith Exp $
 
 .include bsd.own.mk
 
-SUBDIR=		dtrace sdt fbt profile
+SUBDIR=		dtrace sdt fbt profile syscall
+SUBDIR+=	linux_syscall
+
+.if ${MACHINE_ARCH} == x86_64
+SUBDIR+=	netbsd32_syscall
+#SUBDIR+=	linux32_syscall
+.endif
 
 .include bsd.subdir.mk

Added files:

Index: src/sys/modules/dtrace/linux_syscall/Makefile
diff -u /dev/null src/sys/modules/dtrace/linux_syscall/Makefile:1.1
--- /dev/null	Sat Mar  7 10:13:04 2015
+++ src/sys/modules/dtrace/linux_syscall/Makefile	Sat Mar  7 10:13:04 2015
@@ -0,0 +1,15 @@
+# $FreeBSD: src/sys/modules/dtrace/sdt/Makefile,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
+
+.include ../../Makefile.inc
+
+.PATH: ${NETBSDSRCDIR}/external/cddl/osnet/dev/systrace
+
+KMOD=		dtrace_syscall_linux
+SRCS=		systrace.c
+
+CPPFLAGS+=	-I${NETBSDSRCDIR}/external/cddl/osnet/sys \
+		-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common 
+
+CPPFLAGS+=	-Wno-unknown-pragmas
+
+.include bsd.kmodule.mk
Index: src/sys/modules/dtrace/linux_syscall/emultrace.h
diff -u /dev/null src/sys/modules/dtrace/linux_syscall/emultrace.h:1.1
--- /dev/null	Sat Mar  7 10:13:04 2015
+++ src/sys/modules/dtrace/linux_syscall/emultrace.h	Sat Mar  7 10:13:04 2015
@@ -0,0 +1,13 @@
+/*
+ * The syscall arguments are processed into a DTrace argument array
+ * using a generated function. See sys/kern/makesyscalls.sh.
+ */
+#include compat/linux/common/linux_types.h
+#include compat/linux/common/linux_mmap.h
+#include compat/linux/common/linux_signal.h
+#include compat/linux/linux_syscall.h
+#include compat/linux/linux_syscallargs.h
+#include compat/linux/linux_systrace_args.c
+
+#define emulname	linux
+#define EMULNAME	LINUX

Index: src/sys/modules/dtrace/netbsd32_syscall/Makefile
diff -u /dev/null src/sys/modules/dtrace/netbsd32_syscall/Makefile:1.1
--- /dev/null	Sat Mar  7 10:13:04 2015
+++ src/sys/modules/dtrace/netbsd32_syscall/Makefile	Sat Mar  7 10:13:04 2015
@@ -0,0 +1,15 @@
+# $FreeBSD: src/sys/modules/dtrace/sdt/Makefile,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
+
+.include ../../Makefile.inc
+
+.PATH: ${NETBSDSRCDIR}/external/cddl/osnet/dev/systrace
+
+KMOD=		dtrace_syscall_netbsd32
+SRCS=		systrace.c
+
+CPPFLAGS+=	-I${NETBSDSRCDIR}/external/cddl/osnet/sys \
+		-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common 
+
+CPPFLAGS+=	-Wno-unknown-pragmas
+
+.include bsd.kmodule.mk
Index: src/sys/modules/dtrace/netbsd32_syscall/emultrace.h
diff -u /dev/null src/sys/modules/dtrace/netbsd32_syscall/emultrace.h:1.1
--- /dev/null	Sat Mar  7 10:13:04 2015
+++ src/sys/modules/dtrace/netbsd32_syscall/emultrace.h	Sat Mar  7 10:13:04 2015
@@ -0,0 +1,13 @@
+/*
+ * The syscall arguments are processed into a DTrace argument array
+ * using a generated function. See sys/kern/makesyscalls.sh.
+ */
+#define COMPAT_NETBSD32
+
+#include compat/netbsd32/netbsd32.h
+#include compat/netbsd32/netbsd32_syscall.h
+#include compat/netbsd32/netbsd32_syscallargs.h
+#include compat/netbsd32/netbsd32_systrace_args.c
+
+#define emulname	netbsd32
+#define EMULNAME	NETBSD32

Index: src/sys/modules/dtrace/syscall/Makefile
diff -u /dev/null src/sys/modules/dtrace/syscall/Makefile:1.1
--- /dev/null	Sat Mar  7 10:13:04 2015
+++ src/sys/modules/dtrace/syscall/Makefile	Sat Mar  7 10:13:04 2015
@@ -0,0 +1,15 @@
+# $FreeBSD: src/sys/modules/dtrace/sdt/Makefile,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
+
+.include ../../Makefile.inc
+
+.PATH: ${NETBSDSRCDIR}/external/cddl/osnet/dev/systrace
+
+KMOD=		dtrace_syscall
+SRCS=		systrace.c
+
+CPPFLAGS+=	-I${NETBSDSRCDIR}/external/cddl/osnet/sys \
+		

CVS commit: src/sys/modules/dtrace/lockstat

2015-03-07 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Mar  8 04:15:22 UTC 2015

Added Files:
src/sys/modules/dtrace/lockstat: Makefile

Log Message:
non working glue.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/modules/dtrace/lockstat/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/sys/modules/dtrace/lockstat/Makefile
diff -u /dev/null src/sys/modules/dtrace/lockstat/Makefile:1.1
--- /dev/null	Sat Mar  7 23:15:22 2015
+++ src/sys/modules/dtrace/lockstat/Makefile	Sat Mar  7 23:15:22 2015
@@ -0,0 +1,14 @@
+#	$NetBSD: Makefile,v 1.1 2015/03/08 04:15:22 christos Exp $
+
+.include ../../Makefile.inc
+
+.PATH: ${NETBSDSRCDIR}/external/cddl/osnet/dev/lockstat
+
+KMOD=		dtrace_lockstat
+SRCS=		lockstat.c
+
+CPPFLAGS+=	-I${NETBSDSRCDIR}/external/cddl/osnet/sys
+CPPFLAGS+=	-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common
+CPPFLAGS+=	-DKDTRACE_HOOKS
+
+.include bsd.kmodule.mk



CVS commit: src/sys/modules/dtrace

2012-12-01 Thread Chuck Silvers
Module Name:src
Committed By:   chs
Date:   Sun Dec  2 00:47:37 UTC 2012

Modified Files:
src/sys/modules/dtrace/fbt: Makefile
src/sys/modules/dtrace/sdt: Makefile

Log Message:
remove unneeded include dirs.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/dtrace/fbt/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/dtrace/sdt/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/dtrace/fbt/Makefile
diff -u src/sys/modules/dtrace/fbt/Makefile:1.3 src/sys/modules/dtrace/fbt/Makefile:1.4
--- src/sys/modules/dtrace/fbt/Makefile:1.3	Tue Dec 14 23:27:48 2010
+++ src/sys/modules/dtrace/fbt/Makefile	Sun Dec  2 00:47:37 2012
@@ -8,7 +8,6 @@ KMOD=		fbt
 SRCS=		fbt.c
 
 CPPFLAGS+=	-I${NETBSDSRCDIR}/external/cddl/osnet/sys \
-		-I${NETBSDSRCDIR}/external/cddl/osnet/dev/sdt \
 		-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common 
 
 CPPFLAGS+=	-Wno-unknown-pragmas

Index: src/sys/modules/dtrace/sdt/Makefile
diff -u src/sys/modules/dtrace/sdt/Makefile:1.4 src/sys/modules/dtrace/sdt/Makefile:1.5
--- src/sys/modules/dtrace/sdt/Makefile:1.4	Tue Dec 14 23:27:48 2010
+++ src/sys/modules/dtrace/sdt/Makefile	Sun Dec  2 00:47:37 2012
@@ -8,8 +8,7 @@ KMOD=		sdt
 SRCS=		sdt.c
 
 CPPFLAGS+=	-I${NETBSDSRCDIR}/external/cddl/osnet/sys \
-		-I${NETBSDSRCDIR}/external/cddl/osnet/dev/sdt \
-		-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common 
+		-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common
 
 CPPFLAGS+=	-Wno-unknown-pragmas
 



CVS commit: src/sys/modules/dtrace

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

Modified Files:
src/sys/modules/dtrace/dtrace: Makefile
src/sys/modules/dtrace/fbt: Makefile
src/sys/modules/dtrace/sdt: Makefile

Log Message:
Disable errors reported by unknown pragmas in dtrace module.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/dtrace/dtrace/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/dtrace/fbt/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/dtrace/sdt/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/dtrace/dtrace/Makefile
diff -u src/sys/modules/dtrace/dtrace/Makefile:1.2 src/sys/modules/dtrace/dtrace/Makefile:1.3
--- src/sys/modules/dtrace/dtrace/Makefile:1.2	Sat Mar 13 22:23:47 2010
+++ src/sys/modules/dtrace/dtrace/Makefile	Tue Dec 14 23:27:47 2010
@@ -27,6 +27,8 @@
 
 CPPFLAGS+=	-DSMP -DDEBUG
 
+CPPFLAGS+=	-Wno-unknown-pragmas
+
 EXPORT_SYMS=	dtrace_register \
 		dtrace_unregister \
 		dtrace_probe_lookup

Index: src/sys/modules/dtrace/fbt/Makefile
diff -u src/sys/modules/dtrace/fbt/Makefile:1.2 src/sys/modules/dtrace/fbt/Makefile:1.3
--- src/sys/modules/dtrace/fbt/Makefile:1.2	Sat Mar 13 22:29:33 2010
+++ src/sys/modules/dtrace/fbt/Makefile	Tue Dec 14 23:27:48 2010
@@ -11,4 +11,6 @@
 		-I${NETBSDSRCDIR}/external/cddl/osnet/dev/sdt \
 		-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common 
 
+CPPFLAGS+=	-Wno-unknown-pragmas
+
 .include bsd.kmodule.mk

Index: src/sys/modules/dtrace/sdt/Makefile
diff -u src/sys/modules/dtrace/sdt/Makefile:1.3 src/sys/modules/dtrace/sdt/Makefile:1.4
--- src/sys/modules/dtrace/sdt/Makefile:1.3	Sat Mar 13 22:29:34 2010
+++ src/sys/modules/dtrace/sdt/Makefile	Tue Dec 14 23:27:48 2010
@@ -11,4 +11,6 @@
 		-I${NETBSDSRCDIR}/external/cddl/osnet/dev/sdt \
 		-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common 
 
+CPPFLAGS+=	-Wno-unknown-pragmas
+
 .include bsd.kmodule.mk



CVS commit: src/sys/modules/dtrace/dtrace

2010-03-13 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Mar 13 22:23:47 UTC 2010

Modified Files:
src/sys/modules/dtrace/dtrace: Makefile

Log Message:
now that I've fixed Makefile.inc, include it.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/dtrace/dtrace/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/dtrace/dtrace/Makefile
diff -u src/sys/modules/dtrace/dtrace/Makefile:1.1 src/sys/modules/dtrace/dtrace/Makefile:1.2
--- src/sys/modules/dtrace/dtrace/Makefile:1.1	Sun Feb 21 06:16:19 2010
+++ src/sys/modules/dtrace/dtrace/Makefile	Sat Mar 13 17:23:47 2010
@@ -1,6 +1,7 @@
 # $FreeBSD: src/sys/modules/dtrace/dtrace/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $
 
-#.include ../../Makefile.inc
+.include ../../Makefile.inc
+.include ../../Makefile.assym
 
 ARCHDIR=	${MACHINE}
 



CVS commit: src/sys/modules/dtrace

2010-03-13 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Mar 13 22:29:34 UTC 2010

Modified Files:
src/sys/modules/dtrace/fbt: Makefile
src/sys/modules/dtrace/sdt: Makefile

Log Message:
Include ../../Makefile.inc now that it works.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/dtrace/fbt/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/dtrace/sdt/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/dtrace/fbt/Makefile
diff -u src/sys/modules/dtrace/fbt/Makefile:1.1 src/sys/modules/dtrace/fbt/Makefile:1.2
--- src/sys/modules/dtrace/fbt/Makefile:1.1	Fri Mar 12 16:53:16 2010
+++ src/sys/modules/dtrace/fbt/Makefile	Sat Mar 13 17:29:33 2010
@@ -1,5 +1,7 @@
 # $FreeBSD: src/sys/modules/dtrace/sdt/Makefile,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
 
+.include ../../Makefile.inc
+
 .PATH: ${NETBSDSRCDIR}/external/cddl/osnet/dev/fbt
 
 KMOD=		fbt

Index: src/sys/modules/dtrace/sdt/Makefile
diff -u src/sys/modules/dtrace/sdt/Makefile:1.2 src/sys/modules/dtrace/sdt/Makefile:1.3
--- src/sys/modules/dtrace/sdt/Makefile:1.2	Wed Mar 10 18:40:53 2010
+++ src/sys/modules/dtrace/sdt/Makefile	Sat Mar 13 17:29:34 2010
@@ -1,5 +1,7 @@
 # $FreeBSD: src/sys/modules/dtrace/sdt/Makefile,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
 
+.include ../../Makefile.inc
+
 .PATH: ${NETBSDSRCDIR}/external/cddl/osnet/dev/sdt
 
 KMOD=		sdt



CVS commit: src/sys/modules/dtrace

2010-02-21 Thread Darran Hunt
Module Name:src
Committed By:   darran
Date:   Sun Feb 21 11:16:19 UTC 2010

Added Files:
src/sys/modules/dtrace: Makefile
src/sys/modules/dtrace/dtrace: Makefile

Log Message:
DTrace: add the dtrace module.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/modules/dtrace/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/dtrace/dtrace/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/sys/modules/dtrace/Makefile
diff -u /dev/null src/sys/modules/dtrace/Makefile:1.1
--- /dev/null	Sun Feb 21 11:16:19 2010
+++ src/sys/modules/dtrace/Makefile	Sun Feb 21 11:16:19 2010
@@ -0,0 +1,8 @@
+#	$NetBSD: Makefile,v 1.1 2010/02/21 11:16:19 darran Exp $
+# $FreeBSD: src/sys/modules/dtrace/Makefile,v 1.6.2.1 2009/08/03 08:13:06 kensmith Exp $
+
+.include bsd.own.mk
+
+SUBDIR=		dtrace
+
+.include bsd.subdir.mk

Index: src/sys/modules/dtrace/dtrace/Makefile
diff -u /dev/null src/sys/modules/dtrace/dtrace/Makefile:1.1
--- /dev/null	Sun Feb 21 11:16:19 2010
+++ src/sys/modules/dtrace/dtrace/Makefile	Sun Feb 21 11:16:19 2010
@@ -0,0 +1,33 @@
+# $FreeBSD: src/sys/modules/dtrace/dtrace/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $
+
+#.include ../../Makefile.inc
+
+ARCHDIR=	${MACHINE}
+
+.PATH: ${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common/dtrace
+.PATH: ${NETBSDSRCDIR}/external/cddl/osnet/dev/dtrace
+.PATH: ${NETBSDSRCDIR}/external/cddl/osnet/dev/dtrace/${ARCHDIR}
+
+KMOD=		dtrace
+SRCS=		dtrace.c \
+		dtrace_asm.S \
+		dtrace_subr.c
+
+.if ${MACHINE} == amd64 || ${MACHINE} == i386
+SRCS+=		dis_tables.c \
+		instr_size.c
+.endif
+
+CPPFLAGS+=	-I${NETBSDSRCDIR}/external/cddl/osnet/sys \
+		-I${NETBSDSRCDIR}/external/cddl/osnet/dev/dtrace \
+		-I${NETBSDSRCDIR}/external/cddl/osnet/dev/dtrace/${ARCHDIR} \
+		-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common \
+		-DDIS_MEM
+
+CPPFLAGS+=	-DSMP -DDEBUG
+
+EXPORT_SYMS=	dtrace_register \
+		dtrace_unregister \
+		dtrace_probe_lookup
+
+.include bsd.kmodule.mk