From 86d6607582473be7b45666f5be375bb42d279e41 Mon Sep 17 00:00:00 2001
From: jzmaddock <john@johnmaddock.co.uk>
Date: Mon, 13 Mar 2017 18:07:03 +0000
Subject: [PATCH] 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 | 2 +-
 include/boost/detail/workaround.hpp         | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/boost/config/compiler/xlcpp_zos.hpp b/include/boost/config/compiler/xlcpp_zos.hpp
index 016a3dbe..7f6d2ad0 100644
--- a/include/boost/config/compiler/xlcpp_zos.hpp
+++ b/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);
diff --git a/include/boost/detail/workaround.hpp b/include/boost/detail/workaround.hpp
index 7727aaf1..1aaa5aed 100644
--- a/include/boost/detail/workaround.hpp
+++ b/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