X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=arch%2For1k%2Fpthread_arch.h;h=f75ea7e4e534e2726670de8a2b4e9842534cf0e9;hb=0296baff0ed5199612768db8bdf653b1930bbc66;hp=521b9c53b9f831ba09bc3a704577df76c81ceca9;hpb=610c5a8524c3d6cd3ac5a5f1231422e7648a3791;p=musl

diff --git a/arch/or1k/pthread_arch.h b/arch/or1k/pthread_arch.h
index 521b9c53..f75ea7e4 100644
--- a/arch/or1k/pthread_arch.h
+++ b/arch/or1k/pthread_arch.h
@@ -1,18 +1,16 @@
-/* or1k use variant I, but with the twist that tp points to the end of TCB */
-static inline struct pthread *__pthread_self()
+static inline uintptr_t __get_tp()
 {
 #ifdef __clang__
-	char *tp;
-	__asm__ __volatile__ ("l.ori %0, r10, 0" : "=r" (tp) );
+	uintptr_t tp;
+	__asm__ ("l.ori %0, r10, 0" : "=r" (tp) );
 #else
-	register char *tp __asm__("r10");
-	__asm__ __volatile__ ("" : "=r" (tp) );
+	register uintptr_t tp __asm__("r10");
+	__asm__ ("" : "=r" (tp) );
 #endif
-	return (struct pthread *) (tp - sizeof(struct pthread));
+	return tp;
 }
 
 #define TLS_ABOVE_TP
 #define GAP_ABOVE_TP 0
-#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread))
 
 #define MC_PC regs.pc