summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2015-11-18 15:51:20 +0400
committerSergey Vojtovich <svoj@mariadb.org>2015-12-29 14:24:53 +0400
commitf31a89191f6b1679d9f8b584aa95fe006182ee7d (patch)
treef21438be7740521c3c579ebe270b323b5e15876b
parent93b078cc85f4ff11a0dca661d0089b1200d94981 (diff)
downloadmariadb-git-f31a89191f6b1679d9f8b584aa95fe006182ee7d.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/innobase/include/os0sync.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/include/os0sync.h b/storage/innobase/include/os0sync.h
index 8e4b4f41aae..e192a3a6c94 100644
--- a/storage/innobase/include/os0sync.h
+++ b/storage/innobase/include/os0sync.h
@@ -487,7 +487,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