projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
aarch64: fix setjmp return value
[musl]
/
arch
/
arm
/
pthread_arch.h
diff --git
a/arch/arm/pthread_arch.h
b/arch/arm/pthread_arch.h
index
7ab9058
..
e689ea2
100644
(file)
--- a/
arch/arm/pthread_arch.h
+++ b/
arch/arm/pthread_arch.h
@@
-1,30
+1,33
@@
-#if ((__ARM_ARCH_6K__ || __ARM_ARCH_6ZK__) && !__thumb__) \
+#if ((__ARM_ARCH_6K__ || __ARM_ARCH_6
KZ__ || __ARM_ARCH_6
ZK__) && !__thumb__) \
|| __ARM_ARCH_7A__ || __ARM_ARCH_7R__ || __ARM_ARCH >= 7
|| __ARM_ARCH_7A__ || __ARM_ARCH_7R__ || __ARM_ARCH >= 7
-static inline
__attribute__((const))
pthread_t __pthread_self()
+static inline pthread_t __pthread_self()
{
char *p;
{
char *p;
- __asm__( "mrc p15,0,%0,c13,c0,3" : "=r"(p) );
- return (void *)(p
+8
-sizeof(struct pthread));
+ __asm__
( "mrc p15,0,%0,c13,c0,3" : "=r"(p) );
+ return (void *)(p-sizeof(struct pthread));
}
#else
}
#else
-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" );
+#if __ARM_ARCH_4__ || __ARM_ARCH_4T__ || __ARM_ARCH == 4
+#define BLX "mov lr,pc\n\tbx"
#else
#else
- register char *p __asm__("r0");
- __asm__( "bl __a_gettp" : "=r"(p) : : "cc", "lr" );
+#define BLX "blx"
#endif
#endif
- return (void *)(p+8-sizeof(struct pthread));
+
+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
}
#endif
#define TLS_ABOVE_TP
-#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) - 8)
+#define GAP_ABOVE_TP 8
+#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread))
-#define
CANCEL_REG_IP 18
+#define
MC_PC arm_pc