From owner-p4-projects@FreeBSD.ORG  Mon Nov 12 08:11:50 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id B0D47918; Mon, 12 Nov 2012 08:11:50 +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 72EEB916
 for <perforce@freebsd.org>; Mon, 12 Nov 2012 08:11:50 +0000 (UTC)
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:4f8:fff6::2d])
 by mx1.freebsd.org (Postfix) with ESMTP id 598758FC08
 for <perforce@freebsd.org>; Mon, 12 Nov 2012 08:11:50 +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 qAC8BoXQ055228
 for <perforce@freebsd.org>; Mon, 12 Nov 2012 08:11:50 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qAC8BobV055225
 for perforce@freebsd.org; Mon, 12 Nov 2012 08:11:50 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 12 Nov 2012 08:11:50 GMT
Message-Id: <201211120811.qAC8BobV055225@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 219760 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 08:11:51 -0000

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

Change 219760 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2012/11/12 08:11:12

	Initialise $gp in cheritest-helper, which means we no longer have
	to compile with -G0 (I hope).  This should (may) allow us to link
	sandboxed components against libraries.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/libexec/cheritest-helper/Makefile#4 edit
.. //depot/projects/ctsrd/cheribsd/src/libexec/cheritest-helper/mips64/chsbrt.S#2 edit
.. //depot/projects/ctsrd/cheribsd/src/libexec/cheritest-helper/sandbox.ld#3 edit

Differences ...

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

@@ -4,7 +4,6 @@
 PROG=	cheritest-helper
 SRCS=	cheritest-helper.c chsbrt.S
 LDFLAGS+=	-Wl,--script=${.CURDIR}/sandbox.ld -nostdlib
-CFLAGS+=	-G0 -Wa,-G0
 NO_MAN=
 #STRIP=
 NO_SHARED=	yes

==== //depot/projects/ctsrd/cheribsd/src/libexec/cheritest-helper/mips64/chsbrt.S#2 (text+ko) ====

@@ -121,10 +121,7 @@
 	# registers that aren't explicit or ABI-implied arguments.
 	#
 
-	#
-	# XXXRW: Initialise $gp?
-	#
-	dla	$gp, 0
+	dla	$gp, _gp
 
 	#
 	# Invoke MIPS ABI C "invoke" function.

==== //depot/projects/ctsrd/cheribsd/src/libexec/cheritest-helper/sandbox.ld#3 (text+ko) ====

@@ -47,6 +47,9 @@
 	.bss ALIGN(0x8): { *(.bss) }
 	.data ALIGN(0x8): { *(.data) }
 
+	_gp = ALIGN(16) + 0x7ff0;
+	.got : { *(.got.plt) *(.got) }
+
 	/*
 	 * Force zero-filling of previous segments in generated image.
 	 */