Fix return type of AO_int_X primitives defined in ao_t_is_int header

(Apply commit 3e9fc4f from 'add-dbl-load-store' branch.)

* src/atomic_ops/sysdeps/ao_t_is_int.h
(AO_int_load_acquire, AO_int_fetch_and_add_full,
AO_int_fetch_and_add1_acquire, AO_int_fetch_and_add1_release,
AO_int_fetch_and_sub1_acquire, AO_int_fetch_and_sub1_release): Cast
result to unsigned int instead of signed int.

Conflicts:

    src/atomic_ops/sysdeps/ao_t_is_int.h

diff --git a/src/atomic_ops/sysdeps/ao_t_is_int.h b/src/atomic_ops/sysdeps/ao_t_is_int.h
index 8e57bb4782bf1966d2e7e772db1fb84973e37bb8..3e62d4fd4a66ffa1bc049903f789f209fd8f3123 100644 (file)
--- a/src/atomic_ops/sysdeps/ao_t_is_int.h
+++ b/src/atomic_ops/sysdeps/ao_t_is_int.h
@@ -79,7 +79,7 @@
 #if defined(AO_HAVE_load_acquire) && \
     !defined(AO_HAVE_int_load_acquire)
 #  define AO_int_load_acquire(addr) \
-        (int)AO_load_acquire((const volatile AO_t *)(addr))
+        (unsigned)AO_load_acquire((const volatile AO_t *)(addr))
 #  define AO_HAVE_int_load_acquire
 # endif
 
@@ -93,34 +93,34 @@
 #if defined(AO_HAVE_fetch_and_add_full) && \
     !defined(AO_HAVE_int_fetch_and_add_full)
 #  define AO_int_fetch_and_add_full(addr, incr) \
-        (int)AO_fetch_and_add_full((volatile AO_t *)(addr), (AO_t)(incr))
+        (unsigned)AO_fetch_and_add_full((volatile AO_t *)(addr), (AO_t)(incr))
 #  define AO_HAVE_int_fetch_and_add_full
 # endif
 
 #if defined(AO_HAVE_fetch_and_add1_acquire) && \
     !defined(AO_HAVE_int_fetch_and_add1_acquire)
 #  define AO_int_fetch_and_add1_acquire(addr) \
-        (int)AO_fetch_and_add1_acquire((volatile AO_t *)(addr))
+        (unsigned)AO_fetch_and_add1_acquire((volatile AO_t *)(addr))
 #  define AO_HAVE_int_fetch_and_add1_acquire
 # endif
 
 #if defined(AO_HAVE_fetch_and_add1_release) && \
     !defined(AO_HAVE_int_fetch_and_add1_release)
 #  define AO_int_fetch_and_add1_release(addr) \
-        (int)AO_fetch_and_add1_release((volatile AO_t *)(addr))
+        (unsigned)AO_fetch_and_add1_release((volatile AO_t *)(addr))
 #  define AO_HAVE_int_fetch_and_add1_release
 # endif
 
 #if defined(AO_HAVE_fetch_and_sub1_acquire) && \
     !defined(AO_HAVE_int_fetch_and_sub1_acquire)
 #  define AO_int_fetch_and_sub1_acquire(addr) \
-        (int)AO_fetch_and_sub1_acquire((volatile AO_t *)(addr))
+        (unsigned)AO_fetch_and_sub1_acquire((volatile AO_t *)(addr))
 #  define AO_HAVE_int_fetch_and_sub1_acquire
 # endif
 
 #if defined(AO_HAVE_fetch_and_sub1_release) && \
     !defined(AO_HAVE_int_fetch_and_sub1_release)
 #  define AO_int_fetch_and_sub1_release(addr) \
-        (int)AO_fetch_and_sub1_release((volatile AO_t *)(addr))
+        (unsigned)AO_fetch_and_sub1_release((volatile AO_t *)(addr))
 #  define AO_HAVE_int_fetch_and_sub1_release
 # endif