From owner-p4-projects@FreeBSD.ORG  Wed Apr 23 15:28:12 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0F86537B404; Wed, 23 Apr 2003 15:28:12 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A3ECB37B401
	for <perforce@freebsd.org>; Wed, 23 Apr 2003 15:28:11 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4AC2443FB1
	for <perforce@freebsd.org>; Wed, 23 Apr 2003 15:28:11 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h3NMSB0U029831
	for <perforce@freebsd.org>; Wed, 23 Apr 2003 15:28:11 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3NMSAli029826
	for perforce@freebsd.org; Wed, 23 Apr 2003 15:28:10 -0700 (PDT)
Date: Wed, 23 Apr 2003 15:28:10 -0700 (PDT)
Message-Id: <200304232228.h3NMSAli029826@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 29554 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
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: Wed, 23 Apr 2003 22:28:13 -0000

http://perforce.freebsd.org/chv.cgi?CH=29554

Change 29554 by peter@peter_daintree on 2003/04/23 15:27:40

	update for x86-64 calling conventions.  This is not ABI compliant yet,
	but with a corresponding commit to exec_setregs(), it reaches basic
	functionality

Affected files ...

.. //depot/projects/hammer/lib/csu/x86_64/crt1.c#7 edit

Differences ...

==== //depot/projects/hammer/lib/csu/x86_64/crt1.c#7 (text+ko) ====

@@ -43,7 +43,7 @@
 extern void _fini(void);
 extern void _init(void);
 extern int main(int, char **, char **);
-extern void _start(char *, ...);
+extern void _start(char **, void (*)(void));
 
 #ifdef GCRT
 extern void _mcleanup(void);
@@ -55,33 +55,18 @@
 char **environ;
 const char *__progname = "";
 
-static __inline fptr
-get_rtld_cleanup(void)
-{
-	fptr retval;
-
-#ifdef	__GNUC__
-	__asm__("movq %%rdx,%0" : "=rm"(retval));
-#else
-	retval = (fptr)0; /* XXXX Fix this for other compilers */
-#endif
-	return(retval);
-}
-
 /* The entry function. */
 void
-_start(char *ap, ...)
+_start(char **ap, void (*cleanup)(void))
 {
-	fptr cleanup;
 	int argc;
 	char **argv;
 	char **env;
 	const char *s;
 
-	cleanup = get_rtld_cleanup();
-	argv = &ap;
-	argc = *(long *)(void *)(argv - 1);
-	env = argv + argc + 1;
+	argc = *(long *)(void *)ap;
+	argv = ap + 1;
+	env = ap + 2 + argc;
 	environ = env;
 	if (argc > 0 && argv[0] != NULL) {
 		__progname = argv[0];