X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=arch%2Farm%2Fpthread_arch.h;h=8b8a7fb645cb7650a2e10b2cd362cd74aa5142bc;hb=fe39aaae0eafdab3340ea9a4c4b275c3528b4d75;hp=5cbb209e7c1060fa004f7364db78cd4efc4dc932;hpb=0ba35d69c0e77b225ec640d2bd112ff6d9d3b2af;p=musl diff --git a/arch/arm/pthread_arch.h b/arch/arm/pthread_arch.h index 5cbb209e..8b8a7fb6 100644 --- a/arch/arm/pthread_arch.h +++ b/arch/arm/pthread_arch.h @@ -4,7 +4,7 @@ static inline pthread_t __pthread_self() { char *p; - __asm__( "mrc p15,0,%0,c13,c0,3" : "=r"(p) ); + __asm__ __volatile__ ( "mrc p15,0,%0,c13,c0,3" : "=r"(p) ); return (void *)(p+8-sizeof(struct pthread)); } @@ -14,10 +14,10 @@ static inline pthread_t __pthread_self() { #ifdef __clang__ char *p; - __asm__( "bl __a_gettp\n\tmov %0,r0" : "=r"(p) : : "cc", "r0", "lr" ); + __asm__ __volatile__ ( "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" ); + __asm__ __volatile__ ( "bl __a_gettp" : "=r"(p) : : "cc", "lr" ); #endif return (void *)(p+8-sizeof(struct pthread)); } @@ -27,4 +27,4 @@ static inline pthread_t __pthread_self() #define TLS_ABOVE_TP #define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) - 8) -#define CANCEL_REG_IP 18 +#define MC_PC arm_pc