From: Fabrizio Fabbri <ffabbri4@bloomberg.net>
Date: Fri, 7 Apr 2017 13:56:04 +0000 (-0400)
Subject: Workaround test_stack failure on AIX/ppc
X-Git-Tag: v7.4.6~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b697e8;p=libatomic_ops

Workaround test_stack failure on AIX/ppc

* src/atomic_ops_stack.c [AO_USE_ALMOST_LOCK_FREE]
(AO_stack_pop_explicit_aux_acquire): Replace AO_load to AO_load_acquire
when loaded value is compared to first; add comment.
---

diff --git a/src/atomic_ops_stack.c b/src/atomic_ops_stack.c
index adfbcff..e199bff 100644
--- a/src/atomic_ops_stack.c
+++ b/src/atomic_ops_stack.c
@@ -152,11 +152,14 @@ AO_stack_pop_explicit_aux_acquire(volatile AO_t *list, AO_stack_aux * a)
   /* list.  Otherwise it's possible that a reinsertion of it was        */
   /* already started before we added the black list entry.              */
 # if defined(__alpha__) && (__GNUC__ == 4)
-    if (first != AO_load(list))
+    if (first != AO_load_acquire(list))
                         /* Workaround __builtin_expect bug found in     */
                         /* gcc-4.6.3/alpha causing test_stack failure.  */
 # else
-    if (AO_EXPECT_FALSE(first != AO_load(list)))
+    if (AO_EXPECT_FALSE(first != AO_load_acquire(list)))
+                        /* Workaround test failure on AIX, at least, by */
+                        /* using acquire ordering semantics for this    */
+                        /* load.  Probably, it is not the right fix.    */
 # endif
   {
     AO_store_release(a->AO_stack_bl+i, 0);