X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=inline;f=arch%2Farm%2Fpthread_arch.h;h=e689ea212ae22e148788deec9e74f5b2e9f49f7d;hb=22359b54ab9a3ff0a854490f3eb0fcb838e785af;hp=e607c5dbd0e20e94fc767984eb4b4aa3a3ad0280;hpb=d5bde7babb88f0279f3ad592d585f3f954090696;p=musl

diff --git a/arch/arm/pthread_arch.h b/arch/arm/pthread_arch.h
index e607c5db..e689ea21 100644
--- a/arch/arm/pthread_arch.h
+++ b/arch/arm/pthread_arch.h
@@ -1,4 +1,33 @@
-#define __pthread_self ((pthread_t (*)(void))0xffff0fe0)
+#if ((__ARM_ARCH_6K__ || __ARM_ARCH_6KZ__ || __ARM_ARCH_6ZK__) && !__thumb__) \
+ || __ARM_ARCH_7A__ || __ARM_ARCH_7R__ || __ARM_ARCH >= 7
 
-#define CANCEL_REG_SP 16
-#define CANCEL_REG_IP 18
+static inline pthread_t __pthread_self()
+{
+	char *p;
+	__asm__ ( "mrc p15,0,%0,c13,c0,3" : "=r"(p) );
+	return (void *)(p-sizeof(struct pthread));
+}
+
+#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 pthread_t __pthread_self()
+{
+	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));
+}
+
+#endif
+
+#define TLS_ABOVE_TP
+#define GAP_ABOVE_TP 8
+#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread))
+
+#define MC_PC arm_pc