deduplicate __pthread_self thread pointer adjustment out of each arch

[musl] / arch / arm / pthread_arch.h

diff --git a/arch/arm/pthread_arch.h b/arch/arm/pthread_arch.h
index 4864098..157e2ea 100644 (file)
--- a/arch/arm/pthread_arch.h
+++ b/arch/arm/pthread_arch.h
@@ -1,11 +1,11 @@
 #if ((__ARM_ARCH_6K__ || __ARM_ARCH_6KZ__ || __ARM_ARCH_6ZK__) && !__thumb__) \
  || __ARM_ARCH_7A__ || __ARM_ARCH_7R__ || __ARM_ARCH >= 7
 
-static inline pthread_t __pthread_self()
+static inline uintptr_t __get_tp()
 {
-       char *p;
-       __asm__ ( "mrc p15,0,%0,c13,c0,3" : "=r"(p) );
-       return (void *)(p-sizeof(struct pthread));
+       uintptr_t tp;
+       __asm__ ( "mrc p15,0,%0,c13,c0,3" : "=r"(tp) );
+       return tp;
 }
 
 #else
@@ -16,12 +16,12 @@ static inline pthread_t __pthread_self()
 #define BLX "blx"
 #endif
 
-static inline pthread_t __pthread_self()
+static inline uintptr_t __get_tp()
 {
        extern hidden uintptr_t __a_gettp_ptr;
-       register uintptr_t p __asm__("r0");
-       __asm__ ( BLX " %1" : "=r"(p) : "r"(__a_gettp_ptr) : "cc", "lr" );
-       return (void *)(p-sizeof(struct pthread));
+       register uintptr_t tp __asm__("r0");
+       __asm__ ( BLX " %1" : "=r"(tp) : "r"(__a_gettp_ptr) : "cc", "lr" );
+       return tp;
 }
 
 #endif