From owner-svn-src-head@FreeBSD.ORG  Sat Dec 11 17:57:43 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4D1081065675;
	Sat, 11 Dec 2010 17:57:43 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3B82F8FC1E;
	Sat, 11 Dec 2010 17:57:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBBHvh5e013947;
	Sat, 11 Dec 2010 17:57:43 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBBHvhHe013944;
	Sat, 11 Dec 2010 17:57:43 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201012111757.oBBHvhHe013944@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sat, 11 Dec 2010 17:57:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216381 - head/lib/libc/powerpc64/sys
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Dec 2010 17:57:43 -0000

Author: nwhitehorn
Date: Sat Dec 11 17:57:42 2010
New Revision: 216381
URL: http://svn.freebsd.org/changeset/base/216381

Log:
  Fix stack alignment (required to be to 16 bytes) instead of ptrace and
  cerror on powerpc64.

Modified:
  head/lib/libc/powerpc64/sys/cerror.S
  head/lib/libc/powerpc64/sys/ptrace.S

Modified: head/lib/libc/powerpc64/sys/cerror.S
==============================================================================
--- head/lib/libc/powerpc64/sys/cerror.S	Sat Dec 11 17:47:27 2010	(r216380)
+++ head/lib/libc/powerpc64/sys/cerror.S	Sat Dec 11 17:57:42 2010	(r216381)
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
 ENTRY(HIDENAME(cerror))
 	mflr	%r0
 	std	%r0,16(%r1)		/* save lr */
-	stdu	%r1,-56(%r1)		/* allocate new stack frame */
+	stdu	%r1,-64(%r1)		/* allocate new stack frame */
 	std	%r31,48(%r1)
 
 	mr	%r31,%r3          /* stash errval in callee-saved register */

Modified: head/lib/libc/powerpc64/sys/ptrace.S
==============================================================================
--- head/lib/libc/powerpc64/sys/ptrace.S	Sat Dec 11 17:47:27 2010	(r216380)
+++ head/lib/libc/powerpc64/sys/ptrace.S	Sat Dec 11 17:57:42 2010	(r216381)
@@ -32,8 +32,8 @@ __FBSDID("$FreeBSD$");
 
 ENTRY(ptrace)
 	mflr	%r0
-	stdu	%r1,-68(%r1)
-	std	%r0,84(%r1)
+	std	%r0,16(%r1)
+	stdu	%r1,-80(%r1)
 	stw	%r3,48(%r1)
 	stw	%r4,52(%r1)
 	std	%r5,56(%r1)
@@ -47,10 +47,10 @@ ENTRY(ptrace)
 	lwz	%r3,48(%r1)
 	lwz	%r4,52(%r1)
 	ld	%r5,56(%r1)
-	ld	%r0,84(%r1)
 	lwz	%r6,64(%r1)
-	mtlr	%r0
 	ld	%r1,0(%r1)
+	ld	%r0,16(%r1)
+	mtlr	%r0
 	li	%r0,SYS_ptrace
 	sc
 	bso	1f