svn commit: r233415 - in head/cddl: lib lib/libdtrace usr.sbin

[Oleksandr Tymoshenko]

Author: gonzo
Date: Sat Mar 24 05:29:07 2012
New Revision: 233415
URL: http://svn.freebsd.org/changeset/base/233415

Log:
  Enable build of DTrace-related userland parts for MIPS

Modified:
  head/cddl/lib/Makefile
  head/cddl/lib/libdtrace/Makefile
  head/cddl/usr.sbin/Makefile

Modified: head/cddl/lib/Makefile
==============================================================================
--- head/cddl/lib/Makefile	Sat Mar 24 05:27:39 2012	(r233414)
+++ head/cddl/lib/Makefile	Sat Mar 24 05:29:07 2012	(r233415)
@@ -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

Modified: head/cddl/lib/libdtrace/Makefile
==============================================================================
--- head/cddl/lib/libdtrace/Makefile	Sat Mar 24 05:27:39 2012	(r233414)
+++ head/cddl/lib/libdtrace/Makefile	Sat Mar 24 05:29:07 2012	(r233415)
@@ -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}/ut
 .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
 

Modified: head/cddl/usr.sbin/Makefile
==============================================================================
--- head/cddl/usr.sbin/Makefile	Sat Mar 24 05:27:39 2012	(r233414)
+++ head/cddl/usr.sbin/Makefile	Sat Mar 24 05:29:07 2012	(r233415)
@@ -19,4 +19,8 @@ _dtruss=	dtruss
 _lockstat=	lockstat
 .endif
 
+.if ${MACHINE_CPUARCH} == "mips"
+_dtrace=	dtrace
+.endif
+
 .include <bsd.subdir.mk>