From a1beac12ef96a6ccc62ec11ebea6789c9bf42381 Mon Sep 17 00:00:00 2001 From: akamat-ibm Date: Tue, 15 Mar 2016 17:07:44 +0530 Subject: [PATCH 1/2] Update os0atomic.h Adding __s390__ flag to support Z architecture. --- storage/innobase/include/os0atomic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/innobase/include/os0atomic.h b/storage/innobase/include/os0atomic.h index 1368176..ee09a8e 100644 --- a/storage/innobase/include/os0atomic.h +++ b/storage/innobase/include/os0atomic.h @@ -50,7 +50,7 @@ typedef ulint lock_word_t; #endif /* _WIN32 */ #if defined __i386__ || defined __x86_64__ || defined _M_IX86 - || defined _M_X64 || defined __WIN__ + || defined _M_X64 || defined __WIN__ || defined __s390__ #define IB_STRONG_MEMORY_MODEL From da24eab229d9968e6d33be65031da27b9600ea95 Mon Sep 17 00:00:00 2001 From: akamat-ibm Date: Tue, 22 Mar 2016 09:37:33 +0530 Subject: [PATCH 2/2] Update os0atomic.h Updated the comments with the defined flag --- storage/innobase/include/os0atomic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/innobase/include/os0atomic.h b/storage/innobase/include/os0atomic.h index ee09a8e..93aeda5 100644 --- a/storage/innobase/include/os0atomic.h +++ b/storage/innobase/include/os0atomic.h @@ -54,7 +54,7 @@ typedef ulint lock_word_t; #define IB_STRONG_MEMORY_MODEL -#endif /* __i386__ || __x86_64__ || _M_IX86 || _M_X64 || __WIN__ */ +#endif /* __i386__ || __x86_64__ || _M_IX86 || _M_X64 || __WIN__ || __s390__ */ /**********************************************************//** Atomic compare-and-swap and increment for InnoDB. */