passenger 6.0.14 → 6.0.15

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

@@ -22,6 +22,7 @@
 #include <boost/atomic/detail/storage_traits.hpp>
 #include <boost/atomic/detail/core_arch_operations_fwd.hpp>
 #include <boost/atomic/detail/ops_gcc_ppc_common.hpp>
+#include <boost/atomic/detail/gcc_ppc_asm_common.hpp>
 #include <boost/atomic/detail/capabilities.hpp>
 #include <boost/atomic/detail/header.hpp>
 
@@ -113,8 +114,8 @@ struct core_arch_operations< 4u, Signed, Interprocess > :
             (
                 "lwz %0, %1\n\t"
                 "cmpw %0, %0\n\t"
-                "bne- 1f\n\t"
-                "1:\n\t"
+                BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1f", "+4")
+                BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
                 "isync\n\t"
                 : "=&r" (v)
                 : "m" (storage)
@@ -139,10 +140,10 @@ struct core_arch_operations< 4u, Signed, Interprocess > :
         fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "lwarx %0,%y1\n\t"
             "stwcx. %2,%y1\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-8")
             : "=&b" (original), "+Z" (storage)
             : "b" (v)
             : "cr0"
@@ -161,11 +162,11 @@ struct core_arch_operations< 4u, Signed, Interprocess > :
             "li %1, 0\n\t"
             "lwarx %0,%y2\n\t"
             "cmpw %0, %3\n\t"
-            "bne- 1f\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1f", "+16")
             "stwcx. %4,%y2\n\t"
-            "bne- 1f\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1f", "+8")
             "li %1, 1\n\t"
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             : "=&b" (expected), "=&b" (success), "+Z" (storage)
             : "b" (expected), "b" (desired)
             : "cr0"
@@ -185,13 +186,14 @@ struct core_arch_operations< 4u, Signed, Interprocess > :
         __asm__ __volatile__
         (
             "li %1, 0\n\t"
-            "0: lwarx %0,%y2\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("0")
+            "lwarx %0,%y2\n\t"
             "cmpw %0, %3\n\t"
-            "bne- 1f\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1f", "+16")
             "stwcx. %4,%y2\n\t"
-            "bne- 0b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "0b", "-16")
             "li %1, 1\n\t"
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             : "=&b" (expected), "=&b" (success), "+Z" (storage)
             : "b" (expected), "b" (desired)
             : "cr0"
@@ -209,11 +211,11 @@ struct core_arch_operations< 4u, Signed, Interprocess > :
         fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "lwarx %0,%y2\n\t"
             "add %1,%0,%3\n\t"
             "stwcx. %1,%y2\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-12")
             : "=&b" (original), "=&b" (result), "+Z" (storage)
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
@@ -228,11 +230,11 @@ struct core_arch_operations< 4u, Signed, Interprocess > :
         fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "lwarx %0,%y2\n\t"
             "sub %1,%0,%3\n\t"
             "stwcx. %1,%y2\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-12")
             : "=&b" (original), "=&b" (result), "+Z" (storage)
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
@@ -247,11 +249,11 @@ struct core_arch_operations< 4u, Signed, Interprocess > :
         fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "lwarx %0,%y2\n\t"
             "and %1,%0,%3\n\t"
             "stwcx. %1,%y2\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-12")
             : "=&b" (original), "=&b" (result), "+Z" (storage)
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
@@ -266,11 +268,11 @@ struct core_arch_operations< 4u, Signed, Interprocess > :
         fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "lwarx %0,%y2\n\t"
             "or %1,%0,%3\n\t"
             "stwcx. %1,%y2\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-12")
             : "=&b" (original), "=&b" (result), "+Z" (storage)
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
@@ -285,11 +287,11 @@ struct core_arch_operations< 4u, Signed, Interprocess > :
         fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "lwarx %0,%y2\n\t"
             "xor %1,%0,%3\n\t"
             "stwcx. %1,%y2\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-12")
             : "=&b" (original), "=&b" (result), "+Z" (storage)
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
@@ -344,8 +346,8 @@ struct core_arch_operations< 1u, Signed, Interprocess > :
             (
                 "lbz %0, %1\n\t"
                 "cmpw %0, %0\n\t"
-                "bne- 1f\n\t"
-                "1:\n\t"
+                BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1f", "+4")
+                BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
                 "isync\n\t"
                 : "=&r" (v)
                 : "m" (storage)
@@ -370,10 +372,10 @@ struct core_arch_operations< 1u, Signed, Interprocess > :
         fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "lbarx %0,%y1\n\t"
             "stbcx. %2,%y1\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-8")
             : "=&b" (original), "+Z" (storage)
             : "b" (v)
             : "cr0"
@@ -392,11 +394,11 @@ struct core_arch_operations< 1u, Signed, Interprocess > :
             "li %1, 0\n\t"
             "lbarx %0,%y2\n\t"
             "cmpw %0, %3\n\t"
-            "bne- 1f\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1f", "+16")
             "stbcx. %4,%y2\n\t"
-            "bne- 1f\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1f", "+8")
             "li %1, 1\n\t"
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             : "=&b" (expected), "=&b" (success), "+Z" (storage)
             : "b" (expected), "b" (desired)
             : "cr0"
@@ -416,13 +418,14 @@ struct core_arch_operations< 1u, Signed, Interprocess > :
         __asm__ __volatile__
         (
             "li %1, 0\n\t"
-            "0: lbarx %0,%y2\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("0")
+            "lbarx %0,%y2\n\t"
             "cmpw %0, %3\n\t"
-            "bne- 1f\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1f", "+16")
             "stbcx. %4,%y2\n\t"
-            "bne- 0b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "0b", "-16")
             "li %1, 1\n\t"
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             : "=&b" (expected), "=&b" (success), "+Z" (storage)
             : "b" (expected), "b" (desired)
             : "cr0"
@@ -440,11 +443,11 @@ struct core_arch_operations< 1u, Signed, Interprocess > :
         fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "lbarx %0,%y2\n\t"
             "add %1,%0,%3\n\t"
             "stbcx. %1,%y2\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-12")
             : "=&b" (original), "=&b" (result), "+Z" (storage)
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
@@ -459,11 +462,11 @@ struct core_arch_operations< 1u, Signed, Interprocess > :
         fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "lbarx %0,%y2\n\t"
             "sub %1,%0,%3\n\t"
             "stbcx. %1,%y2\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-12")
             : "=&b" (original), "=&b" (result), "+Z" (storage)
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
@@ -478,11 +481,11 @@ struct core_arch_operations< 1u, Signed, Interprocess > :
         fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "lbarx %0,%y2\n\t"
             "and %1,%0,%3\n\t"
             "stbcx. %1,%y2\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-12")
             : "=&b" (original), "=&b" (result), "+Z" (storage)
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
@@ -497,11 +500,11 @@ struct core_arch_operations< 1u, Signed, Interprocess > :
         fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "lbarx %0,%y2\n\t"
             "or %1,%0,%3\n\t"
             "stbcx. %1,%y2\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-12")
             : "=&b" (original), "=&b" (result), "+Z" (storage)
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
@@ -516,11 +519,11 @@ struct core_arch_operations< 1u, Signed, Interprocess > :
         fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "lbarx %0,%y2\n\t"
             "xor %1,%0,%3\n\t"
             "stbcx. %1,%y2\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-12")
             : "=&b" (original), "=&b" (result), "+Z" (storage)
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
@@ -555,12 +558,12 @@ struct core_arch_operations< 1u, false, Interprocess > :
         base_type::fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "lwarx %0,%y2\n\t"
             "add %1,%0,%3\n\t"
             "rlwinm %1, %1, 0, 0xff\n\t"
             "stwcx. %1,%y2\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-16")
             : "=&b" (original), "=&b" (result), "+Z" (storage)
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
@@ -575,12 +578,12 @@ struct core_arch_operations< 1u, false, Interprocess > :
         base_type::fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "lwarx %0,%y2\n\t"
             "sub %1,%0,%3\n\t"
             "rlwinm %1, %1, 0, 0xff\n\t"
             "stwcx. %1,%y2\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-16")
             : "=&b" (original), "=&b" (result), "+Z" (storage)
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
@@ -603,12 +606,12 @@ struct core_arch_operations< 1u, true, Interprocess > :
         base_type::fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "lwarx %0,%y2\n\t"
             "add %1,%0,%3\n\t"
             "extsb %1, %1\n\t"
             "stwcx. %1,%y2\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-16")
             : "=&b" (original), "=&b" (result), "+Z" (storage)
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
@@ -623,12 +626,12 @@ struct core_arch_operations< 1u, true, Interprocess > :
         base_type::fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "lwarx %0,%y2\n\t"
             "sub %1,%0,%3\n\t"
             "extsb %1, %1\n\t"
             "stwcx. %1,%y2\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-16")
             : "=&b" (original), "=&b" (result), "+Z" (storage)
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
@@ -675,8 +678,8 @@ struct core_arch_operations< 2u, Signed, Interprocess > :
             (
                 "lhz %0, %1\n\t"
                 "cmpw %0, %0\n\t"
-                "bne- 1f\n\t"
-                "1:\n\t"
+                BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1f", "+4")
+                BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
                 "isync\n\t"
                 : "=&r" (v)
                 : "m" (storage)
@@ -701,10 +704,10 @@ struct core_arch_operations< 2u, Signed, Interprocess > :
         fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "lharx %0,%y1\n\t"
             "sthcx. %2,%y1\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-8")
             : "=&b" (original), "+Z" (storage)
             : "b" (v)
             : "cr0"
@@ -723,11 +726,11 @@ struct core_arch_operations< 2u, Signed, Interprocess > :
             "li %1, 0\n\t"
             "lharx %0,%y2\n\t"
             "cmpw %0, %3\n\t"
-            "bne- 1f\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1f", "+16")
             "sthcx. %4,%y2\n\t"
-            "bne- 1f\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1f", "+8")
             "li %1, 1\n\t"
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             : "=&b" (expected), "=&b" (success), "+Z" (storage)
             : "b" (expected), "b" (desired)
             : "cr0"
@@ -747,13 +750,14 @@ struct core_arch_operations< 2u, Signed, Interprocess > :
         __asm__ __volatile__
         (
             "li %1, 0\n\t"
-            "0: lharx %0,%y2\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("0")
+            "lharx %0,%y2\n\t"
             "cmpw %0, %3\n\t"
-            "bne- 1f\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1f", "+16")
             "sthcx. %4,%y2\n\t"
-            "bne- 0b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "0b", "-16")
             "li %1, 1\n\t"
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             : "=&b" (expected), "=&b" (success), "+Z" (storage)
             : "b" (expected), "b" (desired)
             : "cr0"
@@ -771,11 +775,11 @@ struct core_arch_operations< 2u, Signed, Interprocess > :
         fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "lharx %0,%y2\n\t"
             "add %1,%0,%3\n\t"
             "sthcx. %1,%y2\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-12")
             : "=&b" (original), "=&b" (result), "+Z" (storage)
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
@@ -790,11 +794,11 @@ struct core_arch_operations< 2u, Signed, Interprocess > :
         fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "lharx %0,%y2\n\t"
             "sub %1,%0,%3\n\t"
             "sthcx. %1,%y2\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-12")
             : "=&b" (original), "=&b" (result), "+Z" (storage)
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
@@ -809,11 +813,11 @@ struct core_arch_operations< 2u, Signed, Interprocess > :
         fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "lharx %0,%y2\n\t"
             "and %1,%0,%3\n\t"
             "sthcx. %1,%y2\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-12")
             : "=&b" (original), "=&b" (result), "+Z" (storage)
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
@@ -828,11 +832,11 @@ struct core_arch_operations< 2u, Signed, Interprocess > :
         fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "lharx %0,%y2\n\t"
             "or %1,%0,%3\n\t"
             "sthcx. %1,%y2\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-12")
             : "=&b" (original), "=&b" (result), "+Z" (storage)
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
@@ -847,11 +851,11 @@ struct core_arch_operations< 2u, Signed, Interprocess > :
         fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "lharx %0,%y2\n\t"
             "xor %1,%0,%3\n\t"
             "sthcx. %1,%y2\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-12")
             : "=&b" (original), "=&b" (result), "+Z" (storage)
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
@@ -886,12 +890,12 @@ struct core_arch_operations< 2u, false, Interprocess > :
         base_type::fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "lwarx %0,%y2\n\t"
             "add %1,%0,%3\n\t"
             "rlwinm %1, %1, 0, 0xffff\n\t"
             "stwcx. %1,%y2\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-16")
             : "=&b" (original), "=&b" (result), "+Z" (storage)
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
@@ -906,12 +910,12 @@ struct core_arch_operations< 2u, false, Interprocess > :
         base_type::fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "lwarx %0,%y2\n\t"
             "sub %1,%0,%3\n\t"
             "rlwinm %1, %1, 0, 0xffff\n\t"
             "stwcx. %1,%y2\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-16")
             : "=&b" (original), "=&b" (result), "+Z" (storage)
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
@@ -934,12 +938,12 @@ struct core_arch_operations< 2u, true, Interprocess > :
         base_type::fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "lwarx %0,%y2\n\t"
             "add %1,%0,%3\n\t"
             "extsh %1, %1\n\t"
             "stwcx. %1,%y2\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-16")
             : "=&b" (original), "=&b" (result), "+Z" (storage)
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
@@ -954,12 +958,12 @@ struct core_arch_operations< 2u, true, Interprocess > :
         base_type::fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "lwarx %0,%y2\n\t"
             "sub %1,%0,%3\n\t"
             "extsh %1, %1\n\t"
             "stwcx. %1,%y2\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-16")
             : "=&b" (original), "=&b" (result), "+Z" (storage)
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
@@ -1006,8 +1010,8 @@ struct core_arch_operations< 8u, Signed, Interprocess > :
             (
                 "ld %0, %1\n\t"
                 "cmpd %0, %0\n\t"
-                "bne- 1f\n\t"
-                "1:\n\t"
+                BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1f", "+4")
+                BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
                 "isync\n\t"
                 : "=&b" (v)
                 : "m" (storage)
@@ -1032,10 +1036,10 @@ struct core_arch_operations< 8u, Signed, Interprocess > :
         fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "ldarx %0,%y1\n\t"
             "stdcx. %2,%y1\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-8")
             : "=&b" (original), "+Z" (storage)
             : "b" (v)
             : "cr0"
@@ -1054,11 +1058,11 @@ struct core_arch_operations< 8u, Signed, Interprocess > :
             "li %1, 0\n\t"
             "ldarx %0,%y2\n\t"
             "cmpd %0, %3\n\t"
-            "bne- 1f\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1f", "+16")
             "stdcx. %4,%y2\n\t"
-            "bne- 1f\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1f", "+8")
             "li %1, 1\n\t"
-            "1:"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             : "=&b" (expected), "=&b" (success), "+Z" (storage)
             : "b" (expected), "b" (desired)
             : "cr0"
@@ -1078,13 +1082,14 @@ struct core_arch_operations< 8u, Signed, Interprocess > :
         __asm__ __volatile__
         (
             "li %1, 0\n\t"
-            "0: ldarx %0,%y2\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("0")
+            "ldarx %0,%y2\n\t"
             "cmpd %0, %3\n\t"
-            "bne- 1f\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1f", "+16")
             "stdcx. %4,%y2\n\t"
-            "bne- 0b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "0b", "-16")
             "li %1, 1\n\t"
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             : "=&b" (expected), "=&b" (success), "+Z" (storage)
             : "b" (expected), "b" (desired)
             : "cr0"
@@ -1102,11 +1107,11 @@ struct core_arch_operations< 8u, Signed, Interprocess > :
         fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "ldarx %0,%y2\n\t"
             "add %1,%0,%3\n\t"
             "stdcx. %1,%y2\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-12")
             : "=&b" (original), "=&b" (result), "+Z" (storage)
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
@@ -1121,11 +1126,11 @@ struct core_arch_operations< 8u, Signed, Interprocess > :
         fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "ldarx %0,%y2\n\t"
             "sub %1,%0,%3\n\t"
             "stdcx. %1,%y2\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-12")
             : "=&b" (original), "=&b" (result), "+Z" (storage)
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
@@ -1140,11 +1145,11 @@ struct core_arch_operations< 8u, Signed, Interprocess > :
         fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "ldarx %0,%y2\n\t"
             "and %1,%0,%3\n\t"
             "stdcx. %1,%y2\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-12")
             : "=&b" (original), "=&b" (result), "+Z" (storage)
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
@@ -1159,11 +1164,11 @@ struct core_arch_operations< 8u, Signed, Interprocess > :
         fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "ldarx %0,%y2\n\t"
             "or %1,%0,%3\n\t"
             "stdcx. %1,%y2\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-12")
             : "=&b" (original), "=&b" (result), "+Z" (storage)
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
@@ -1178,11 +1183,11 @@ struct core_arch_operations< 8u, Signed, Interprocess > :
         fence_before(order);
         __asm__ __volatile__
         (
-            "1:\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_LABEL("1")
             "ldarx %0,%y2\n\t"
             "xor %1,%0,%3\n\t"
             "stdcx. %1,%y2\n\t"
-            "bne- 1b\n\t"
+            BOOST_ATOMIC_DETAIL_PPC_ASM_JUMP("bne-", "1b", "-12")
             : "=&b" (original), "=&b" (result), "+Z" (storage)
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC

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

@@ -102,7 +102,7 @@ struct extra_fp_negate_generic< Base, Value, Size, true > :
     typedef Value value_type;
 
     //! The mask with only one sign bit set to 1
-    static BOOST_CONSTEXPR_OR_CONST storage_type sign_mask = static_cast< storage_type >(1u) << (atomics::detail::value_sizeof< value_type >::value * 8u - 1u);
+    static BOOST_CONSTEXPR_OR_CONST storage_type sign_mask = static_cast< storage_type >(1u) << (atomics::detail::value_size_of< value_type >::value * 8u - 1u);
 
     static BOOST_FORCEINLINE value_type fetch_negate(storage_type volatile& storage, memory_order order) BOOST_NOEXCEPT
     {