aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2014-09-02 23:43:06 +0000
committerMark Johnston <markj@FreeBSD.org>2014-09-02 23:43:06 +0000
commit5439a71566c99dad77c16190574cf0149d9f92c6 (patch)
treeac3d113c4c0b13f3739f5bb85b96ea3ce1712bae
parentb74ae45b4542c77ea21b8b2e5c64485932b98054 (diff)
downloadsrc-5439a71566c99dad77c16190574cf0149d9f92c6.tar.gz
src-5439a71566c99dad77c16190574cf0149d9f92c6.zip
Define _DTRACE_VERSION in sdt.h rather than setting it manually. This is
similar to what illumos does, and makes it easier to enable USDT probes in third-party software that doesn't make use of the system makefiles.
Notes
Notes: svn path=/head/; revision=270990
-rw-r--r--share/mk/bsd.dep.mk2
-rw-r--r--sys/sys/sdt.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk
index 14619eb93c7a..509c17f5823e 100644
--- a/share/mk/bsd.dep.mk
+++ b/share/mk/bsd.dep.mk
@@ -125,7 +125,7 @@ ${_YC:R}.o: ${_YC}
.if ${SRCS:M*.d}
LDFLAGS+= -lelf
LDADD+= ${LIBELF}
-CFLAGS+= -D_DTRACE_VERSION=1 -I${.OBJDIR}
+CFLAGS+= -I${.OBJDIR}
.endif
.for _DSRC in ${SRCS:M*.d:N*/*}
.for _D in ${_DSRC:R}
diff --git a/sys/sys/sdt.h b/sys/sys/sdt.h
index eda1a12b1e97..ca820f68bce1 100644
--- a/sys/sys/sdt.h
+++ b/sys/sys/sdt.h
@@ -33,6 +33,8 @@
#ifndef _KERNEL
+#define _DTRACE_VERSION 1
+
#define DTRACE_PROBE(prov, name) { \
extern void __dtrace_##prov##___##name(void); \
__dtrace_##prov##___##name(); \