From owner-svn-src-all@FreeBSD.ORG  Sat Mar 24 05:29:08 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7597D106566C;
	Sat, 24 Mar 2012 05:29:08 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4673E8FC0A;
	Sat, 24 Mar 2012 05:29:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2O5T8Y6014494;
	Sat, 24 Mar 2012 05:29:08 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2O5T8Yl014490;
	Sat, 24 Mar 2012 05:29:08 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <201203240529.q2O5T8Yl014490@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Sat, 24 Mar 2012 05:29:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r233415 - in head/cddl: lib lib/libdtrace usr.sbin
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Mar 2012 05:29:08 -0000

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>