From owner-svn-src-head@FreeBSD.ORG  Sat Apr  7 22:28:50 2012
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 AECCF1065679;
	Sat,  7 Apr 2012 22:28:50 +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 9A1598FC1B;
	Sat,  7 Apr 2012 22:28:50 +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 q37MSo7B081082;
	Sat, 7 Apr 2012 22:28:50 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q37MSoXJ081080;
	Sat, 7 Apr 2012 22:28:50 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201204072228.q37MSoXJ081080@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sat, 7 Apr 2012 22:28:50 +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: r234003 - head/lib/libc/powerpc64/gen
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, 07 Apr 2012 22:28:50 -0000

Author: nwhitehorn
Date: Sat Apr  7 22:28:50 2012
New Revision: 234003
URL: http://svn.freebsd.org/changeset/base/234003

Log:
  Properly resolve the _ctx_start function descriptor (the symbol _ctx_start
  is a descriptor, not a code address), which prevents crashes when starting
  a context. This fixes QEMU on powerpc64.
  
  MFC after:	3 days

Modified:
  head/lib/libc/powerpc64/gen/makecontext.c

Modified: head/lib/libc/powerpc64/gen/makecontext.c
==============================================================================
--- head/lib/libc/powerpc64/gen/makecontext.c	Sat Apr  7 20:56:29 2012	(r234002)
+++ head/lib/libc/powerpc64/gen/makecontext.c	Sat Apr  7 22:28:50 2012	(r234003)
@@ -111,7 +111,7 @@ __makecontext(ucontext_t *ucp, void (*st
 	 * Use caller-saved regs 14/15 to hold params that _ctx_start
 	 * will use to invoke the user-supplied func
 	 */
-	mc->mc_srr0 = (uintptr_t) _ctx_start;
+	mc->mc_srr0 = *(uintptr_t *)_ctx_start;
 	mc->mc_gpr[1] = (uintptr_t) sp;		/* new stack pointer */
 	mc->mc_gpr[14] = (uintptr_t) start;	/* r14 <- start */
 	mc->mc_gpr[15] = (uintptr_t) ucp;	/* r15 <- ucp */