summaryrefslogtreecommitdiff
path: root/arch/aarch64
diff options
context:
space:
mode:
authorSzabolcs Nagy <nsz@port70.net>2016-01-31 16:33:44 +0100
committerRich Felker <dalias@aerifal.cx>2016-01-31 17:32:56 -0500
commit3b27725385614d44add9351191765181edc3f4c1 (patch)
tree3d50e53cf7b6aaac115186b1f1cdc859d1b2db92 /arch/aarch64
parent65498f289bded83afb809b24d850647e7c91cd58 (diff)
downloadmusl-3b27725385614d44add9351191765181edc3f4c1.tar.gz
musl-3b27725385614d44add9351191765181edc3f4c1.tar.bz2
musl-3b27725385614d44add9351191765181edc3f4c1.tar.xz
musl-3b27725385614d44add9351191765181edc3f4c1.zip
better a_sc inline asm constraint on aarch64 and arm
"Q" input constraint was used for the written object, instead of "=Q" output constraint. this should not cause problems because "memory" is on the clobber list, but "=Q" better documents the intent and more consistent with the actual asm code. this changes the generated code, because different registers are used, but other than the register names nothing should change.
Diffstat (limited to 'arch/aarch64')
-rw-r--r--arch/aarch64/atomic_arch.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/aarch64/atomic_arch.h b/arch/aarch64/atomic_arch.h
index 6b4f1a4d..af93d879 100644
--- a/arch/aarch64/atomic_arch.h
+++ b/arch/aarch64/atomic_arch.h
@@ -10,7 +10,7 @@ static inline int a_ll(volatile int *p)
static inline int a_sc(volatile int *p, int v)
{
int r;
- __asm__ __volatile__ ("stlxr %w0,%w1,%2" : "=&r"(r) : "r"(v), "Q"(*p) : "memory");
+ __asm__ __volatile__ ("stlxr %w0,%w2,%1" : "=&r"(r), "=Q"(*p) : "r"(v) : "memory");
return !r;
}
@@ -44,7 +44,7 @@ static inline void *a_ll_p(volatile void *p)
static inline int a_sc_p(volatile int *p, void *v)
{
int r;
- __asm__ __volatile__ ("stlxr %w0,%1,%2" : "=&r"(r) : "r"(v), "Q"(*(void *volatile *)p) : "memory");
+ __asm__ __volatile__ ("stlxr %w0,%2,%1" : "=&r"(r), "=Q"(*(void *volatile *)p) : "r"(v) : "memory");
return !r;
}