diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2015-12-27 15:40:34 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2015-12-29 14:24:46 +0400 |
| commit | 93b078cc85f4ff11a0dca661d0089b1200d94981 (patch) | |
| tree | cc7d9db5d68239bdae480c231d24a5f752e61d69 /storage/xtradb/include/os0sync.h | |
| parent | 4fdf25afa8188905653a83e08fc387243e584600 (diff) | |
| download | mariadb-git-93b078cc85f4ff11a0dca661d0089b1200d94981.tar.gz | |
MDEV-9128 - Compiling on IBM System Z fails
Provided IBM System Z have outdated compiler version, which supports gcc sync
builtins but not gcc atomic builtins. It also has weak memory model.
InnoDB attempted to verify if __sync_lock_test_and_set() is available by
checking IB_STRONG_MEMORY_MODEL. This macro has nothing to do with availability
of __sync_lock_test_and_set(), the right one is HAVE_ATOMIC_BUILTINS.
Diffstat (limited to 'storage/xtradb/include/os0sync.h')
| -rw-r--r-- | storage/xtradb/include/os0sync.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/xtradb/include/os0sync.h b/storage/xtradb/include/os0sync.h index 56c094547b1..db996b096bb 100644 --- a/storage/xtradb/include/os0sync.h +++ b/storage/xtradb/include/os0sync.h @@ -488,7 +488,7 @@ os_atomic_clear(volatile lock_word_t* ptr) __atomic_clear(ptr, __ATOMIC_RELEASE); } -# elif defined(IB_STRONG_MEMORY_MODEL) +# elif defined(HAVE_ATOMIC_BUILTINS) /** Do an atomic test and set. @param[in,out] ptr Memory location to set to non-zero |