overhaul ARM atomics/tls for performance and compatibility

[musl] / arch / arm / pthread_arch.h

diff --git a/arch/arm/pthread_arch.h b/arch/arm/pthread_arch.h
index 6d9dc3a..7ab9058 100644 (file)
--- a/arch/arm/pthread_arch.h
+++ b/arch/arm/pthread_arch.h
@@ -10,9 +10,17 @@ static inline __attribute__((const)) pthread_t __pthread_self()
 
 #else
 
-typedef char *(*__ptr_func_t)(void) __attribute__((const));
-#define __pthread_self() \
-       ((pthread_t)(((__ptr_func_t)0xffff0fe0)()+8-sizeof(struct pthread)))
+static inline __attribute__((const)) pthread_t __pthread_self()
+{
+#ifdef __clang__
+       char *p;
+       __asm__( "bl __a_gettp\n\tmov %0,r0" : "=r"(p) : : "cc", "r0", "lr" );
+#else
+       register char *p __asm__("r0");
+       __asm__( "bl __a_gettp" : "=r"(p) : : "cc", "lr" );
+#endif
+       return (void *)(p+8-sizeof(struct pthread));
+}
 
 #endif