From owner-svn-src-projects@FreeBSD.ORG  Mon Feb 20 08:56:11 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 23F4A1065674;
	Mon, 20 Feb 2012 08:56:11 +0000 (UTC)
	(envelope-from andrew@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1381C8FC14;
	Mon, 20 Feb 2012 08:56:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1K8uAl1040423;
	Mon, 20 Feb 2012 08:56:10 GMT (envelope-from andrew@svn.freebsd.org)
Received: (from andrew@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1K8uAhJ040421;
	Mon, 20 Feb 2012 08:56:10 GMT (envelope-from andrew@svn.freebsd.org)
Message-Id: <201202200856.q1K8uAhJ040421@svn.freebsd.org>
From: Andrew Turner <andrew@FreeBSD.org>
Date: Mon, 20 Feb 2012 08:56:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r231930 - projects/arm_eabi/libexec/rtld-elf/arm
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Feb 2012 08:56:11 -0000

Author: andrew
Date: Mon Feb 20 08:56:10 2012
New Revision: 231930
URL: http://svn.freebsd.org/changeset/base/231930

Log:
  Correctly align the stack before calling into C code.
  
  We restore the stack before jumping to the entry point as _start needs the
  stack in the same state as we were given it and also fixes the stack to be
  correctly aligned.

Modified:
  projects/arm_eabi/libexec/rtld-elf/arm/rtld_start.S

Modified: projects/arm_eabi/libexec/rtld-elf/arm/rtld_start.S
==============================================================================
--- projects/arm_eabi/libexec/rtld-elf/arm/rtld_start.S	Mon Feb 20 06:35:52 2012	(r231929)
+++ projects/arm_eabi/libexec/rtld-elf/arm/rtld_start.S	Mon Feb 20 08:56:10 2012	(r231930)
@@ -37,6 +37,8 @@ __FBSDID("$FreeBSD$");
 	.globl	.rtld_start
 	.type	.rtld_start,%function
 .rtld_start:
+	mov	r6, sp			/* save the stack pointer */
+	bic	sp, sp, #7
 	sub	sp, sp, #8		/* make room for obj_main & exit proc */
 	mov	r4, r0			/* save ps_strings */
 	ldr	sl, .L2
@@ -52,13 +54,13 @@ __FBSDID("$FreeBSD$");
 	bl	_rtld_relocate_nonplt_self
 	mov	r1, sp
 	add	r2, sp, #4
-	add	r0, sp, #8
+	mov	r0, r6			/* load the sp the kernel gave us */
 	bl	_rtld			/* call the shared loader */
 	mov	r3, r0			/* save entry point */
 
 	ldr	r2, [sp, #0]		/* r2 = cleanup */
 	ldr	r1, [sp, #4]		/* r1 = obj_main */
-	add	sp, sp, #8		/* restore stack */
+	mov	sp, r6			/* restore stack */
 	mov	r0, r4			/* restore ps_strings */
 	mov	pc, r3			/* jump to the entry point */
 .L2: