commit b5e211031b69963a5f72ff369c66dc325a03e740
author Elliott Hughes <enh@google.com> Tue Jan 14 01:01:40 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 14 01:01:41 2014 +0000
tree 4459ac3233abccfcdce9f2dc2591aeabadc16ede
parent ebc1c76d77dd604f16126e66b2171e8ee6fa1d22
parent bf3ec9ad52a5ccaccdae843a94f964f3a7624ecd

Merge "AArch64: Use LDXR/STXR instead of LDAXR/STLXR for bionic_atomic_cmpxchg()"

libc/private/bionic_atomic_aarch64.h

diff --git a/libc/private/bionic_atomic_aarch64.h b/libc/private/bionic_atomic_aarch64.h
index 568382e..c3a34e1 100644
--- a/libc/private/bionic_atomic_aarch64.h
+++ b/libc/private/bionic_atomic_aarch64.h
@@ -29,15 +29,15 @@
   int32_t tmp, oldval;
   __asm__ __volatile__ (
       "// atomic_cmpxchg\n"
-      "1:  ldaxr %w1, [%3]\n"
+      "1:  ldxr %w1, [%3]\n"
       "    cmp %w1, %w4\n"
       "    b.ne 2f\n"
-      "    stlxr %w0, %w5, [%3]\n"
+      "    stxr %w0, %w5, [%3]\n"
       "    cbnz  %w0, 1b\n"
       "2:"
       : "=&r" (tmp), "=&r" (oldval), "+o"(*ptr)
       : "r" (ptr), "Ir" (old_value), "r" (new_value)
-      : "cc");
+      : "cc", "memory");
   return oldval != old_value;
 }
 
@@ -51,7 +51,7 @@
       "    cbnz %w1, 1b\n"
       : "=&r" (prev), "=&r" (status), "+o" (*ptr)
       : "r" (ptr), "r" (new_value)
-      : "cc");
+      : "cc", "memory");
   return prev;
 }
 
@@ -65,7 +65,7 @@
       "    cbnz %w2, 1b"
       : "=&r" (prev), "=&r" (tmp), "=&r" (status), "+m"(*ptr)
       : "r" (ptr)
-      : "cc");
+      : "cc", "memory");
   return prev;
 }