diff options
author | Sergey Vojtovich <svoj@mariadb.org> | 2015-12-27 15:40:34 +0400 |
---|---|---|
committer | Sergey Vojtovich <svoj@mariadb.org> | 2015-12-27 15:40:34 +0400 |
commit | 30b2447f7d930b4f1a16f56f5213b2f54de9cf8c (patch) | |
tree | 2b7e378aa4d8ef0b99abda6afe5e5efe978b653d | |
parent | 0f10a5c97ab79daa7350b227981924c1313c3c2a (diff) | |
download | mariadb-git-30b2447f7d930b4f1a16f56f5213b2f54de9cf8c.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.
-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 |