From owner-svn-src-head@FreeBSD.ORG  Sun Jul 11 05:13:38 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 769FB106566C;
	Sun, 11 Jul 2010 05:13:38 +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 654438FC16;
	Sun, 11 Jul 2010 05:13:38 +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 o6B5Dcqm079814;
	Sun, 11 Jul 2010 05:13:38 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6B5DcqP079812;
	Sun, 11 Jul 2010 05:13:38 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201007110513.o6B5DcqP079812@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 11 Jul 2010 05:13:38 +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: r209893 - in head/lib/libthr/arch/powerpc64: include
	powerpc powerpc64
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: Sun, 11 Jul 2010 05:13:38 -0000

Author: nwhitehorn
Date: Sun Jul 11 05:13:38 2010
New Revision: 209893
URL: http://svn.freebsd.org/changeset/base/209893

Log:
  Fix SVN mismerge. We somehow ended up with the 32-bit powerpc version
  in arch/powerpc64 instead of the 64-bit one.

Added:
  head/lib/libthr/arch/powerpc64/powerpc64/
     - copied from r209890, head/lib/libthr/arch/powerpc64/powerpc/
Deleted:
  head/lib/libthr/arch/powerpc64/powerpc/
Modified:
  head/lib/libthr/arch/powerpc64/include/pthread_md.h

Modified: head/lib/libthr/arch/powerpc64/include/pthread_md.h
==============================================================================
--- head/lib/libthr/arch/powerpc64/include/pthread_md.h	Sat Jul 10 22:37:23 2010	(r209892)
+++ head/lib/libthr/arch/powerpc64/include/pthread_md.h	Sun Jul 11 05:13:38 2010	(r209893)
@@ -39,12 +39,12 @@
 #define	CPU_SPINWAIT
 
 #define	DTV_OFFSET		offsetof(struct tcb, tcb_dtv)
-#define	TP_OFFSET		0x7008
+#define	TP_OFFSET		0x7010
 
 /*
  * Variant I tcb. The structure layout is fixed, don't blindly
  * change it.
- * %r2 points to end of the structure.
+ * %r13 points to end of the structure.
  */
 struct tcb {
 	void			*tcb_dtv;
@@ -57,7 +57,7 @@ void		_tcb_dtor(struct tcb *);
 static __inline void
 _tcb_set(struct tcb *tcb)
 {
-	register uint8_t *_tp __asm__("%r2");
+	register uint8_t *_tp __asm__("%r13");
 
 	__asm __volatile("mr %0,%1" : "=r"(_tp) :
 	    "r"((uint8_t *)tcb + TP_OFFSET));
@@ -66,7 +66,7 @@ _tcb_set(struct tcb *tcb)
 static __inline struct tcb *
 _tcb_get(void)
 {
-	register uint8_t *_tp __asm__("%r2");
+	register uint8_t *_tp __asm__("%r13");
 
 	return ((struct tcb *)(_tp - TP_OFFSET));
 }