diff --git a/include/boost/atomic/detail/config.hpp b/include/boost/atomic/detail/config.hpp
index 054d9b0..07084fe 100644
--- a/include/boost/atomic/detail/config.hpp
+++ b/include/boost/atomic/detail/config.hpp
@@ -85,18 +85,9 @@
 // and does not require an explicit markup for types that may alias, we still don't
 // enable the optimization for this compiler because at least MSVC-8 and 9 are known
 // to generate broken code sometimes when casts are used.
-#if defined(__GNUC__) && (!defined(BOOST_INTEL_CXX_VERSION) || (BOOST_INTEL_CXX_VERSION+0) >= 1300)
-#define BOOST_ATOMIC_DETAIL_MAY_ALIAS __attribute__((__may_alias__))
+#define BOOST_ATOMIC_DETAIL_MAY_ALIAS BOOST_MAY_ALIAS
+#if !defined(BOOST_NO_MAY_ALIAS)
 #define BOOST_ATOMIC_DETAIL_STORAGE_TYPE_MAY_ALIAS
-#elif defined(__has_attribute)
-#if __has_attribute(__may_alias__)
-#define BOOST_ATOMIC_DETAIL_MAY_ALIAS __attribute__((__may_alias__))
-#define BOOST_ATOMIC_DETAIL_STORAGE_TYPE_MAY_ALIAS
-#endif
-#endif
-
-#if !defined(BOOST_ATOMIC_DETAIL_MAY_ALIAS)
-#define BOOST_ATOMIC_DETAIL_MAY_ALIAS
 #endif
 
 #if defined(__GCC_ASM_FLAG_OUTPUTS__)