X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=arch%2Fpowerpc%2Fpthread_arch.h;h=7c5c4fadb2116382e4a3a15a8e2a7adbaa95bb06;hb=9d4c902c42b3fda368d7ea64bb9575c46228fa7f;hp=2d1ee43cc76af9ea90abc6c6b62915f2d2987a7b;hpb=a4b51633cfdecf597c247afe028c08b520816590;p=musl

diff --git a/arch/powerpc/pthread_arch.h b/arch/powerpc/pthread_arch.h
index 2d1ee43c..7c5c4fad 100644
--- a/arch/powerpc/pthread_arch.h
+++ b/arch/powerpc/pthread_arch.h
@@ -5,6 +5,7 @@ static inline struct pthread *__pthread_self()
 	__asm__ __volatile__ ("mr %0, 2" : "=r"(tp) : : );
 #else
 	register char *tp __asm__("r2");
+	__asm__ __volatile__ ("" : "=r" (tp) );
 #endif
 	return (pthread_t)(tp - 0x7000 - sizeof(struct pthread));
 }
@@ -12,8 +13,10 @@ static inline struct pthread *__pthread_self()
 #define TLS_ABOVE_TP
 #define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + 0x7000)
 
-// offset of the PC register in mcontext_t, divided by the system wordsize
+#define DTP_OFFSET 0x8000
+
 // the kernel calls the ip "nip", it's the first saved value after the 32
 // GPRs.
-#define CANCEL_REG_IP 32
+#define MC_PC gregs[32]
 
+#define CANARY canary_at_end