fix broken atomic store on powerpc[64]

[musl] / arch / powerpc / pthread_arch.h

diff --git a/arch/powerpc/pthread_arch.h b/arch/powerpc/pthread_arch.h
index 1cbfc22..79e5a09 100644 (file)
--- a/arch/powerpc/pthread_arch.h
+++ b/arch/powerpc/pthread_arch.h
@@ -5,18 +5,19 @@ 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));
 }
                         
 #define TLS_ABOVE_TP
+#define GAP_ABOVE_TP 0
 #define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + 0x7000)
 
 #define DTP_OFFSET 0x8000
 
-// offset of the PC register in mcontext_t, divided by the system wordsize
 // 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