passenger 5.3.3 → 5.3.4

data/src/cxx_supportlib/vendor-modified/boost/atomic/detail/platform.hpp

@@ -21,49 +21,48 @@
 #pragma once
 #endif
 
-#if !defined(BOOST_ATOMIC_FORCE_FALLBACK)
-
-// Compiler-based backends
-#if (defined(__ibmxl__) || defined(__IBMCPP__)) && defined(__PPC__)
+#if defined(__GNUC__) && defined(__arm__)
+
+// Newer gcc versions define __ARM_ARCH. Older ones don't, so we have to deduce ARM arch version from a bunch of version-specific macros.
+#if defined(__ARM_ARCH)
+#define BOOST_ATOMIC_DETAIL_ARM_ARCH __ARM_ARCH
+#elif defined(__ARM_ARCH_8A__)
+#define BOOST_ATOMIC_DETAIL_ARM_ARCH 8
+#elif defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) ||\
+    defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) ||\
+    defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_7S__)
+#define BOOST_ATOMIC_DETAIL_ARM_ARCH 7
+#elif defined(__ARM_ARCH_6__)  || defined(__ARM_ARCH_6J__) ||\
+    defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) ||\
+    defined(__ARM_ARCH_6ZK__)
+#define BOOST_ATOMIC_DETAIL_ARM_ARCH 6
+#else
+// We are not interested in older versions - they don't support atomic ops
+#define BOOST_ATOMIC_DETAIL_ARM_ARCH 0
+#endif
 
-// IBM XL C++ Compiler has to be checked before GCC/Clang as it pretends to be one but does not support __atomic* intrinsics.
-// It does support GCC inline assembler though.
-#define BOOST_ATOMIC_DETAIL_PLATFORM gcc_ppc
+#endif // defined(__GNUC__) && defined(__arm__)
 
-#elif ((defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 407)) ||\
-    (defined(BOOST_CLANG) && ((__clang_major__ * 100 + __clang_minor__) >= 302))) &&\
-    (\
-        (__GCC_ATOMIC_BOOL_LOCK_FREE + 0) == 2 ||\
-        (__GCC_ATOMIC_CHAR_LOCK_FREE + 0) == 2 ||\
-        (__GCC_ATOMIC_SHORT_LOCK_FREE + 0) == 2 ||\
-        (__GCC_ATOMIC_INT_LOCK_FREE + 0) == 2 ||\
-        (__GCC_ATOMIC_LONG_LOCK_FREE + 0) == 2 ||\
-        (__GCC_ATOMIC_LLONG_LOCK_FREE + 0) == 2\
-    )
+#if !defined(BOOST_ATOMIC_FORCE_FALLBACK)
 
-#define BOOST_ATOMIC_DETAIL_PLATFORM gcc_atomic
+// Determine the target platform.
+// The target platform describes the compiler and target architecture. It can be used by more generic backends, such as the ones
+// based on compiler intrinsics, to implement specialized operations in a non-generic way.
 
-#elif (defined(__GNUC__) || defined(__SUNPRO_CC)) && (defined(__i386__) || defined(__x86_64__))
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
 
 #define BOOST_ATOMIC_DETAIL_PLATFORM gcc_x86
+#define BOOST_ATOMIC_DETAIL_EXTRA_BACKEND gcc_x86
 
 #elif defined(__GNUC__) && (defined(__POWERPC__) || defined(__PPC__))
 
 #define BOOST_ATOMIC_DETAIL_PLATFORM gcc_ppc
+#define BOOST_ATOMIC_DETAIL_EXTRA_BACKEND gcc_ppc
 
-// This list of ARM architecture versions comes from Apple's arm/arch.h header.
-// I don't know how complete it is.
-#elif defined(__GNUC__) &&\
-    (\
-        defined(__ARM_ARCH_6__)  || defined(__ARM_ARCH_6J__) ||\
-        defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) ||\
-        defined(__ARM_ARCH_6ZK__) ||\
-        defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) ||\
-        defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) ||\
-        defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_7S__)\
-    )
+#elif defined(__GNUC__) && defined(__arm__) && (BOOST_ATOMIC_DETAIL_ARM_ARCH+0) >= 6
 
 #define BOOST_ATOMIC_DETAIL_PLATFORM gcc_arm
+#define BOOST_ATOMIC_DETAIL_EXTRA_BACKEND gcc_arm
 
 #elif (defined(__GNUC__) || defined(__SUNPRO_CC)) && (defined(__sparcv8plus) || defined(__sparc_v9__))
 
@@ -73,6 +72,38 @@
 
 #define BOOST_ATOMIC_DETAIL_PLATFORM gcc_alpha
 
+#elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))
+
+#define BOOST_ATOMIC_DETAIL_PLATFORM msvc_x86
+
+#elif defined(_MSC_VER) && _MSC_VER >= 1700 && (defined(_M_ARM) || defined(_M_ARM64))
+
+#define BOOST_ATOMIC_DETAIL_PLATFORM msvc_arm
+
+#endif
+
+// Compiler-based backends
+
+// IBM XL C++ Compiler has to be checked before GCC/Clang as it pretends to be one but does not support __atomic* intrinsics.
+// It does support GCC inline assembler though.
+#if !(defined(__ibmxl__) || defined(__IBMCPP__)) &&\
+    ((defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 407)) ||\
+        (defined(BOOST_CLANG) && ((__clang_major__ * 100 + __clang_minor__) >= 302))) &&\
+    (\
+        (__GCC_ATOMIC_BOOL_LOCK_FREE + 0) == 2 ||\
+        (__GCC_ATOMIC_CHAR_LOCK_FREE + 0) == 2 ||\
+        (__GCC_ATOMIC_SHORT_LOCK_FREE + 0) == 2 ||\
+        (__GCC_ATOMIC_INT_LOCK_FREE + 0) == 2 ||\
+        (__GCC_ATOMIC_LONG_LOCK_FREE + 0) == 2 ||\
+        (__GCC_ATOMIC_LLONG_LOCK_FREE + 0) == 2\
+    )
+
+#define BOOST_ATOMIC_DETAIL_BACKEND gcc_atomic
+
+#elif defined(BOOST_ATOMIC_DETAIL_PLATFORM)
+
+#define BOOST_ATOMIC_DETAIL_BACKEND BOOST_ATOMIC_DETAIL_PLATFORM
+
 #elif defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 401) &&\
     (\
         defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1) ||\
@@ -82,40 +113,51 @@
         defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_16)\
     )
 
-#define BOOST_ATOMIC_DETAIL_PLATFORM gcc_sync
-
-#elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))
-
-#define BOOST_ATOMIC_DETAIL_PLATFORM msvc_x86
-
-#elif defined(_MSC_VER) && _MSC_VER >= 1700 && (defined(_M_ARM) || defined(_M_ARM64))
-
-#define BOOST_ATOMIC_DETAIL_PLATFORM msvc_arm
+#define BOOST_ATOMIC_DETAIL_BACKEND gcc_sync
 
 #endif
 
 // OS-based backends
-#if !defined(BOOST_ATOMIC_DETAIL_PLATFORM)
+
+#if !defined(BOOST_ATOMIC_DETAIL_BACKEND)
 
 #if defined(__linux__) && defined(__arm__)
 
-#define BOOST_ATOMIC_DETAIL_PLATFORM linux_arm
+#define BOOST_ATOMIC_DETAIL_BACKEND linux_arm
 
 #elif defined(BOOST_WINDOWS) || defined(_WIN32_CE)
 
-#define BOOST_ATOMIC_DETAIL_PLATFORM windows
+#define BOOST_ATOMIC_DETAIL_BACKEND windows
 
 #endif
 
-#endif // !defined(BOOST_ATOMIC_DETAIL_PLATFORM)
+#endif // !defined(BOOST_ATOMIC_DETAIL_BACKEND)
 
 #endif // !defined(BOOST_ATOMIC_FORCE_FALLBACK)
 
-#if !defined(BOOST_ATOMIC_DETAIL_PLATFORM)
-#define BOOST_ATOMIC_DETAIL_PLATFORM emulated
+#if !defined(BOOST_ATOMIC_DETAIL_BACKEND)
+#define BOOST_ATOMIC_DETAIL_BACKEND emulated
 #define BOOST_ATOMIC_EMULATED
 #endif
 
-#define BOOST_ATOMIC_DETAIL_HEADER(prefix) <BOOST_JOIN(prefix, BOOST_ATOMIC_DETAIL_PLATFORM).hpp>
+#if !defined(BOOST_ATOMIC_DETAIL_FP_BACKEND)
+#define BOOST_ATOMIC_DETAIL_FP_BACKEND generic
+#define BOOST_ATOMIC_DETAIL_FP_BACKEND_GENERIC
+#endif
+
+#if !defined(BOOST_ATOMIC_DETAIL_EXTRA_BACKEND)
+#define BOOST_ATOMIC_DETAIL_EXTRA_BACKEND generic
+#define BOOST_ATOMIC_DETAIL_EXTRA_BACKEND_GENERIC
+#endif
+
+#if !defined(BOOST_ATOMIC_DETAIL_EXTRA_FP_BACKEND)
+#define BOOST_ATOMIC_DETAIL_EXTRA_FP_BACKEND generic
+#define BOOST_ATOMIC_DETAIL_EXTRA_FP_BACKEND_GENERIC
+#endif
+
+#define BOOST_ATOMIC_DETAIL_BACKEND_HEADER(prefix) <BOOST_JOIN(prefix, BOOST_ATOMIC_DETAIL_BACKEND).hpp>
+#define BOOST_ATOMIC_DETAIL_FP_BACKEND_HEADER(prefix) <BOOST_JOIN(prefix, BOOST_ATOMIC_DETAIL_FP_BACKEND).hpp>
+#define BOOST_ATOMIC_DETAIL_EXTRA_BACKEND_HEADER(prefix) <BOOST_JOIN(prefix, BOOST_ATOMIC_DETAIL_EXTRA_BACKEND).hpp>
+#define BOOST_ATOMIC_DETAIL_EXTRA_FP_BACKEND_HEADER(prefix) <BOOST_JOIN(prefix, BOOST_ATOMIC_DETAIL_EXTRA_FP_BACKEND).hpp>
 
 #endif // BOOST_ATOMIC_DETAIL_PLATFORM_HPP_INCLUDED_

data/src/cxx_supportlib/vendor-modified/boost/atomic/detail/storage_type.hpp

@@ -19,9 +19,7 @@
 #include <cstddef>
 #include <boost/cstdint.hpp>
 #include <boost/atomic/detail/config.hpp>
-#if !defined(BOOST_ATOMIC_DETAIL_HAS_BUILTIN_MEMCMP) || !defined(BOOST_ATOMIC_DETAIL_HAS_BUILTIN_MEMCPY)
-#include <cstring>
-#endif
+#include <boost/atomic/detail/string_ops.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
@@ -38,7 +36,7 @@ BOOST_FORCEINLINE void non_atomic_load(T const volatile& from, T& to) BOOST_NOEX
 }
 
 template< std::size_t Size >
-struct buffer_storage
+struct BOOST_ATOMIC_DETAIL_MAY_ALIAS buffer_storage
 {
     BOOST_ALIGNMENT(16) unsigned char data[Size];
 
@@ -64,12 +62,12 @@ BOOST_FORCEINLINE void non_atomic_load(buffer_storage< Size > const volatile& fr
     BOOST_ATOMIC_DETAIL_MEMCPY(to.data, const_cast< unsigned char const* >(from.data), Size);
 }
 
-template< std::size_t Size, bool Signed >
+template< std::size_t Size >
 struct make_storage_type
 {
     typedef buffer_storage< Size > type;
 
-    struct aligned
+    struct BOOST_ATOMIC_DETAIL_MAY_ALIAS aligned
     {
         type value;
 
@@ -79,25 +77,11 @@ struct make_storage_type
 };
 
 template< >
-struct make_storage_type< 1u, false >
-{
-    typedef boost::uint8_t type;
-
-    struct aligned
-    {
-        type value;
-
-        BOOST_DEFAULTED_FUNCTION(aligned(), {})
-        BOOST_FORCEINLINE BOOST_CONSTEXPR explicit aligned(type v) BOOST_NOEXCEPT : value(v) {}
-    };
-};
-
-template< >
-struct make_storage_type< 1u, true >
+struct make_storage_type< 1u >
 {
-    typedef boost::int8_t type;
+    typedef boost::uint8_t BOOST_ATOMIC_DETAIL_MAY_ALIAS type;
 
-    struct aligned
+    struct BOOST_ATOMIC_DETAIL_MAY_ALIAS aligned
     {
         type value;
 
@@ -107,11 +91,11 @@ struct make_storage_type< 1u, true >
 };
 
 template< >
-struct make_storage_type< 2u, false >
+struct make_storage_type< 2u >
 {
-    typedef boost::uint16_t type;
+    typedef boost::uint16_t BOOST_ATOMIC_DETAIL_MAY_ALIAS type;
 
-    struct aligned
+    struct BOOST_ATOMIC_DETAIL_MAY_ALIAS aligned
     {
         BOOST_ALIGNMENT(2) type value;
 
@@ -121,25 +105,11 @@ struct make_storage_type< 2u, false >
 };
 
 template< >
-struct make_storage_type< 2u, true >
+struct make_storage_type< 4u >
 {
-    typedef boost::int16_t type;
+    typedef boost::uint32_t BOOST_ATOMIC_DETAIL_MAY_ALIAS type;
 
-    struct aligned
-    {
-        BOOST_ALIGNMENT(2) type value;
-
-        BOOST_DEFAULTED_FUNCTION(aligned(), {})
-        BOOST_FORCEINLINE BOOST_CONSTEXPR explicit aligned(type v) BOOST_NOEXCEPT : value(v) {}
-    };
-};
-
-template< >
-struct make_storage_type< 4u, false >
-{
-    typedef boost::uint32_t type;
-
-    struct aligned
+    struct BOOST_ATOMIC_DETAIL_MAY_ALIAS aligned
     {
         BOOST_ALIGNMENT(4) type value;
 
@@ -149,39 +119,11 @@ struct make_storage_type< 4u, false >
 };
 
 template< >
-struct make_storage_type< 4u, true >
+struct make_storage_type< 8u >
 {
-    typedef boost::int32_t type;
+    typedef boost::uint64_t BOOST_ATOMIC_DETAIL_MAY_ALIAS type;
 
-    struct aligned
-    {
-        BOOST_ALIGNMENT(4) type value;
-
-        BOOST_DEFAULTED_FUNCTION(aligned(), {})
-        BOOST_FORCEINLINE BOOST_CONSTEXPR explicit aligned(type v) BOOST_NOEXCEPT : value(v) {}
-    };
-};
-
-template< >
-struct make_storage_type< 8u, false >
-{
-    typedef boost::uint64_t type;
-
-    struct aligned
-    {
-        BOOST_ALIGNMENT(8) type value;
-
-        BOOST_DEFAULTED_FUNCTION(aligned(), {})
-        BOOST_FORCEINLINE BOOST_CONSTEXPR explicit aligned(type v) BOOST_NOEXCEPT : value(v) {}
-    };
-};
-
-template< >
-struct make_storage_type< 8u, true >
-{
-    typedef boost::int64_t type;
-
-    struct aligned
+    struct BOOST_ATOMIC_DETAIL_MAY_ALIAS aligned
     {
         BOOST_ALIGNMENT(8) type value;
 
@@ -193,25 +135,11 @@ struct make_storage_type< 8u, true >
 #if defined(BOOST_HAS_INT128)
 
 template< >
-struct make_storage_type< 16u, false >
+struct make_storage_type< 16u >
 {
-    typedef boost::uint128_type type;
+    typedef boost::uint128_type BOOST_ATOMIC_DETAIL_MAY_ALIAS type;
 
-    struct aligned
-    {
-        BOOST_ALIGNMENT(16) type value;
-
-        BOOST_DEFAULTED_FUNCTION(aligned(), {})
-        BOOST_FORCEINLINE BOOST_CONSTEXPR explicit aligned(type v) BOOST_NOEXCEPT : value(v) {}
-    };
-};
-
-template< >
-struct make_storage_type< 16u, true >
-{
-    typedef boost::int128_type type;
-
-    struct aligned
+    struct BOOST_ATOMIC_DETAIL_MAY_ALIAS aligned
     {
         BOOST_ALIGNMENT(16) type value;
 
@@ -222,19 +150,21 @@ struct make_storage_type< 16u, true >
 
 #elif !defined(BOOST_NO_ALIGNMENT)
 
-struct storage128_t
+struct BOOST_ATOMIC_DETAIL_MAY_ALIAS storage128_t
 {
-    boost::uint64_t data[2];
+    typedef boost::uint64_t BOOST_ATOMIC_DETAIL_MAY_ALIAS element_type;
+
+    element_type data[2];
 
     BOOST_FORCEINLINE bool operator! () const BOOST_NOEXCEPT
     {
-        return data[0] == 0 && data[1] == 0;
+        return (data[0] | data[1]) == 0u;
     }
 };
 
 BOOST_FORCEINLINE bool operator== (storage128_t const& left, storage128_t const& right) BOOST_NOEXCEPT
 {
-    return left.data[0] == right.data[0] && left.data[1] == right.data[1];
+    return ((left.data[0] ^ right.data[0]) | (left.data[1] ^ right.data[1])) == 0u;
 }
 BOOST_FORCEINLINE bool operator!= (storage128_t const& left, storage128_t const& right) BOOST_NOEXCEPT
 {
@@ -247,12 +177,12 @@ BOOST_FORCEINLINE void non_atomic_load(storage128_t const volatile& from, storag
     to.data[1] = from.data[1];
 }
 
-template< bool Signed >
-struct make_storage_type< 16u, Signed >
+template< >
+struct make_storage_type< 16u >
 {
     typedef storage128_t type;
 
-    struct aligned
+    struct BOOST_ATOMIC_DETAIL_MAY_ALIAS aligned
     {
         BOOST_ALIGNMENT(16) type value;
 
@@ -266,11 +196,8 @@ struct make_storage_type< 16u, Signed >
 template< typename T >
 struct storage_size_of
 {
-    enum _
-    {
-        size = sizeof(T),
-        value = (size == 3 ? 4 : (size >= 5 && size <= 7 ? 8 : (size >= 9 && size <= 15 ? 16 : size)))
-    };
+    static BOOST_CONSTEXPR_OR_CONST std::size_t size = sizeof(T);
+    static BOOST_CONSTEXPR_OR_CONST std::size_t value = (size == 3u ? 4u : (size >= 5u && size <= 7u ? 8u : (size >= 9u && size <= 15u ? 16u : size)));
 };
 
 } // namespace detail

data/src/cxx_supportlib/vendor-modified/boost/atomic/detail/string_ops.hpp

@@ -0,0 +1,61 @@
+/*
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt)
+ *
+ * Copyright (c) 2018 Andrey Semashev
+ */
+/*!
+ * \file   atomic/detail/string_ops.hpp
+ *
+ * This header defines string operations for Boost.Atomic
+ */
+
+#ifndef BOOST_ATOMIC_DETAIL_STRING_OPS_HPP_INCLUDED_
+#define BOOST_ATOMIC_DETAIL_STRING_OPS_HPP_INCLUDED_
+
+#include <boost/atomic/detail/config.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif
+
+#if defined(__has_builtin)
+#if __has_builtin(__builtin_memcpy)
+#define BOOST_ATOMIC_DETAIL_HAS_BUILTIN_MEMCPY
+#endif
+#if __has_builtin(__builtin_memcmp)
+#define BOOST_ATOMIC_DETAIL_HAS_BUILTIN_MEMCMP
+#endif
+#if __has_builtin(__builtin_memset)
+#define BOOST_ATOMIC_DETAIL_HAS_BUILTIN_MEMSET
+#endif
+#elif defined(BOOST_GCC)
+#define BOOST_ATOMIC_DETAIL_HAS_BUILTIN_MEMCPY
+#define BOOST_ATOMIC_DETAIL_HAS_BUILTIN_MEMCMP
+#define BOOST_ATOMIC_DETAIL_HAS_BUILTIN_MEMSET
+#endif
+
+#if defined(BOOST_ATOMIC_DETAIL_HAS_BUILTIN_MEMCPY)
+#define BOOST_ATOMIC_DETAIL_MEMCPY __builtin_memcpy
+#else
+#define BOOST_ATOMIC_DETAIL_MEMCPY std::memcpy
+#endif
+
+#if defined(BOOST_ATOMIC_DETAIL_HAS_BUILTIN_MEMCMP)
+#define BOOST_ATOMIC_DETAIL_MEMCMP __builtin_memcmp
+#else
+#define BOOST_ATOMIC_DETAIL_MEMCMP std::memcmp
+#endif
+
+#if defined(BOOST_ATOMIC_DETAIL_HAS_BUILTIN_MEMSET)
+#define BOOST_ATOMIC_DETAIL_MEMSET __builtin_memset
+#else
+#define BOOST_ATOMIC_DETAIL_MEMSET std::memset
+#endif
+
+#if !defined(BOOST_ATOMIC_DETAIL_HAS_BUILTIN_MEMCPY) || !defined(BOOST_ATOMIC_DETAIL_HAS_BUILTIN_MEMCMP) || !defined(BOOST_ATOMIC_DETAIL_HAS_BUILTIN_MEMSET)
+#include <cstring>
+#endif
+
+#endif // BOOST_ATOMIC_DETAIL_STRING_OPS_HPP_INCLUDED_