* src/atomic_ops/generalize.h (AO_or_full): Rename incr argument to value.

* src/atomic_ops/sysdeps/gcc/x86.h: Ditto.
* src/atomic_ops/sysdeps/gcc/x86_64.h: Ditto.
* src/atomic_ops/sysdeps/sunc/x86.h: Ditto.
* src/atomic_ops/sysdeps/sunc/x86_64.h: Ditto.

diff --git a/src/atomic_ops/generalize.h b/src/atomic_ops/generalize.h
index d6c8e9364a6d0ee5f18c2d2da45055d76af1b689..7a5d7a017e5feca44014800728885e1da56764a8 100644 (file)
--- a/src/atomic_ops/generalize.h
+++ b/src/atomic_ops/generalize.h
@@ -713,14 +713,14 @@
 /* Atomic or */
 #if defined(AO_HAVE_compare_and_swap_full) && !defined(AO_HAVE_or_full)
   AO_INLINE void
-  AO_or_full(volatile AO_t *addr, AO_t incr)
+  AO_or_full(volatile AO_t *addr, AO_t value)
   {
     AO_t old;
     do
       {
         old = *addr;
       }
-    while (!AO_compare_and_swap_full(addr, old, old | incr));
+    while (!AO_compare_and_swap_full(addr, old, old | value));
   }
 # define AO_HAVE_or_full
 #endif

diff --git a/src/atomic_ops/sysdeps/gcc/x86.h b/src/atomic_ops/sysdeps/gcc/x86.h
index 807afc17b776c4d23fdf82221c5b09c5003c59cf..5ce9d138e5a9fea66c76c1f4078eace145b68052 100644 (file)
--- a/src/atomic_ops/sysdeps/gcc/x86.h
+++ b/src/atomic_ops/sysdeps/gcc/x86.h
@@ -94,10 +94,10 @@ AO_short_fetch_and_add_full (volatile unsigned short *p, unsigned short incr)
 
 /* Really only works for 486 and later */
 AO_INLINE void
-AO_or_full (volatile AO_t *p, AO_t incr)
+AO_or_full (volatile AO_t *p, AO_t value)
 {
   __asm__ __volatile__ ("lock; orl %1, %0" :
-                        "=m" (*p) : "r" (incr), "m" (*p) : "memory");
+                        "=m" (*p) : "r" (value), "m" (*p) : "memory");
 }
 #define AO_HAVE_or_full
 

diff --git a/src/atomic_ops/sysdeps/gcc/x86_64.h b/src/atomic_ops/sysdeps/gcc/x86_64.h
index 3cbe76e9f02b977b27c5195e71a1ef001a71fa12..afb31e8e41688b5fc8b662afa245d7b211313839 100644 (file)
--- a/src/atomic_ops/sysdeps/gcc/x86_64.h
+++ b/src/atomic_ops/sysdeps/gcc/x86_64.h
@@ -91,10 +91,10 @@ AO_int_fetch_and_add_full (volatile unsigned int *p, unsigned int incr)
 #define AO_HAVE_int_fetch_and_add_full
 
 AO_INLINE void
-AO_or_full (volatile AO_t *p, AO_t incr)
+AO_or_full (volatile AO_t *p, AO_t value)
 {
   __asm__ __volatile__ ("lock; orq %1, %0" :
-                        "=m" (*p) : "r" (incr), "m" (*p) : "memory");
+                        "=m" (*p) : "r" (value), "m" (*p) : "memory");
 }
 #define AO_HAVE_or_full
 

diff --git a/src/atomic_ops/sysdeps/sunc/x86.h b/src/atomic_ops/sysdeps/sunc/x86.h
index ab34db9a2dcebd2dc860ff946c0b21bc13ed5f04..4090c2e38a1797683fa49409a546ef1043ecb384 100644 (file)
--- a/src/atomic_ops/sysdeps/sunc/x86.h
+++ b/src/atomic_ops/sysdeps/sunc/x86.h
@@ -91,10 +91,10 @@ AO_short_fetch_and_add_full (volatile unsigned short *p, unsigned short incr)
 
 /* Really only works for 486 and later */
 AO_INLINE void
-AO_or_full (volatile AO_t *p, AO_t incr)
+AO_or_full (volatile AO_t *p, AO_t value)
 {
   __asm__ __volatile__ ("lock; orl %1, %0" :
-                        "=m" (*p) : "r" (incr) /* , "m" (*p) */
+                        "=m" (*p) : "r" (value) /* , "m" (*p) */
                         : "memory");
 }
 #define AO_HAVE_or_full

diff --git a/src/atomic_ops/sysdeps/sunc/x86_64.h b/src/atomic_ops/sysdeps/sunc/x86_64.h
index b07169e84d231502437e9d8c1d8cd6da1effef3d..50fbb4befc396817dea57cb3d8cc749b933fdb8d 100644 (file)
--- a/src/atomic_ops/sysdeps/sunc/x86_64.h
+++ b/src/atomic_ops/sysdeps/sunc/x86_64.h
@@ -91,10 +91,10 @@ AO_int_fetch_and_add_full (volatile unsigned int *p, unsigned int incr)
 #define AO_HAVE_int_fetch_and_add_full
 
 AO_INLINE void
-AO_or_full (volatile AO_t *p, AO_t incr)
+AO_or_full (volatile AO_t *p, AO_t value)
 {
   __asm__ __volatile__ ("lock; orq %1, %0" :
-                        "=m" (*p) : "r" (incr) /* , "m" (*p) */
+                        "=m" (*p) : "r" (value) /* , "m" (*p) */
                         : "memory");
 }
 #define AO_HAVE_or_full