Merge branch 'MDEV-7658-5.5' into MDEV-7658-10.0

7f7cee87 · Alexey Kopytov · e5f1e841 · 70bc0a3e · 7f7cee87 · 7f7cee87
Commit 7f7cee87 authored May 26, 2015 by Alexey Kopytov
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h +1 -1

storage/xtradb/include/os0sync.h storage/xtradb/include/os0sync.h +1 -1

No files found.
--- a/storage/innobase/include/os0sync.h
+++ b/storage/innobase/include/os0sync.h
@@ -452,7 +452,7 @@ Returns the old value of *ptr, atomically sets *ptr to new_val */
 # define os_atomic_test_and_set_ulint(ptr, new_val) \
 	__sync_lock_test_and_set(ptr, new_val)
-#ifdef __powerpc__
+#if defined(__powerpc__) || defined(__aarch64__)
 /*
  os_atomic_test_and_set_byte_release() should imply a release barrier before
  setting, and a full barrier after. But __sync_lock_test_and_set() is only

--- a/storage/xtradb/include/os0sync.h
+++ b/storage/xtradb/include/os0sync.h
@@ -452,7 +452,7 @@ Returns the old value of *ptr, atomically sets *ptr to new_val */
 # define os_atomic_test_and_set_ulint(ptr, new_val) \
 	__sync_lock_test_and_set(ptr, new_val)
-#ifdef __powerpc__
+#if defined(__powerpc__) || defined(__aarch64__)
 /*
  os_atomic_test_and_set_byte_release() should imply a release barrier before
  setting, and a full barrier after. But __sync_lock_test_and_set() is only