[src/trunk]: src/share/mk bsd.kmodule.mk: Build modules with KDTRACE_HOOKS if...

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

details:   https://anonhg.NetBSD.org/src/rev/1bac6e14a74e
branches:  trunk
changeset: 368846:1bac6e14a74e
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Aug 07 23:42:09 2022 +0000

description:
bsd.kmodule.mk: Build modules with KDTRACE_HOOKS if MKDTRACE=yes.

diffstat:

 external/cddl/osnet/dev/sdt/sdt.c          |  3 +--
 external/cddl/osnet/sys/kern/opensolaris.c |  5 ++++-
 share/mk/bsd.kmodule.mk                    |  3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diffs (60 lines):

diff -r 516b27d39d2c -r 1bac6e14a74e external/cddl/osnet/dev/sdt/sdt.c
--- a/external/cddl/osnet/dev/sdt/sdt.c Sun Aug 07 23:03:59 2022 +0000
+++ b/external/cddl/osnet/dev/sdt/sdt.c Sun Aug 07 23:42:09 2022 +0000
@@ -39,7 +39,7 @@
  * unloaded; in particular, probes may not span multiple kernel modules.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.22 2022/08/07 20:47:05 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.23 2022/08/07 23:42:09 riastradh Exp $");
 
 #include <sys/cdefs.h>
 #include <sys/proc.h>
@@ -68,7 +68,6 @@
 #include <sys/module.h>
 #include <sys/mutex.h>
 #include <sys/queue.h>
-#define KDTRACE_HOOKS
 #include <sys/sdt.h>
 
 #include <sys/dtrace.h>
diff -r 516b27d39d2c -r 1bac6e14a74e external/cddl/osnet/sys/kern/opensolaris.c
--- a/external/cddl/osnet/sys/kern/opensolaris.c        Sun Aug 07 23:03:59 2022 +0000
+++ b/external/cddl/osnet/sys/kern/opensolaris.c        Sun Aug 07 23:42:09 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: opensolaris.c,v 1.3 2021/07/25 06:07:42 skrll Exp $    */
+/*     $NetBSD: opensolaris.c,v 1.4 2022/08/07 23:42:09 riastradh Exp $        */
 /*-
  * Copyright 2007 John Birrell <jb%FreeBSD.org@localhost>
  *
@@ -38,6 +38,7 @@
 #include <sys/misc.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
+#include <sys/sdt.h>
 
 cpu_core_t     cpu_core[MAXCPUS];
 solaris_cpu_t  solaris_cpu[MAXCPUS];
@@ -66,3 +67,5 @@
 opensolaris_fini(void *dummy)
 {
 }
+
+SDT_PROBE_DEFINE1(sdt, , , set__error, "int");
diff -r 516b27d39d2c -r 1bac6e14a74e share/mk/bsd.kmodule.mk
--- a/share/mk/bsd.kmodule.mk   Sun Aug 07 23:03:59 2022 +0000
+++ b/share/mk/bsd.kmodule.mk   Sun Aug 07 23:42:09 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.kmodule.mk,v 1.80 2022/08/03 09:37:36 riastradh Exp $
+#      $NetBSD: bsd.kmodule.mk,v 1.81 2022/08/07 23:42:09 riastradh Exp $
 
 # We are not building this with PIE
 MKPIE=no
@@ -30,6 +30,7 @@
 CPPFLAGS+=     -nostdinc -I. -I${.CURDIR} -isystem $S -isystem $S/arch
 CPPFLAGS+=     -isystem ${S}/../common/include
 CPPFLAGS+=     -D_KERNEL -D_MODULE -DSYSCTL_INCLUDE_DESCR
+CPPFLAGS+=     ${${MKDTRACE:Uno} != "no" :? -DKDTRACE_HOOKS :}
 
 CWARNFLAGS.clang+=     -Wno-error=constant-conversion