passenger 6.0.8 → 6.0.9

data/src/cxx_supportlib/vendor-modified/boost/asio/windows/random_access_handle.hpp

@@ -2,7 +2,7 @@
 // windows/random_access_handle.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2020 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // 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)

data/src/cxx_supportlib/vendor-modified/boost/asio/windows/stream_handle.hpp

@@ -2,7 +2,7 @@
 // windows/stream_handle.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2020 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // 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)

data/src/cxx_supportlib/vendor-modified/boost/asio/write.hpp

@@ -2,7 +2,7 @@
 // write.hpp
 // ~~~~~~~~~
 //
-// Copyright (c) 2003-2020 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // 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)
@@ -76,9 +76,9 @@ namespace asio {
  */
 template <typename SyncWriteStream, typename ConstBufferSequence>
 std::size_t write(SyncWriteStream& s, const ConstBufferSequence& buffers,
-    typename enable_if<
+    typename constraint<
       is_const_buffer_sequence<ConstBufferSequence>::value
-    >::type* = 0);
+    >::type = 0);
 
 /// Write all of the supplied data to a stream before returning.
 /**
@@ -119,9 +119,9 @@ std::size_t write(SyncWriteStream& s, const ConstBufferSequence& buffers,
 template <typename SyncWriteStream, typename ConstBufferSequence>
 std::size_t write(SyncWriteStream& s, const ConstBufferSequence& buffers,
     boost::system::error_code& ec,
-    typename enable_if<
+    typename constraint<
       is_const_buffer_sequence<ConstBufferSequence>::value
-    >::type* = 0);
+    >::type = 0);
 
 /// Write a certain amount of data to a stream before returning.
 /**
@@ -173,9 +173,9 @@ template <typename SyncWriteStream, typename ConstBufferSequence,
     typename CompletionCondition>
 std::size_t write(SyncWriteStream& s, const ConstBufferSequence& buffers,
     CompletionCondition completion_condition,
-    typename enable_if<
+    typename constraint<
       is_const_buffer_sequence<ConstBufferSequence>::value
-    >::type* = 0);
+    >::type = 0);
 
 /// Write a certain amount of data to a stream before returning.
 /**
@@ -220,9 +220,9 @@ template <typename SyncWriteStream, typename ConstBufferSequence,
     typename CompletionCondition>
 std::size_t write(SyncWriteStream& s, const ConstBufferSequence& buffers,
     CompletionCondition completion_condition, boost::system::error_code& ec,
-    typename enable_if<
+    typename constraint<
       is_const_buffer_sequence<ConstBufferSequence>::value
-    >::type* = 0);
+    >::type = 0);
 
 #if !defined(BOOST_ASIO_NO_DYNAMIC_BUFFER_V1)
 
@@ -256,10 +256,12 @@ std::size_t write(SyncWriteStream& s, const ConstBufferSequence& buffers,
 template <typename SyncWriteStream, typename DynamicBuffer_v1>
 std::size_t write(SyncWriteStream& s,
     BOOST_ASIO_MOVE_ARG(DynamicBuffer_v1) buffers,
-    typename enable_if<
+    typename constraint<
       is_dynamic_buffer_v1<typename decay<DynamicBuffer_v1>::type>::value
-        && !is_dynamic_buffer_v2<typename decay<DynamicBuffer_v1>::type>::value
-    >::type* = 0);
+    >::type = 0,
+    typename constraint<
+      !is_dynamic_buffer_v2<typename decay<DynamicBuffer_v1>::type>::value
+    >::type = 0);
 
 /// Write all of the supplied data to a stream before returning.
 /**
@@ -292,10 +294,12 @@ template <typename SyncWriteStream, typename DynamicBuffer_v1>
 std::size_t write(SyncWriteStream& s,
     BOOST_ASIO_MOVE_ARG(DynamicBuffer_v1) buffers,
     boost::system::error_code& ec,
-    typename enable_if<
+    typename constraint<
       is_dynamic_buffer_v1<typename decay<DynamicBuffer_v1>::type>::value
-        && !is_dynamic_buffer_v2<typename decay<DynamicBuffer_v1>::type>::value
-    >::type* = 0);
+    >::type = 0,
+    typename constraint<
+      !is_dynamic_buffer_v2<typename decay<DynamicBuffer_v1>::type>::value
+    >::type = 0);
 
 /// Write a certain amount of data to a stream before returning.
 /**
@@ -338,10 +342,12 @@ template <typename SyncWriteStream, typename DynamicBuffer_v1,
 std::size_t write(SyncWriteStream& s,
     BOOST_ASIO_MOVE_ARG(DynamicBuffer_v1) buffers,
     CompletionCondition completion_condition,
-    typename enable_if<
+    typename constraint<
       is_dynamic_buffer_v1<typename decay<DynamicBuffer_v1>::type>::value
-        && !is_dynamic_buffer_v2<typename decay<DynamicBuffer_v1>::type>::value
-    >::type* = 0);
+    >::type = 0,
+    typename constraint<
+      !is_dynamic_buffer_v2<typename decay<DynamicBuffer_v1>::type>::value
+    >::type = 0);
 
 /// Write a certain amount of data to a stream before returning.
 /**
@@ -385,10 +391,12 @@ template <typename SyncWriteStream, typename DynamicBuffer_v1,
 std::size_t write(SyncWriteStream& s,
     BOOST_ASIO_MOVE_ARG(DynamicBuffer_v1) buffers,
     CompletionCondition completion_condition, boost::system::error_code& ec,
-    typename enable_if<
+    typename constraint<
       is_dynamic_buffer_v1<typename decay<DynamicBuffer_v1>::type>::value
-        && !is_dynamic_buffer_v2<typename decay<DynamicBuffer_v1>::type>::value
-    >::type* = 0);
+    >::type = 0,
+    typename constraint<
+      !is_dynamic_buffer_v2<typename decay<DynamicBuffer_v1>::type>::value
+    >::type = 0);
 
 #if !defined(BOOST_ASIO_NO_EXTENSIONS)
 #if !defined(BOOST_ASIO_NO_IOSTREAM)
@@ -566,9 +574,9 @@ std::size_t write(SyncWriteStream& s, basic_streambuf<Allocator>& b,
  */
 template <typename SyncWriteStream, typename DynamicBuffer_v2>
 std::size_t write(SyncWriteStream& s, DynamicBuffer_v2 buffers,
-    typename enable_if<
+    typename constraint<
       is_dynamic_buffer_v2<DynamicBuffer_v2>::value
-    >::type* = 0);
+    >::type = 0);
 
 /// Write all of the supplied data to a stream before returning.
 /**
@@ -600,9 +608,9 @@ std::size_t write(SyncWriteStream& s, DynamicBuffer_v2 buffers,
 template <typename SyncWriteStream, typename DynamicBuffer_v2>
 std::size_t write(SyncWriteStream& s, DynamicBuffer_v2 buffers,
     boost::system::error_code& ec,
-    typename enable_if<
+    typename constraint<
       is_dynamic_buffer_v2<DynamicBuffer_v2>::value
-    >::type* = 0);
+    >::type = 0);
 
 /// Write a certain amount of data to a stream before returning.
 /**
@@ -644,9 +652,9 @@ template <typename SyncWriteStream, typename DynamicBuffer_v2,
     typename CompletionCondition>
 std::size_t write(SyncWriteStream& s, DynamicBuffer_v2 buffers,
     CompletionCondition completion_condition,
-    typename enable_if<
+    typename constraint<
       is_dynamic_buffer_v2<DynamicBuffer_v2>::value
-    >::type* = 0);
+    >::type = 0);
 
 /// Write a certain amount of data to a stream before returning.
 /**
@@ -689,9 +697,9 @@ template <typename SyncWriteStream, typename DynamicBuffer_v2,
     typename CompletionCondition>
 std::size_t write(SyncWriteStream& s, DynamicBuffer_v2 buffers,
     CompletionCondition completion_condition, boost::system::error_code& ec,
-    typename enable_if<
+    typename constraint<
       is_dynamic_buffer_v2<DynamicBuffer_v2>::value
-    >::type* = 0);
+    >::type = 0);
 
 /*@}*/
 /**
@@ -765,9 +773,9 @@ async_write(AsyncWriteStream& s, const ConstBufferSequence& buffers,
     BOOST_ASIO_MOVE_ARG(WriteHandler) handler
       BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(
         typename AsyncWriteStream::executor_type),
-    typename enable_if<
+    typename constraint<
       is_const_buffer_sequence<ConstBufferSequence>::value
-    >::type* = 0);
+    >::type = 0);
 
 /// Start an asynchronous operation to write a certain amount of data to a
 /// stream.
@@ -845,9 +853,9 @@ BOOST_ASIO_INITFN_AUTO_RESULT_TYPE(WriteHandler,
 async_write(AsyncWriteStream& s, const ConstBufferSequence& buffers,
     CompletionCondition completion_condition,
     BOOST_ASIO_MOVE_ARG(WriteHandler) handler,
-    typename enable_if<
+    typename constraint<
       is_const_buffer_sequence<ConstBufferSequence>::value
-    >::type* = 0);
+    >::type = 0);
 
 #if !defined(BOOST_ASIO_NO_DYNAMIC_BUFFER_V1)
 
@@ -906,10 +914,12 @@ async_write(AsyncWriteStream& s,
     BOOST_ASIO_MOVE_ARG(WriteHandler) handler
       BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(
         typename AsyncWriteStream::executor_type),
-    typename enable_if<
+    typename constraint<
       is_dynamic_buffer_v1<typename decay<DynamicBuffer_v1>::type>::value
-        && !is_dynamic_buffer_v2<typename decay<DynamicBuffer_v1>::type>::value
-    >::type* = 0);
+    >::type = 0,
+    typename constraint<
+      !is_dynamic_buffer_v2<typename decay<DynamicBuffer_v1>::type>::value
+    >::type = 0);
 
 /// Start an asynchronous operation to write a certain amount of data to a
 /// stream.
@@ -978,10 +988,12 @@ async_write(AsyncWriteStream& s,
     BOOST_ASIO_MOVE_ARG(DynamicBuffer_v1) buffers,
     CompletionCondition completion_condition,
     BOOST_ASIO_MOVE_ARG(WriteHandler) handler,
-    typename enable_if<
+    typename constraint<
       is_dynamic_buffer_v1<typename decay<DynamicBuffer_v1>::type>::value
-        && !is_dynamic_buffer_v2<typename decay<DynamicBuffer_v1>::type>::value
-    >::type* = 0);
+    >::type = 0,
+    typename constraint<
+      !is_dynamic_buffer_v2<typename decay<DynamicBuffer_v1>::type>::value
+    >::type = 0);
 
 #if !defined(BOOST_ASIO_NO_EXTENSIONS)
 #if !defined(BOOST_ASIO_NO_IOSTREAM)
@@ -1162,9 +1174,9 @@ async_write(AsyncWriteStream& s, DynamicBuffer_v2 buffers,
     BOOST_ASIO_MOVE_ARG(WriteHandler) handler
       BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(
         typename AsyncWriteStream::executor_type),
-    typename enable_if<
+    typename constraint<
       is_dynamic_buffer_v2<DynamicBuffer_v2>::value
-    >::type* = 0);
+    >::type = 0);
 
 /// Start an asynchronous operation to write a certain amount of data to a
 /// stream.
@@ -1232,9 +1244,9 @@ BOOST_ASIO_INITFN_AUTO_RESULT_TYPE(WriteHandler,
 async_write(AsyncWriteStream& s, DynamicBuffer_v2 buffers,
     CompletionCondition completion_condition,
     BOOST_ASIO_MOVE_ARG(WriteHandler) handler,
-    typename enable_if<
+    typename constraint<
       is_dynamic_buffer_v2<DynamicBuffer_v2>::value
-    >::type* = 0);
+    >::type = 0);
 
 /*@}*/
 

data/src/cxx_supportlib/vendor-modified/boost/asio/write_at.hpp

@@ -2,7 +2,7 @@
 // write_at.hpp
 // ~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2020 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // 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)

data/src/cxx_supportlib/vendor-modified/boost/asio/yield.hpp

@@ -2,7 +2,7 @@
 // yield.hpp
 // ~~~~~~~~~
 //
-// Copyright (c) 2003-2020 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // 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)

data/src/cxx_supportlib/vendor-modified/boost/assert/source_location.hpp

@@ -84,6 +84,12 @@ template<class E, class T> std::basic_ostream<E, T> & operator<<( std::basic_ost
 
 #  define BOOST_CURRENT_LOCATION ::boost::source_location()
 
+#elif defined(__clang_analyzer__)
+
+// Cast to char const* to placate clang-tidy
+// https://bugs.llvm.org/show_bug.cgi?id=28480
+#  define BOOST_CURRENT_LOCATION ::boost::source_location(__FILE__, __LINE__, static_cast<char const*>(BOOST_CURRENT_FUNCTION))
+
 #else
 
 #  define BOOST_CURRENT_LOCATION ::boost::source_location(__FILE__, __LINE__, BOOST_CURRENT_FUNCTION)

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

@@ -1491,7 +1491,7 @@ struct core_arch_operations< 8u, Signed, Interprocess > :
             "st" st_mo "xr %w[tmp], %x[result], %[storage]\n\t"\
             "cbnz %w[tmp], 1b\n\t"\
             : [tmp] "=&r" (tmp), [result] "=&r" (result), [storage] "+Q" (storage), [original] "=&r" (original)\
-            : [value] "Kr" (v)\
+            : [value] "Lr" (v)\
             : "memory"\
         );
 #endif
@@ -1527,7 +1527,7 @@ struct core_arch_operations< 8u, Signed, Interprocess > :
             "st" st_mo "xr %w[tmp], %x[result], %[storage]\n\t"\
             "cbnz %w[tmp], 1b\n\t"\
             : [tmp] "=&r" (tmp), [result] "=&r" (result), [storage] "+Q" (storage), [original] "=&r" (original)\
-            : [value] "Kr" (v)\
+            : [value] "Lr" (v)\
             : "memory"\
         );
 #endif
@@ -1563,7 +1563,7 @@ struct core_arch_operations< 8u, Signed, Interprocess > :
             "st" st_mo "xr %w[tmp], %x[result], %[storage]\n\t"\
             "cbnz %w[tmp], 1b\n\t"\
             : [tmp] "=&r" (tmp), [result] "=&r" (result), [storage] "+Q" (storage), [original] "=&r" (original)\
-            : [value] "Kr" (v)\
+            : [value] "Lr" (v)\
             : "memory"\
         );
 #endif
@@ -1821,7 +1821,7 @@ struct core_arch_operations< 16u, Signed, Interprocess > :
             : [tmp] "=&r" (tmp), [storage] "+Q" (storage),\
               [original_0] "=&r" (original.as_uint64[0u]), [original_1] "=&r" (original.as_uint64[1u]),\
               [result_0] "=&r" (result.as_uint64[0u]), [result_1] "=&r" (result.as_uint64[1u])\
-            : [value_0] "r" (value.as_uint64[0u]), [value_1] "r" (value.as_uint64[1u])\
+            : [value_0] "Lr" (value.as_uint64[0u]), [value_1] "Lr" (value.as_uint64[1u])\
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC_COMMA "memory"\
         );
 
@@ -1850,7 +1850,7 @@ struct core_arch_operations< 16u, Signed, Interprocess > :
             : [tmp] "=&r" (tmp), [storage] "+Q" (storage),\
               [original_0] "=&r" (original.as_uint64[0u]), [original_1] "=&r" (original.as_uint64[1u]),\
               [result_0] "=&r" (result.as_uint64[0u]), [result_1] "=&r" (result.as_uint64[1u])\
-            : [value_0] "r" (value.as_uint64[0u]), [value_1] "r" (value.as_uint64[1u])\
+            : [value_0] "Lr" (value.as_uint64[0u]), [value_1] "Lr" (value.as_uint64[1u])\
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC_COMMA "memory"\
         );
 
@@ -1879,7 +1879,7 @@ struct core_arch_operations< 16u, Signed, Interprocess > :
             : [tmp] "=&r" (tmp), [storage] "+Q" (storage),\
               [original_0] "=&r" (original.as_uint64[0u]), [original_1] "=&r" (original.as_uint64[1u]),\
               [result_0] "=&r" (result.as_uint64[0u]), [result_1] "=&r" (result.as_uint64[1u])\
-            : [value_0] "r" (value.as_uint64[0u]), [value_1] "r" (value.as_uint64[1u])\
+            : [value_0] "Lr" (value.as_uint64[0u]), [value_1] "Lr" (value.as_uint64[1u])\
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC_COMMA "memory"\
         );
 

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

@@ -222,7 +222,7 @@ struct core_arch_operations< 1u, Signed, Interprocess > :
     {
         storage_type previous = expected, old_val;
 
-        switch (cas_common_order(success_order, failure_order))
+        switch (base_type::cas_common_order(success_order, failure_order))
         {
         case memory_order_relaxed:
             old_val = static_cast< storage_type >(BOOST_ATOMIC_INTERLOCKED_COMPARE_EXCHANGE8_RELAXED(&storage, desired, previous));
@@ -387,7 +387,7 @@ struct core_arch_operations< 2u, Signed, Interprocess > :
     {
         storage_type previous = expected, old_val;
 
-        switch (cas_common_order(success_order, failure_order))
+        switch (base_type::cas_common_order(success_order, failure_order))
         {
         case memory_order_relaxed:
             old_val = static_cast< storage_type >(BOOST_ATOMIC_INTERLOCKED_COMPARE_EXCHANGE16_RELAXED(&storage, desired, previous));
@@ -552,7 +552,7 @@ struct core_arch_operations< 4u, Signed, Interprocess > :
     {
         storage_type previous = expected, old_val;
 
-        switch (cas_common_order(success_order, failure_order))
+        switch (base_type::cas_common_order(success_order, failure_order))
         {
         case memory_order_relaxed:
             old_val = static_cast< storage_type >(BOOST_ATOMIC_INTERLOCKED_COMPARE_EXCHANGE_RELAXED(&storage, desired, previous));
@@ -717,7 +717,7 @@ struct core_arch_operations< 8u, Signed, Interprocess > :
     {
         storage_type previous = expected, old_val;
 
-        switch (cas_common_order(success_order, failure_order))
+        switch (base_type::cas_common_order(success_order, failure_order))
         {
         case memory_order_relaxed:
             old_val = static_cast< storage_type >(BOOST_ATOMIC_INTERLOCKED_COMPARE_EXCHANGE64_RELAXED(&storage, desired, previous));

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

@@ -157,7 +157,7 @@ struct extra_operations_gcc_aarch32< Base, 1u, Signed > :
         (\
             "1:\n\t"\
             "ld" ld_mo "exb %[result], %[storage]\n\t"\
-            "rsb %[result], %[result], #0\n\t"\
+            "rsb %[result], #0\n\t"\
             "st" st_mo "exb %[tmp], %[result], %[storage]\n\t"\
             "teq %[tmp], #0\n\t"\
             "bne 1b\n\t"\
@@ -181,7 +181,7 @@ struct extra_operations_gcc_aarch32< Base, 1u, Signed > :
         (\
             "1:\n\t"\
             "ld" ld_mo "exb %[result], %[storage]\n\t"\
-            "add %[result], %[result], %[value]\n\t"\
+            "add %[result], %[value]\n\t"\
             "st" st_mo "exb %[tmp], %[result], %[storage]\n\t"\
             "teq %[tmp], #0\n\t"\
             "bne 1b\n\t"\
@@ -205,7 +205,7 @@ struct extra_operations_gcc_aarch32< Base, 1u, Signed > :
         (\
             "1:\n\t"\
             "ld" ld_mo "exb %[result], %[storage]\n\t"\
-            "sub %[result], %[result], %[value]\n\t"\
+            "sub %[result], %[value]\n\t"\
             "st" st_mo "exb %[tmp], %[result], %[storage]\n\t"\
             "teq %[tmp], #0\n\t"\
             "bne 1b\n\t"\
@@ -229,7 +229,7 @@ struct extra_operations_gcc_aarch32< Base, 1u, Signed > :
         (\
             "1:\n\t"\
             "ld" ld_mo "exb %[result], %[storage]\n\t"\
-            "and %[result], %[result], %[value]\n\t"\
+            "and %[result], %[value]\n\t"\
             "st" st_mo "exb %[tmp], %[result], %[storage]\n\t"\
             "teq %[tmp], #0\n\t"\
             "bne 1b\n\t"\
@@ -253,7 +253,7 @@ struct extra_operations_gcc_aarch32< Base, 1u, Signed > :
         (\
             "1:\n\t"\
             "ld" ld_mo "exb %[result], %[storage]\n\t"\
-            "orr %[result], %[result], %[value]\n\t"\
+            "orr %[result], %[value]\n\t"\
             "st" st_mo "exb %[tmp], %[result], %[storage]\n\t"\
             "teq %[tmp], #0\n\t"\
             "bne 1b\n\t"\
@@ -277,7 +277,7 @@ struct extra_operations_gcc_aarch32< Base, 1u, Signed > :
         (\
             "1:\n\t"\
             "ld" ld_mo "exb %[result], %[storage]\n\t"\
-            "eor %[result], %[result], %[value]\n\t"\
+            "eor %[result], %[value]\n\t"\
             "st" st_mo "exb %[tmp], %[result], %[storage]\n\t"\
             "teq %[tmp], #0\n\t"\
             "bne 1b\n\t"\
@@ -388,7 +388,7 @@ struct extra_operations_gcc_aarch32< Base, 2u, Signed > :
         (\
             "1:\n\t"\
             "ld" ld_mo "exh %[result], %[storage]\n\t"\
-            "rsb %[result], %[result], #0\n\t"\
+            "rsb %[result], #0\n\t"\
             "st" st_mo "exh %[tmp], %[result], %[storage]\n\t"\
             "teq %[tmp], #0\n\t"\
             "bne 1b\n\t"\
@@ -412,7 +412,7 @@ struct extra_operations_gcc_aarch32< Base, 2u, Signed > :
         (\
             "1:\n\t"\
             "ld" ld_mo "exh %[result], %[storage]\n\t"\
-            "add %[result], %[result], %[value]\n\t"\
+            "add %[result], %[value]\n\t"\
             "st" st_mo "exh %[tmp], %[result], %[storage]\n\t"\
             "teq %[tmp], #0\n\t"\
             "bne 1b\n\t"\
@@ -436,7 +436,7 @@ struct extra_operations_gcc_aarch32< Base, 2u, Signed > :
         (\
             "1:\n\t"\
             "ld" ld_mo "exh %[result], %[storage]\n\t"\
-            "sub %[result], %[result], %[value]\n\t"\
+            "sub %[result], %[value]\n\t"\
             "st" st_mo "exh %[tmp], %[result], %[storage]\n\t"\
             "teq %[tmp], #0\n\t"\
             "bne 1b\n\t"\
@@ -460,7 +460,7 @@ struct extra_operations_gcc_aarch32< Base, 2u, Signed > :
         (\
             "1:\n\t"\
             "ld" ld_mo "exh %[result], %[storage]\n\t"\
-            "and %[result], %[result], %[value]\n\t"\
+            "and %[result], %[value]\n\t"\
             "st" st_mo "exh %[tmp], %[result], %[storage]\n\t"\
             "teq %[tmp], #0\n\t"\
             "bne 1b\n\t"\
@@ -484,7 +484,7 @@ struct extra_operations_gcc_aarch32< Base, 2u, Signed > :
         (\
             "1:\n\t"\
             "ld" ld_mo "exh %[result], %[storage]\n\t"\
-            "orr %[result], %[result], %[value]\n\t"\
+            "orr %[result], %[value]\n\t"\
             "st" st_mo "exh %[tmp], %[result], %[storage]\n\t"\
             "teq %[tmp], #0\n\t"\
             "bne 1b\n\t"\
@@ -508,7 +508,7 @@ struct extra_operations_gcc_aarch32< Base, 2u, Signed > :
         (\
             "1:\n\t"\
             "ld" ld_mo "exh %[result], %[storage]\n\t"\
-            "eor %[result], %[result], %[value]\n\t"\
+            "eor %[result], %[value]\n\t"\
             "st" st_mo "exh %[tmp], %[result], %[storage]\n\t"\
             "teq %[tmp], #0\n\t"\
             "bne 1b\n\t"\
@@ -618,7 +618,7 @@ struct extra_operations_gcc_aarch32< Base, 4u, Signed > :
         (\
             "1:\n\t"\
             "ld" ld_mo "ex %[result], %[storage]\n\t"\
-            "rsb %[result], %[result], #0\n\t"\
+            "rsb %[result], #0\n\t"\
             "st" st_mo "ex %[tmp], %[result], %[storage]\n\t"\
             "teq %[tmp], #0\n\t"\
             "bne 1b\n\t"\
@@ -642,7 +642,7 @@ struct extra_operations_gcc_aarch32< Base, 4u, Signed > :
         (\
             "1:\n\t"\
             "ld" ld_mo "ex %[result], %[storage]\n\t"\
-            "add %[result], %[result], %[value]\n\t"\
+            "add %[result], %[value]\n\t"\
             "st" st_mo "ex %[tmp], %[result], %[storage]\n\t"\
             "teq %[tmp], #0\n\t"\
             "bne 1b\n\t"\
@@ -666,7 +666,7 @@ struct extra_operations_gcc_aarch32< Base, 4u, Signed > :
         (\
             "1:\n\t"\
             "ld" ld_mo "ex %[result], %[storage]\n\t"\
-            "sub %[result], %[result], %[value]\n\t"\
+            "sub %[result], %[value]\n\t"\
             "st" st_mo "ex %[tmp], %[result], %[storage]\n\t"\
             "teq %[tmp], #0\n\t"\
             "bne 1b\n\t"\
@@ -690,7 +690,7 @@ struct extra_operations_gcc_aarch32< Base, 4u, Signed > :
         (\
             "1:\n\t"\
             "ld" ld_mo "ex %[result], %[storage]\n\t"\
-            "and %[result], %[result], %[value]\n\t"\
+            "and %[result], %[value]\n\t"\
             "st" st_mo "ex %[tmp], %[result], %[storage]\n\t"\
             "teq %[tmp], #0\n\t"\
             "bne 1b\n\t"\
@@ -714,7 +714,7 @@ struct extra_operations_gcc_aarch32< Base, 4u, Signed > :
         (\
             "1:\n\t"\
             "ld" ld_mo "ex %[result], %[storage]\n\t"\
-            "orr %[result], %[result], %[value]\n\t"\
+            "orr %[result], %[value]\n\t"\
             "st" st_mo "ex %[tmp], %[result], %[storage]\n\t"\
             "teq %[tmp], #0\n\t"\
             "bne 1b\n\t"\
@@ -738,7 +738,7 @@ struct extra_operations_gcc_aarch32< Base, 4u, Signed > :
         (\
             "1:\n\t"\
             "ld" ld_mo "ex %[result], %[storage]\n\t"\
-            "eor %[result], %[result], %[value]\n\t"\
+            "eor %[result], %[value]\n\t"\
             "st" st_mo "ex %[tmp], %[result], %[storage]\n\t"\
             "teq %[tmp], #0\n\t"\
             "bne 1b\n\t"\
@@ -826,8 +826,8 @@ struct extra_operations_gcc_aarch32< Base, 8u, Signed > :
             "ld" ld_mo "exd %0, %H0, %2\n\t"\
             "mvn %3, %0\n\t"\
             "mvn %H3, %H0\n\t"\
-            "adds " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_LO(3) ", " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_LO(3) ", #1\n\t"\
-            "adc " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_HI(3) ", " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_HI(3) ", #0\n\t"\
+            "adds " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_LO(3) ", #1\n\t"\
+            "adc " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_HI(3) ", #0\n\t"\
             "st" st_mo "exd %1, %3, %H3, %2\n\t"\
             "teq %1, #0\n\t"\
             "bne 1b\n\t"\
@@ -853,8 +853,8 @@ struct extra_operations_gcc_aarch32< Base, 8u, Signed > :
             "ld" ld_mo "exd %0, %H0, %2\n\t"\
             "mvn %0, %0\n\t"\
             "mvn %H0, %H0\n\t"\
-            "adds " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_LO(0) ", " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_LO(0) ", #1\n\t"\
-            "adc " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_HI(0) ", " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_HI(0) ", #0\n\t"\
+            "adds " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_LO(0) ", #1\n\t"\
+            "adc " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_HI(0) ", #0\n\t"\
             "st" st_mo "exd %1, %0, %H0, %2\n\t"\
             "teq %1, #0\n\t"\
             "bne 1b\n\t"\
@@ -878,8 +878,8 @@ struct extra_operations_gcc_aarch32< Base, 8u, Signed > :
         (\
             "1:\n\t"\
             "ld" ld_mo "exd %0, %H0, %2\n\t"\
-            "adds " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_LO(0) ", " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_LO(0) ", " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_LO(3) "\n\t"\
-            "adc " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_HI(0) ", " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_HI(0) ", " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_HI(3) "\n\t"\
+            "adds " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_LO(0) ", " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_LO(3) "\n\t"\
+            "adc " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_HI(0) ", " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_HI(3) "\n\t"\
             "st" st_mo "exd %1, %0, %H0, %2\n\t"\
             "teq %1, #0\n\t"\
             "bne 1b\n\t"\
@@ -903,8 +903,8 @@ struct extra_operations_gcc_aarch32< Base, 8u, Signed > :
         (\
             "1:\n\t"\
             "ld" ld_mo "exd %0, %H0, %2\n\t"\
-            "subs " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_LO(0) ", " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_LO(0) ", " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_LO(3) "\n\t"\
-            "sbc " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_HI(0) ", " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_HI(0) ", " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_HI(3) "\n\t"\
+            "subs " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_LO(0) ", " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_LO(3) "\n\t"\
+            "sbc " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_HI(0) ", " BOOST_ATOMIC_DETAIL_AARCH32_ASM_ARG_HI(3) "\n\t"\
             "st" st_mo "exd %1, %0, %H0, %2\n\t"\
             "teq %1, #0\n\t"\
             "bne 1b\n\t"\
@@ -928,8 +928,8 @@ struct extra_operations_gcc_aarch32< Base, 8u, Signed > :
         (\
             "1:\n\t"\
             "ld" ld_mo "exd %0, %H0, %2\n\t"\
-            "and %0, %0, %3\n\t"\
-            "and %H0, %H0, %H3\n\t"\
+            "and %0, %3\n\t"\
+            "and %H0, %H3\n\t"\
             "st" st_mo "exd %1, %0, %H0, %2\n\t"\
             "teq %1, #0\n\t"\
             "bne 1b\n\t"\
@@ -953,8 +953,8 @@ struct extra_operations_gcc_aarch32< Base, 8u, Signed > :
         (\
             "1:\n\t"\
             "ld" ld_mo "exd %0, %H0, %2\n\t"\
-            "orr %0, %0, %3\n\t"\
-            "orr %H0, %H0, %H3\n\t"\
+            "orr %0, %3\n\t"\
+            "orr %H0, %H3\n\t"\
             "st" st_mo "exd %1, %0, %H0, %2\n\t"\
             "teq %1, #0\n\t"\
             "bne 1b\n\t"\
@@ -978,8 +978,8 @@ struct extra_operations_gcc_aarch32< Base, 8u, Signed > :
         (\
             "1:\n\t"\
             "ld" ld_mo "exd %0, %H0, %2\n\t"\
-            "eor %0, %0, %3\n\t"\
-            "eor %H0, %H0, %H3\n\t"\
+            "eor %0, %3\n\t"\
+            "eor %H0, %H3\n\t"\
             "st" st_mo "exd %1, %0, %H0, %2\n\t"\
             "teq %1, #0\n\t"\
             "bne 1b\n\t"\