diff options
| author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2010-07-11 05:13:38 +0000 |
|---|---|---|
| committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2010-07-11 05:13:38 +0000 |
| commit | 9712e9de77c6576615b42258f1551f2036262bdf (patch) | |
| tree | 340c30531929fa5af4129dcda607815eab352de7 /lib/libthr | |
| parent | d1622ddea9bd04c1a10ea27de0722715376062a9 (diff) | |
| download | FreeBSD-src-9712e9de77c6576615b42258f1551f2036262bdf.zip FreeBSD-src-9712e9de77c6576615b42258f1551f2036262bdf.tar.gz | |
Fix SVN mismerge. We somehow ended up with the 32-bit powerpc version
in arch/powerpc64 instead of the 64-bit one.
Diffstat (limited to 'lib/libthr')
| -rw-r--r-- | lib/libthr/arch/powerpc64/include/pthread_md.h | 8 | ||||
| -rw-r--r-- | lib/libthr/arch/powerpc64/powerpc64/pthread_md.c (renamed from lib/libthr/arch/powerpc64/powerpc/pthread_md.c) | 0 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/libthr/arch/powerpc64/include/pthread_md.h b/lib/libthr/arch/powerpc64/include/pthread_md.h index 2abbbdc..af6a0af 100644 --- a/lib/libthr/arch/powerpc64/include/pthread_md.h +++ b/lib/libthr/arch/powerpc64/include/pthread_md.h @@ -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)); } diff --git a/lib/libthr/arch/powerpc64/powerpc/pthread_md.c b/lib/libthr/arch/powerpc64/powerpc64/pthread_md.c index 66f043e..66f043e 100644 --- a/lib/libthr/arch/powerpc64/powerpc/pthread_md.c +++ b/lib/libthr/arch/powerpc64/powerpc64/pthread_md.c |
