X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=arch%2Fmips%2Fpthread_arch.h;h=f8e35ae46377d5f89ed3eede40dcc1cff83c2747;hp=60296fd669c3f91c4951540ece0a1a6e1e17138a;hb=d18a410bbf259e5fee9fb8b4b0335ec64991d5db;hpb=6315004f6102dca44c4ba50654a36967b8b9c2a6

diff --git a/arch/mips/pthread_arch.h b/arch/mips/pthread_arch.h
index 60296fd6..f8e35ae4 100644
--- a/arch/mips/pthread_arch.h
+++ b/arch/mips/pthread_arch.h
@@ -1,8 +1,16 @@
 static inline struct pthread *__pthread_self()
 {
-	struct pthread *self;
-	__asm__ __volatile__ (".word 0x7c03e83b" : "=v" (self) );
-	return self;
+#ifdef __clang__
+	char *tp;
+	__asm__ __volatile__ (".word 0x7c03e83b ; move %0, $3" : "=r" (tp) : : "$3" );
+#else
+	register char *tp __asm__("$3");
+	__asm__ __volatile__ (".word 0x7c03e83b" : "=r" (tp) );
+#endif
+	return (pthread_t)(tp - 0x7000 - sizeof(struct pthread));
 }
 
-#define CANCEL_REG_IP 3
+#define TLS_ABOVE_TP
+#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + 0x7000)
+
+#define CANCEL_REG_IP (3-(union {int __i; char __b;}){1}.__b)