From owner-p4-projects@FreeBSD.ORG  Thu Nov 12 14:24:29 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 696501065679; Thu, 12 Nov 2009 14:24:29 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2C629106566B
	for <perforce@FreeBSD.org>; Thu, 12 Nov 2009 14:24:29 +0000 (UTC)
	(envelope-from jona@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 19C508FC1B
	for <perforce@FreeBSD.org>; Thu, 12 Nov 2009 14:24:29 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nACEOS5Y066734
	for <perforce@FreeBSD.org>; Thu, 12 Nov 2009 14:24:28 GMT
	(envelope-from jona@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nACEOSZM066732
	for perforce@freebsd.org; Thu, 12 Nov 2009 14:24:28 GMT
	(envelope-from jona@FreeBSD.org)
Date: Thu, 12 Nov 2009 14:24:28 GMT
Message-Id: <200911121424.nACEOSZM066732@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jona@FreeBSD.org using -f
From: Jonathan Anderson <jona@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 170545 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Thu, 12 Nov 2009 14:24:29 -0000

http://p4web.freebsd.org/chv.cgi?CH=170545

Change 170545 by jona@jona-capsicum-belle64 on 2009/11/12 14:23:34

	Some CSU cleanup

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/lib/csu/amd64/crt1.c#5 edit
.. //depot/projects/trustedbsd/capabilities/src/lib/csu/common/crtbrand.c#6 edit
.. //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/crt1.c#5 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/lib/csu/amd64/crt1.c#5 (text+ko) ====

@@ -44,7 +44,6 @@
 extern void _fini(void);
 extern void _init(void);
 extern int main(int, char **, char **);
-extern int cap_main(int, char **, char **) __attribute__((weak));
 extern void _start(char **, void (*)(void));
 extern void _capstart(char **, void (*)(void));
 

==== //depot/projects/trustedbsd/capabilities/src/lib/csu/common/crtbrand.c#6 (text+ko) ====

@@ -54,11 +54,14 @@
 
 
 
-int cap_main(int argc, char **argv, char **env)
+extern int cap_main(int, char **, char **) __attribute__((weak));
+int cap_main(__unused int argc, __unused char **argv, __unused char **env)
 {
 	const char warning[] =
 		"ERROR: attempting to run a regular binary in capability mode!\n\nIf you want to run a binary in a sandbox, you must provide a cap_main() function, which takes the same arguments as main().\n";
 
 	write(2, warning, sizeof(warning));
+
+	return -1;
 }
 

==== //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/crt1.c#5 (text+ko) ====

@@ -43,7 +43,6 @@
 extern void _fini(void);
 extern void _init(void);
 extern int main(int, char **, char **);
-extern int cap_main(int, char **, char **) __attribute__((weak));
 extern void _start(char *, ...);
 extern void _capstart(char *, ...);
 
@@ -148,8 +147,8 @@
 #endif
 	atexit(_fini);
 #ifdef GCRT
-	monstartup(&eprol, &etext);
-__asm__("eprol:");
+/*	monstartup(&eprol, &etext);
+__asm__("eprol:");*/
 #endif
 	_init();
 	exit( cap_main(argc, argv, env) );