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));
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
