From owner-p4-projects@FreeBSD.ORG  Fri May 23 17:34:06 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D3B5F37B404; Fri, 23 May 2003 17:34:05 -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 723D537B401
	for <perforce@freebsd.org>; Fri, 23 May 2003 17:34:05 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id F2FC543F75
	for <perforce@freebsd.org>; Fri, 23 May 2003 17:34:04 -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 h4O0Y40U005463
	for <perforce@freebsd.org>; Fri, 23 May 2003 17:34:04 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4O0Y47n005460
	for perforce@freebsd.org; Fri, 23 May 2003 17:34:04 -0700 (PDT)
Date: Fri, 23 May 2003 17:34:04 -0700 (PDT)
Message-Id: <200305240034.h4O0Y47n005460@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 31743 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: Sat, 24 May 2003 00:34:07 -0000

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

Change 31743 by peter@peter_hammer on 2003/05/23 17:33:48

	preserve %rdi across _rtld call

Affected files ...

.. //depot/projects/hammer/libexec/rtld-elf/amd64/rtld_start.S#7 edit

Differences ...

==== //depot/projects/hammer/libexec/rtld-elf/amd64/rtld_start.S#7 (text+ko) ====

@@ -32,12 +32,14 @@
 .rtld_start:
 	xorq	%rbp,%rbp		# Clear frame pointer for good form
 	subq	$16,%rsp		# A place to store exit procedure addr
+	movq	%rdi,%r12
 	movq	%rsp,%rsi		# save address of exit proc
 	movq	%rsp,%rdx		# construct address of obj_main
 	addq	$8,%rdx
 	call	_rtld@PLT		# Call rtld(sp); returns entry point
 	popq	%rsi			# Get exit procedure address
 	addq	$8,%rsp			# Ignore obj_main
+	movq	%r12,%rdi		# *ap
 /*
  * At this point, %rax contains the entry point of the main program, and
  * %rdx contains a pointer to a termination function that should be