MDEV-9128 - Compiling on IBM System Z fails

svoj · svoj · commit 30b2447f7d93 · 2015-12-27T15:40:34.000+04:00
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.
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -488,7 +488,7 @@ os_atomic_clear(volatile lock_word_t* ptr)`
`488`	`488`	`__atomic_clear(ptr, __ATOMIC_RELEASE);`
`489`	`489`	`}`
`490`	`490`
`491`		`-# elif defined(IB_STRONG_MEMORY_MODEL)`
	`491`	`+# elif defined(HAVE_ATOMIC_BUILTINS)`
`492`	`492`
`493`	`493`	`/** Do an atomic test and set.`
`494`	`494`	`@param[in,out] ptr Memory location to set to non-zero`