diff options
| -rw-r--r-- | cddl/lib/Makefile | 2 | ||||
| -rw-r--r-- | cddl/lib/libdtrace/Makefile | 8 | ||||
| -rw-r--r-- | cddl/usr.sbin/Makefile | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/cddl/lib/Makefile b/cddl/lib/Makefile index 52e97d7..088ceb7 100644 --- a/cddl/lib/Makefile +++ b/cddl/lib/Makefile @@ -19,7 +19,7 @@ _libzpool= libzpool .endif .endif -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || ${MACHINE_CPUARCH} == "mips" _drti= drti _libdtrace= libdtrace .endif diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile index 9a10743..81396ff 100644 --- a/cddl/lib/libdtrace/Makefile +++ b/cddl/lib/libdtrace/Makefile @@ -42,8 +42,7 @@ SRCS= dt_aggregate.c \ dt_subr.c \ dt_work.c \ dt_xlator.c \ - gmatch.c \ - dis_tables.c + gmatch.c DSRCS= errno.d \ psinfo.d \ @@ -70,12 +69,17 @@ CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel -DDIS_MEM .elif ${MACHINE_CPUARCH} == "sparc64" CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/sparc +.elif ${MACHINE_CPUARCH} == "mips" +CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/mips +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/mips +.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/mips .else # temporary hack CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel .endif .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +SRCS+= dis_tables.c DSRCS+= regs_x86.d .endif diff --git a/cddl/usr.sbin/Makefile b/cddl/usr.sbin/Makefile index 49db06b..a84715b 100644 --- a/cddl/usr.sbin/Makefile +++ b/cddl/usr.sbin/Makefile @@ -19,4 +19,8 @@ _dtruss= dtruss _lockstat= lockstat .endif +.if ${MACHINE_CPUARCH} == "mips" +_dtrace= dtrace +.endif + .include <bsd.subdir.mk> |
