Merge pull request #73 from akopytov/MDEV-7658-5.5

Fixes MDEV-7658: MDEV-7026 fix reintroduces MDEV-6615 on AArch64
MariaDB · May 27, 2015 · 6bd76f8 · 6bd76f8
2 parents 5d02928 + 70bc0a3
commit 6bd76f8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/storage/innobase/include/os0sync.h b/storage/innobase/include/os0sync.h
@@ -324,7 +324,7 @@ amount of increment. */
 /**********************************************************//**
 Returns the old value of *ptr, atomically sets *ptr to 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

diff --git a/storage/xtradb/include/os0sync.h b/storage/xtradb/include/os0sync.h
@@ -331,7 +331,7 @@ amount of increment. */
 /**********************************************************//**
 Returns the old value of *ptr, atomically sets *ptr to 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