summaryrefslogtreecommitdiff
path: root/include/my_atomic.h
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2016-11-02 15:16:36 +0400
committerSergey Vojtovich <svoj@mariadb.org>2016-12-13 16:38:20 +0400
commit1369e70b561a53dd77da3c0b87217cf2d6c8328d (patch)
treef007c52bdc0738cb4ee0a696c03351e0594c794c /include/my_atomic.h
parentbeea3413e0b3f8f6e883b6cc83af8d7148b8cdb1 (diff)
downloadmariadb-git-1369e70b561a53dd77da3c0b87217cf2d6c8328d.tar.gz
MDEV-11212 - Clean-up MariaDB atomic operations
Removed "somewhat broken native x86 implementation". Should never be used on supported platforms.
Diffstat (limited to 'include/my_atomic.h')
-rw-r--r--include/my_atomic.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/include/my_atomic.h b/include/my_atomic.h
index 8f13a0ab89b..65d98f52863 100644
--- a/include/my_atomic.h
+++ b/include/my_atomic.h
@@ -117,10 +117,7 @@
On Windows using Visual C++ the native implementation should be
preferrable. When using gcc we prefer the Solaris implementation
before the gcc because of stability preference, we choose gcc
- builtins if available, otherwise we choose the somewhat broken
- native x86 implementation. If neither Visual C++ or gcc we still
- choose the Solaris implementation on Solaris (mainly for SunStudio
- compilers).
+ builtins if available.
*/
#if defined(_MSC_VER)
#include "atomic/generic-msvc.h"
@@ -128,8 +125,6 @@
#include "atomic/solaris.h"
#elif defined(HAVE_GCC_ATOMIC_BUILTINS)
#include "atomic/gcc_builtins.h"
-#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
-#include "atomic/x86-gcc.h"
#endif