From owner-svn-src-projects@FreeBSD.ORG  Mon Feb  1 00:13:30 2010
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 83447106568F;
	Mon,  1 Feb 2010 00:13:30 +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 7215F8FC08;
	Mon,  1 Feb 2010 00:13:30 +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 o110DUH6080708;
	Mon, 1 Feb 2010 00:13:30 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o110DUEA080705;
	Mon, 1 Feb 2010 00:13:30 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201002010013.o110DUEA080705@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Mon, 1 Feb 2010 00:13:30 +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: r203331 - projects/ppc64/libexec/rtld-elf/powerpc64
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, 01 Feb 2010 00:13:30 -0000

Author: nwhitehorn
Date: Mon Feb  1 00:13:30 2010
New Revision: 203331
URL: http://svn.freebsd.org/changeset/base/203331

Log:
  Do not restore the original stack pointer: the PPC64 ABI stores things in
  the parent's stack frame, which becomes the program arguments if R1 is
  restored. This leads to bad. Also add some cache-related paranoia to
  setting of PLT slots, following glibc. With these changes, nearly all
  dynamic executables run correctly with LD_BIND_NOW=1.

Modified:
  projects/ppc64/libexec/rtld-elf/powerpc64/reloc.c
  projects/ppc64/libexec/rtld-elf/powerpc64/rtld_start.S

Modified: projects/ppc64/libexec/rtld-elf/powerpc64/reloc.c
==============================================================================
--- projects/ppc64/libexec/rtld-elf/powerpc64/reloc.c	Sun Jan 31 23:39:55 2010	(r203330)
+++ projects/ppc64/libexec/rtld-elf/powerpc64/reloc.c	Mon Feb  1 00:13:30 2010	(r203331)
@@ -441,6 +441,8 @@ reloc_jmpslot(Elf_Addr *wherep, Elf_Addr
 		    (Elf_Addr)defobj->relocbase;
 	}
 
+	__asm __volatile("dcbst 0,%0; sync" :: "r"(wherep) : "memory");
+
 	return (target);
 }
 

Modified: projects/ppc64/libexec/rtld-elf/powerpc64/rtld_start.S
==============================================================================
--- projects/ppc64/libexec/rtld-elf/powerpc64/rtld_start.S	Sun Jan 31 23:39:55 2010	(r203330)
+++ projects/ppc64/libexec/rtld-elf/powerpc64/rtld_start.S	Mon Feb  1 00:13:30 2010	(r203331)
@@ -96,7 +96,6 @@ _ENTRY(_rtld_start)
 	ld      %r6,72(%r1)	/* obj */
 	ld      %r7,80(%r1)	/* exit proc */
 	ld      %r8,88(%r1)	/* ps_strings */
-        addi    %r1,%r1,96	/* restore original stackptr */
 
 	blrl	/* _start(argc, argv, envp, obj, cleanup, ps_strings) */