diff options
| author | Kurt Lidl <lidl@FreeBSD.org> | 2017-09-06 03:19:52 +0000 |
|---|---|---|
| committer | Kurt Lidl <lidl@FreeBSD.org> | 2017-09-06 03:19:52 +0000 |
| commit | a8273e437196ecc8e40c818d372f674b69adec09 (patch) | |
| tree | 3558ab43366c8ef8d2100791f79900deea73d856 /sys/modules/dtrace | |
| parent | 6d0ab07837b10e04fa278d006eb855ff72ed0c07 (diff) | |
| download | src-a8273e437196ecc8e40c818d372f674b69adec09.tar.gz src-a8273e437196ecc8e40c818d372f674b69adec09.zip | |
Enable dtrace support for mips64 and the ERL kernel config
Turn on the required options in the ERL config file, and ensure
that the fbt module is listed as a dependency for mips in
the modules/dtrace/dtraceall/dtraceall.c file.
PR: 220346
Reviewed by: gnn, markj
MFC after: 2 weeks
Differential Revision: https://reviews.freebsd.org/D12227
Notes
Notes:
svn path=/head/; revision=323206
Diffstat (limited to 'sys/modules/dtrace')
| -rw-r--r-- | sys/modules/dtrace/Makefile | 5 | ||||
| -rw-r--r-- | sys/modules/dtrace/dtraceall/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/dtrace/dtraceall/dtraceall.c | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/sys/modules/dtrace/Makefile b/sys/modules/dtrace/Makefile index 8ecaefe21b7e..6903e4378ac4 100644 --- a/sys/modules/dtrace/Makefile +++ b/sys/modules/dtrace/Makefile @@ -22,11 +22,14 @@ SUBDIR+= systrace_linux32 .if ${MACHINE_CPUARCH} == "powerpc" SUBDIR+= fbt fasttrap .endif -.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64" +.if ${MACHINE_CPUARCH} == "amd64" || \ + ${MACHINE_ARCH} == "mips64" || \ + ${MACHINE_ARCH} == "powerpc64" SUBDIR+= systrace_freebsd32 .endif .if ${MACHINE_CPUARCH} == "aarch64" || \ ${MACHINE_CPUARCH} == "arm" || \ + ${MACHINE_CPUARCH} == "mips" || \ ${MACHINE_CPUARCH} == "riscv" SUBDIR+= fbt .endif diff --git a/sys/modules/dtrace/dtraceall/Makefile b/sys/modules/dtrace/dtraceall/Makefile index 1750b5b8bacf..cf081b9822dd 100644 --- a/sys/modules/dtrace/dtraceall/Makefile +++ b/sys/modules/dtrace/dtraceall/Makefile @@ -8,7 +8,7 @@ SRCS= dtraceall.c opt_compat.h opt_nfs.h CFLAGS+= -I${SYSDIR} .if !defined(KERNBUILDDIR) -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "mips64" opt_compat.h: echo "#define COMPAT_FREEBSD32 1" >> ${.TARGET} .endif diff --git a/sys/modules/dtrace/dtraceall/dtraceall.c b/sys/modules/dtrace/dtraceall/dtraceall.c index c0eca3305535..08ad49db9c8e 100644 --- a/sys/modules/dtrace/dtraceall/dtraceall.c +++ b/sys/modules/dtrace/dtraceall/dtraceall.c @@ -70,7 +70,8 @@ MODULE_DEPEND(dtraceall, dtmalloc, 1, 1, 1); MODULE_DEPEND(dtraceall, dtnfscl, 1, 1, 1); #endif #if defined(__aarch64__) || defined(__amd64__) || defined(__arm__) || \ - defined(__i386__) || defined(__powerpc__) || defined(__riscv) + defined(__i386__) || defined(__mips__) || \ + defined(__powerpc__) || defined(__riscv) MODULE_DEPEND(dtraceall, fbt, 1, 1, 1); #endif #if defined(__amd64__) || defined(__i386__) |