X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=arch%2Farm%2Fpthread_arch.h;h=157e2eae66d21203f13647cf12a3b556bbcd9642;hb=1e4204d522670a1d8b8ab85f1cfefa960547e8af;hp=5f96f2b07d36c0162aa2545c44d9d03e3911166a;hpb=834255a3ffb5be208024e66b1f794d9f4201413c;p=musl

diff --git a/arch/arm/pthread_arch.h b/arch/arm/pthread_arch.h
index 5f96f2b0..157e2eae 100644
--- a/arch/arm/pthread_arch.h
+++ b/arch/arm/pthread_arch.h
@@ -1,6 +1,32 @@
-typedef pthread_t (*__pthread_self_func_t)(void) __attribute__((const));
+#if ((__ARM_ARCH_6K__ || __ARM_ARCH_6KZ__ || __ARM_ARCH_6ZK__) && !__thumb__) \
+ || __ARM_ARCH_7A__ || __ARM_ARCH_7R__ || __ARM_ARCH >= 7
 
-#define __pthread_self ((__pthread_self_func_t)0xffff0fe0)
+static inline uintptr_t __get_tp()
+{
+	uintptr_t tp;
+	__asm__ ( "mrc p15,0,%0,c13,c0,3" : "=r"(tp) );
+	return tp;
+}
 
-#define CANCEL_REG_SP 16
-#define CANCEL_REG_IP 18
+#else
+
+#if __ARM_ARCH_4__ || __ARM_ARCH_4T__ || __ARM_ARCH == 4
+#define BLX "mov lr,pc\n\tbx"
+#else
+#define BLX "blx"
+#endif
+
+static inline uintptr_t __get_tp()
+{
+	extern hidden uintptr_t __a_gettp_ptr;
+	register uintptr_t tp __asm__("r0");
+	__asm__ ( BLX " %1" : "=r"(tp) : "r"(__a_gettp_ptr) : "cc", "lr" );
+	return tp;
+}
+
+#endif
+
+#define TLS_ABOVE_TP
+#define GAP_ABOVE_TP 8
+
+#define MC_PC arm_pc