Merge branch 'develop' of https://github.com/boostorg/config into develop

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

include/boost/config/compiler/xlcpp_zos.hpp

@@ -156,7 +156,7 @@
 #if defined(__IBM_ATTRIBUTES)
 #  define BOOST_FORCEINLINE inline __attribute__ ((__always_inline__))
 #  define BOOST_NOINLINE __attribute__ ((__noinline__))
-#  define BOOST_ALIGNMENT(x) __attribute__ ((__aligned__(x)))
+// No BOOST_ALIGNMENT - explicit alignment support is broken (V2R1).
 #endif
 
 extern "builtin" long __builtin_expect(long, long);

include/boost/detail/workaround.hpp

@@ -90,6 +90,11 @@
 #else
 #define BOOST_GCC_WORKAROUND_GUARD 0
 #endif
+#ifndef BOOST_XLCPP_ZOS
+#define BOOST_XLCPP_ZOS_WORKAROUND_GUARD 1
+#else
+#define BOOST_XLCPP_ZOS_WORKAROUND_GUARD 0
+#endif
 #ifndef __IBMCPP__
 #define __IBMCPP___WORKAROUND_GUARD 1
 #else