diff options
| author | Jan Lindström <jan.lindstrom@skysql.com> | 2015-05-27 09:16:24 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@skysql.com> | 2015-05-27 09:16:24 +0300 |
| commit | a99efc00a68fe2406343e63b67fc4ea58bed345a (patch) | |
| tree | b320c32a20f54738f2c69cc29a7dbb8bdb6a26e3 | |
| parent | f7385980d3bfb85c77b5a699260e379cb3afd623 (diff) | |
| parent | 7f7cee870014b958fe3383cbb3cc0ac8a9e1ddab (diff) | |
| download | mariadb-git-a99efc00a68fe2406343e63b67fc4ea58bed345a.tar.gz | |
Merge pull request #74 from akopytov/MDEV-7658-10.0
Mdev 7658 10.0
| -rw-r--r-- | storage/innobase/include/os0sync.h | 2 | ||||
| -rw-r--r-- | storage/xtradb/include/os0sync.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/include/os0sync.h b/storage/innobase/include/os0sync.h index b16a99b51c0..feb64fb1e41 100644 --- 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 diff --git a/storage/xtradb/include/os0sync.h b/storage/xtradb/include/os0sync.h index bd37287f1a0..3a7707ee130 100644 --- 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 |