Fix generalized fetch_and_add function

* src/atomic_ops/generalize-small.template (AO_XSIZE_fetch_and_add):
Do not use AO_EXPECT_FALSE (since defined only in v7.3+).
* src/atomic_ops/generalize-small.h: Regenerate.

diff --git a/src/atomic_ops/generalize-small.h b/src/atomic_ops/generalize-small.h
index de94843b3dcc68a8fad5f32a19b52ba4ae35c847..a54da2004d4b1c82df5b5d1ab34fe7c327fcbc71 100644 (file)
--- a/src/atomic_ops/generalize-small.h
+++ b/src/atomic_ops/generalize-small.h
@@ -216,8 +216,7 @@
       {
         old = *addr;
       }
-    while (AO_EXPECT_FALSE(!AO_char_compare_and_swap(addr, old,
-                                                      old + incr)));
+    while (!AO_char_compare_and_swap(addr, old, old + incr));
     return old;
   }
 # define AO_HAVE_char_fetch_and_add
@@ -816,8 +815,7 @@
       {
         old = *addr;
       }
-    while (AO_EXPECT_FALSE(!AO_short_compare_and_swap(addr, old,
-                                                      old + incr)));
+    while (!AO_short_compare_and_swap(addr, old, old + incr));
     return old;
   }
 # define AO_HAVE_short_fetch_and_add
@@ -1416,8 +1414,7 @@
       {
         old = *addr;
       }
-    while (AO_EXPECT_FALSE(!AO_int_compare_and_swap(addr, old,
-                                                      old + incr)));
+    while (!AO_int_compare_and_swap(addr, old, old + incr));
     return old;
   }
 # define AO_HAVE_int_fetch_and_add

diff --git a/src/atomic_ops/generalize-small.template b/src/atomic_ops/generalize-small.template
index b9c05db0a7d4078ace4b419c7ce1450f99146a1c..a66988ecef93b4ee05d0c12f0439b181ce390589 100644 (file)
--- a/src/atomic_ops/generalize-small.template
+++ b/src/atomic_ops/generalize-small.template
@@ -216,8 +216,7 @@
       {
         old = *addr;
       }
-    while (AO_EXPECT_FALSE(!AO_XSIZE_compare_and_swap(addr, old,
-                                                      old + incr)));
+    while (!AO_XSIZE_compare_and_swap(addr, old, old + incr));
     return old;
   }
 # define AO_HAVE_XSIZE_fetch_and_add