diff options
| author | Andriy Gapon <avg@FreeBSD.org> | 2011-03-12 09:09:25 +0000 |
|---|---|---|
| committer | Andriy Gapon <avg@FreeBSD.org> | 2011-03-12 09:09:25 +0000 |
| commit | 308bce2a0ed11190ede805775816f03a85df0433 (patch) | |
| tree | dfa6cf016708547b64ab489552220bdbc0726cc4 /sys/modules | |
| parent | d549ef563804691f46e56962256160ce5c199276 (diff) | |
Notes
Diffstat (limited to 'sys/modules')
| -rw-r--r-- | sys/modules/dtrace/Makefile | 5 | ||||
| -rw-r--r-- | sys/modules/dtrace/dtraceall/Makefile | 9 | ||||
| -rw-r--r-- | sys/modules/dtrace/dtraceall/dtraceall.c | 4 | ||||
| -rw-r--r-- | sys/modules/dtrace/systrace_freebsd32/Makefile | 13 | ||||
| -rw-r--r-- | sys/modules/dtrace/systrace_linux32/Makefile | 13 |
5 files changed, 42 insertions, 2 deletions
diff --git a/sys/modules/dtrace/Makefile b/sys/modules/dtrace/Makefile index 02c476697c6f..09fe55e29cd1 100644 --- a/sys/modules/dtrace/Makefile +++ b/sys/modules/dtrace/Makefile @@ -15,7 +15,10 @@ SUBDIR= dtmalloc \ systrace .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" -SUBDIR+= fasttrap fbt +SUBDIR+= fasttrap fbt systrace_linux32 +.endif +.if ${MACHINE_CPUARCH} == "amd64" +SUBDIR+= systrace_freebsd32 .endif .include <bsd.subdir.mk> diff --git a/sys/modules/dtrace/dtraceall/Makefile b/sys/modules/dtrace/dtraceall/Makefile index 6f098024611c..5174548bb4d9 100644 --- a/sys/modules/dtrace/dtraceall/Makefile +++ b/sys/modules/dtrace/dtraceall/Makefile @@ -1,8 +1,15 @@ # $FreeBSD$ KMOD= dtraceall -SRCS= dtraceall.c +SRCS= dtraceall.c opt_compat.h CFLAGS+= -I${.CURDIR}/../../.. +.if !defined(KERNBUILDDIR) +opt_compat.h: +.if ${MACHINE_ARCH} == "amd64" + echo "#define COMPAT_FREEBSD32 1" >> ${.TARGET} +.endif +.endif + .include <bsd.kmod.mk> diff --git a/sys/modules/dtrace/dtraceall/dtraceall.c b/sys/modules/dtrace/dtraceall/dtraceall.c index ecb5e344b034..76172b7aa50a 100644 --- a/sys/modules/dtrace/dtraceall/dtraceall.c +++ b/sys/modules/dtrace/dtraceall/dtraceall.c @@ -32,6 +32,7 @@ #include <sys/kernel.h> #include <sys/module.h> #include <sys/errno.h> +#include "opt_compat.h" static int dtraceall_modevent(module_t mod __unused, int type, void *data __unused) @@ -73,4 +74,7 @@ MODULE_DEPEND(dtraceall, fasttrap, 1, 1, 1); MODULE_DEPEND(dtraceall, lockstat, 1, 1, 1); MODULE_DEPEND(dtraceall, sdt, 1, 1, 1); MODULE_DEPEND(dtraceall, systrace, 1, 1, 1); +#if defined(COMPAT_FREEBSD32) +MODULE_DEPEND(dtraceall, systrace_freebsd32, 1, 1, 1); +#endif MODULE_DEPEND(dtraceall, profile, 1, 1, 1); diff --git a/sys/modules/dtrace/systrace_freebsd32/Makefile b/sys/modules/dtrace/systrace_freebsd32/Makefile new file mode 100644 index 000000000000..284d99f54683 --- /dev/null +++ b/sys/modules/dtrace/systrace_freebsd32/Makefile @@ -0,0 +1,13 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/../../../cddl/dev/systrace + +KMOD= systrace_freebsd32 +SRCS= systrace.c +SRCS+= vnode_if.h + +CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris \ + -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \ + -I${.CURDIR}/../../.. -DFREEBSD32_SYSTRACE + +.include <bsd.kmod.mk> diff --git a/sys/modules/dtrace/systrace_linux32/Makefile b/sys/modules/dtrace/systrace_linux32/Makefile new file mode 100644 index 000000000000..c55987d2643f --- /dev/null +++ b/sys/modules/dtrace/systrace_linux32/Makefile @@ -0,0 +1,13 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/../../../cddl/dev/systrace + +KMOD= systrace_linux32 +SRCS= systrace.c +SRCS+= vnode_if.h + +CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris \ + -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \ + -I${.CURDIR}/../../.. -DLINUX_SYSTRACE + +.include <bsd.kmod.mk> |