From owner-p4-projects@FreeBSD.ORG  Mon Nov 12 21:28:32 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 6D4FDC47; Mon, 12 Nov 2012 21:28:32 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 26A90C42
 for <perforce@freebsd.org>; Mon, 12 Nov 2012 21:28:32 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:4f8:fff6::2d])
 by mx1.freebsd.org (Postfix) with ESMTP id 0D0D68FC14
 for <perforce@freebsd.org>; Mon, 12 Nov 2012 21:28:32 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
 by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qACLSV3P085678
 for <perforce@freebsd.org>; Mon, 12 Nov 2012 21:28:31 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qACLSVP9085675
 for perforce@freebsd.org; Mon, 12 Nov 2012 21:28:31 GMT
 (envelope-from brooks@freebsd.org)
Date: Mon, 12 Nov 2012 21:28:31 GMT
Message-Id: <201211122128.qACLSVP9085675@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 219764 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Nov 2012 21:28:32 -0000

http://p4web.freebsd.org/@@219764?ac=10

Change 219764 by brooks@brooks_zenith on 2012/11/12 21:27:34

	Fix search path to find memcpy.S on mips64.  Use memset.c since
	mips doesn't have an asm version of it.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/libexec/cheritest-helper/Makefile#6 edit

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/libexec/cheritest-helper/Makefile#6 (text+ko) ====

@@ -7,7 +7,7 @@
 	stub.c					\
 	chsbrt.S				\
 	memcpy.S				\
-	memset.S
+	memset.c
 
 LDFLAGS+=	-Wl,--script=${.CURDIR}/sandbox.ld -nostdlib
 NO_MAN=
@@ -38,7 +38,8 @@
 cheritest-helper.dump: cheritest-helper
 	objdump -xsSD ${.ALLSRC} > ${.TARGET}
 
-.PATH: ${.CURDIR}/${MACHINE_ARCH}		\
-	${.CURDIR}/../../lib/libc/string/${MACHINE_TARGET}
+.PATH: ${.CURDIR}/${MACHINE_ARCH}
+.PATH: ${.CURDIR}/../../lib/libc/${MACHINE}/string
+.PATH: ${.CURDIR}/../../lib/libc/string
 
 .include <bsd.prog.mk>