Merge sync of head

1 files changed, 7 insertions, 10 deletions

diff --git a/lib/libthr/arch/powerpc/include/pthread_md.h b/lib/libthr/arch/powerpc/include/pthread_md.h
index 91102b4..544ee1c 100644
--- a/lib/libthr/arch/powerpc/include/pthread_md.h
+++ b/lib/libthr/arch/powerpc/include/pthread_md.h
@@ -55,29 +55,26 @@ struct tcb {
 	struct pthread		*tcb_thread;
 };
 
-struct tcb	*_tcb_ctor(struct pthread *, int);
-void		_tcb_dtor(struct tcb *);
-
 static __inline void
 _tcb_set(struct tcb *tcb)
 {
 #ifdef __powerpc64__
-	register uint8_t *_tp __asm__("%r13");
+	__asm __volatile("mr 13,%0" ::
+	    "r"((uint8_t *)tcb + TP_OFFSET));
 #else
-	register uint8_t *_tp __asm__("%r2");
-#endif
-
-	__asm __volatile("mr %0,%1" : "=r"(_tp) :
+	__asm __volatile("mr 2,%0" ::
 	    "r"((uint8_t *)tcb + TP_OFFSET));
+#endif
 }
 
 static __inline struct tcb *
 _tcb_get(void)
 {
+	register uint8_t *_tp;
 #ifdef __powerpc64__
-	register uint8_t *_tp __asm__("%r13");
+	__asm __volatile("mr %0,13" : "=r"(_tp));
 #else
-	register uint8_t *_tp __asm__("%r2");
+	__asm __volatile("mr %0,2" : "=r"(_tp));
 #endif
 
 	return ((struct tcb *)(_tp - TP_OFFSET));