fix undefined behavior in memset due to missing sequence points

[musl] / arch / powerpc / pthread_arch.h

diff --git a/arch/powerpc/pthread_arch.h b/arch/powerpc/pthread_arch.h
index cb2a70b..7c5c4fa 100644 (file)
--- a/arch/powerpc/pthread_arch.h
+++ b/arch/powerpc/pthread_arch.h
@@ -1,14 +1,22 @@
 static inline struct pthread *__pthread_self()
 {
-       register char* tp __asm__("r2");
+#ifdef __clang__
+       char *tp;
+       __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 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