2011-06-03 Ivan Maidanski <ivmai@mail.ru>

	* src/atomic_ops/generalize-small.template
	(AO_HAVE_XSIZE_fetch_and_add_full): Add missing definition.
	* src/atomic_ops/generalize-small.template: Reformat code.
	* src/atomic_ops/generalize-small.h: Regenerate.

diff --git a/ChangeLog b/ChangeLog
index fc22a51..316d8e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-06-03  Ivan Maidanski  <ivmai@mail.ru>
 
+       * src/atomic_ops/generalize-small.template
+       (AO_HAVE_XSIZE_fetch_and_add_full): Add missing definition.
+       * src/atomic_ops/generalize-small.template: Reformat code.
+       * src/atomic_ops/generalize-small.h: Regenerate.
+
+2011-06-03  Ivan Maidanski  <ivmai@mail.ru>
+
        * src/atomic_ops/sysdeps/aligned_atomic_load_store.h: Remove
        blank line between AO_func and AO_HAVE_func definitions.
        * src/atomic_ops/sysdeps/atomic_load_store.h: Ditto.

diff --git a/src/atomic_ops/generalize-small.h b/src/atomic_ops/generalize-small.h
index 067b0f0..6548736 100644 (file)
--- a/src/atomic_ops/generalize-small.h
+++ b/src/atomic_ops/generalize-small.h
@@ -1,1724 +1,1749 @@
+/*
+ * Copyright (c) 2003-2004 Hewlett-Packard Development Company, L.P.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
 /* char_load */
 #if defined(AO_HAVE_char_load_acquire) && !defined(AO_HAVE_char_load)
-#  define AO_char_load(addr) AO_char_load_acquire(addr)
-#  define AO_HAVE_char_load
+# define AO_char_load(addr) AO_char_load_acquire(addr)
+# define AO_HAVE_char_load
 #endif
 
 #if defined(AO_HAVE_char_load_full) && !defined(AO_HAVE_char_load_acquire)
-#  define AO_char_load_acquire(addr) AO_char_load_full(addr)
-#  define AO_HAVE_char_load_acquire
+# define AO_char_load_acquire(addr) AO_char_load_full(addr)
+# define AO_HAVE_char_load_acquire
 #endif
 
 #if defined(AO_HAVE_char_load_full) && !defined(AO_HAVE_char_load_read)
-#  define AO_char_load_read(addr) AO_char_load_full(addr)
-#  define AO_HAVE_char_load_read
+# define AO_char_load_read(addr) AO_char_load_full(addr)
+# define AO_HAVE_char_load_read
 #endif
 
-#if !defined(AO_HAVE_char_load_acquire_read) && defined(AO_HAVE_char_load_acquire)
-#  define AO_char_load_acquire_read(addr) AO_char_load_acquire(addr)
-#  define AO_HAVE_char_load_acquire_read
+#if !defined(AO_HAVE_char_load_acquire_read) \
+    && defined(AO_HAVE_char_load_acquire)
+# define AO_char_load_acquire_read(addr) AO_char_load_acquire(addr)
+# define AO_HAVE_char_load_acquire_read
 #endif
 
-#if defined(AO_HAVE_char_load) && defined(AO_HAVE_nop_full) && \
-    !defined(AO_HAVE_char_load_acquire)
-   AO_INLINE unsigned char
-   AO_char_load_acquire(const volatile unsigned char *addr)
-   {
-     unsigned char result = AO_char_load(addr);
-     /* Acquire barrier would be useless, since the load could be delayed  */
-     /* beyond it.                                                         */
-     AO_nop_full();
-     return result;
-   }
-#  define AO_HAVE_char_load_acquire
+#if defined(AO_HAVE_char_load) && defined(AO_HAVE_nop_full) \
+    && !defined(AO_HAVE_char_load_acquire)
+  AO_INLINE unsigned char
+  AO_char_load_acquire(const volatile unsigned char *addr)
+  {
+    unsigned char result = AO_char_load(addr);
+    /* Acquire barrier would be useless, since the load could be delayed    */
+    /* beyond it.                                                           */
+    AO_nop_full();
+    return result;
+  }
+# define AO_HAVE_char_load_acquire
 #endif
 
-#if defined(AO_HAVE_char_load) && defined(AO_HAVE_nop_read) && \
-    !defined(AO_HAVE_char_load_read)
-   AO_INLINE unsigned char
-   AO_char_load_read(const volatile unsigned char *addr)
-   {
-     unsigned char result = AO_char_load(addr);
-     /* Acquire barrier would be useless, since the load could be delayed  */
-     /* beyond it.                                                         */
-     AO_nop_read();
-     return result;
-   }
-#  define AO_HAVE_char_load_read
+#if defined(AO_HAVE_char_load) && defined(AO_HAVE_nop_read) \
+    && !defined(AO_HAVE_char_load_read)
+  AO_INLINE unsigned char
+  AO_char_load_read(const volatile unsigned char *addr)
+  {
+    unsigned char result = AO_char_load(addr);
+    /* Acquire barrier would be useless, since the load could be delayed    */
+    /* beyond it.                                                           */
+    AO_nop_read();
+    return result;
+  }
+# define AO_HAVE_char_load_read
 #endif
 
-#if defined(AO_HAVE_char_load_acquire) && defined(AO_HAVE_nop_full) && \
-    !defined(AO_HAVE_char_load_full)
-#  define AO_char_load_full(addr) (AO_nop_full(), AO_char_load_acquire(addr))
-#  define AO_HAVE_char_load_full
+#if defined(AO_HAVE_char_load_acquire) && defined(AO_HAVE_nop_full) \
+    && !defined(AO_HAVE_char_load_full)
+# define AO_char_load_full(addr) (AO_nop_full(), AO_char_load_acquire(addr))
+# define AO_HAVE_char_load_full
 #endif
 
-#if !defined(AO_HAVE_char_load_acquire_read) && defined(AO_HAVE_char_load_read)
-#  define AO_char_load_acquire_read(addr) AO_char_load_read(addr)
-#  define AO_HAVE_char_load_acquire_read
+#if !defined(AO_HAVE_char_load_acquire_read) \
+    && defined(AO_HAVE_char_load_read)
+# define AO_char_load_acquire_read(addr) AO_char_load_read(addr)
+# define AO_HAVE_char_load_acquire_read
 #endif
 
 #if defined(AO_HAVE_char_load_acquire_read) && !defined(AO_HAVE_char_load)
-#  define AO_char_load(addr) AO_char_load_acquire_read(addr)
-#  define AO_HAVE_char_load
+# define AO_char_load(addr) AO_char_load_acquire_read(addr)
+# define AO_HAVE_char_load
 #endif
 
 #ifdef AO_NO_DD_ORDERING
-#  if defined(AO_HAVE_char_load_acquire_read)
-#    define AO_char_load_dd_acquire_read(addr) \
-        AO_char_load_acquire_read(addr)
-#    define AO_HAVE_char_load_dd_acquire_read
-#  endif
+# if defined(AO_HAVE_char_load_acquire_read)
+#   define AO_char_load_dd_acquire_read(addr) AO_char_load_acquire_read(addr)
+#   define AO_HAVE_char_load_dd_acquire_read
+# endif
 #else
-#  if defined(AO_HAVE_char_load)
-#    define AO_char_load_dd_acquire_read(addr) \
-        AO_char_load(addr)
-#    define AO_HAVE_char_load_dd_acquire_read
-#  endif
-#endif
-
+# if defined(AO_HAVE_char_load)
+#   define AO_char_load_dd_acquire_read(addr) AO_char_load(addr)
+#   define AO_HAVE_char_load_dd_acquire_read
+# endif
+#endif /* !AO_NO_DD_ORDERING */
 
 /* char_store */
-
 #if defined(AO_HAVE_char_store_release) && !defined(AO_HAVE_char_store)
-#  define AO_char_store(addr, val) AO_char_store_release(addr,val)
-#  define AO_HAVE_char_store
+# define AO_char_store(addr, val) AO_char_store_release(addr,val)
+# define AO_HAVE_char_store
 #endif
 
 #if defined(AO_HAVE_char_store_full) && !defined(AO_HAVE_char_store_release)
-#  define AO_char_store_release(addr,val) AO_char_store_full(addr,val)
-#  define AO_HAVE_char_store_release
+# define AO_char_store_release(addr,val) AO_char_store_full(addr,val)
+# define AO_HAVE_char_store_release
 #endif
 
 #if defined(AO_HAVE_char_store_full) && !defined(AO_HAVE_char_store_write)
-#  define AO_char_store_write(addr,val) AO_char_store_full(addr,val)
-#  define AO_HAVE_char_store_write
+# define AO_char_store_write(addr,val) AO_char_store_full(addr,val)
+# define AO_HAVE_char_store_write
 #endif
 
-#if defined(AO_HAVE_char_store_release) && \
-        !defined(AO_HAVE_char_store_release_write)
-#  define AO_char_store_release_write(addr, val) \
-        AO_char_store_release(addr,val)
-#  define AO_HAVE_char_store_release_write
+#if defined(AO_HAVE_char_store_release) \
+    && !defined(AO_HAVE_char_store_release_write)
+# define AO_char_store_release_write(addr, val) \
+                            AO_char_store_release(addr,val)
+# define AO_HAVE_char_store_release_write
 #endif
 
 #if defined(AO_HAVE_char_store_write) && !defined(AO_HAVE_char_store)
-#  define AO_char_store(addr, val) AO_char_store_write(addr,val)
-#  define AO_HAVE_char_store
+# define AO_char_store(addr, val) AO_char_store_write(addr,val)
+# define AO_HAVE_char_store
 #endif
 
-#if defined(AO_HAVE_char_store) && defined(AO_HAVE_nop_full) && \
-    !defined(AO_HAVE_char_store_release)
-#  define AO_char_store_release(addr,val) \
-        (AO_nop_full(), AO_char_store(addr,val))
-#  define AO_HAVE_char_store_release
+#if defined(AO_HAVE_char_store) && defined(AO_HAVE_nop_full) \
+    && !defined(AO_HAVE_char_store_release)
+# define AO_char_store_release(addr,val) \
+                                (AO_nop_full(), AO_char_store(addr,val))
+# define AO_HAVE_char_store_release
 #endif
 
-#if defined(AO_HAVE_nop_write) && defined(AO_HAVE_char_store) && \
-     !defined(AO_HAVE_char_store_write)
-#  define AO_char_store_write(addr, val) \
-        (AO_nop_write(), AO_char_store(addr,val))
-#  define AO_HAVE_char_store_write
+#if defined(AO_HAVE_nop_write) && defined(AO_HAVE_char_store) \
+    && !defined(AO_HAVE_char_store_write)
+# define AO_char_store_write(addr, val) \
+                                (AO_nop_write(), AO_char_store(addr,val))
+# define AO_HAVE_char_store_write
 #endif
 
-#if defined(AO_HAVE_char_store_write) && \
-     !defined(AO_HAVE_char_store_release_write)
-#  define AO_char_store_release_write(addr, val) AO_char_store_write(addr,val)
-#  define AO_HAVE_char_store_release_write
+#if defined(AO_HAVE_char_store_write) \
+    && !defined(AO_HAVE_char_store_release_write)
+# define AO_char_store_release_write(addr, val) AO_char_store_write(addr,val)
+# define AO_HAVE_char_store_release_write
 #endif
 
-#if defined(AO_HAVE_char_store_release) && defined(AO_HAVE_nop_full) && \
-    !defined(AO_HAVE_char_store_full)
-#  define AO_char_store_full(addr, val) \
-        (AO_char_store_release(addr, val), AO_nop_full())
-#  define AO_HAVE_char_store_full
+#if defined(AO_HAVE_char_store_release) && defined(AO_HAVE_nop_full) \
+    && !defined(AO_HAVE_char_store_full)
+# define AO_char_store_full(addr, val) \
+                        (AO_char_store_release(addr, val), AO_nop_full())
+# define AO_HAVE_char_store_full
 #endif
 
-
 /* char_fetch_and_add */
-#if defined(AO_HAVE_char_compare_and_swap_full) && \
-    !defined(AO_HAVE_char_fetch_and_add_full)
-   AO_INLINE AO_t
-   AO_char_fetch_and_add_full(volatile unsigned char *addr,
-                               unsigned char incr)
-   {
-     unsigned char old;
-     do
-       {
-         old = *addr;
-       }
-     while (!AO_char_compare_and_swap_full(addr, old, old+incr));
-     return old;
-   }
-#  define AO_HAVE_char_fetch_and_add_full
-#endif
-
-#if defined(AO_HAVE_char_compare_and_swap_acquire) && \
-    !defined(AO_HAVE_char_fetch_and_add_acquire)
-   AO_INLINE AO_t
-   AO_char_fetch_and_add_acquire(volatile unsigned char *addr,
-                                  unsigned char incr)
-   {
-     unsigned char old;
-     do
-       {
-         old = *addr;
-       }
-     while (!AO_char_compare_and_swap_acquire(addr, old, old+incr));
-     return old;
-   }
-#  define AO_HAVE_char_fetch_and_add_acquire
-#endif
-
-#if defined(AO_HAVE_char_compare_and_swap_release) && \
-    !defined(AO_HAVE_char_fetch_and_add_release)
-   AO_INLINE AO_t
-   AO_char_fetch_and_add_release(volatile unsigned char *addr,
-                                  unsigned char incr)
-   {
-     unsigned char old;
-     do
-       {
-         old = *addr;
-       }
-     while (!AO_char_compare_and_swap_release(addr, old, old+incr));
-     return old;
-   }
-#  define AO_HAVE_char_fetch_and_add_release
+#if defined(AO_HAVE_char_compare_and_swap_full) \
+    && !defined(AO_HAVE_char_fetch_and_add_full)
+  AO_INLINE AO_t
+  AO_char_fetch_and_add_full(volatile unsigned char *addr,
+                              unsigned char incr)
+  {
+    unsigned char old;
+    do
+      {
+        old = *addr;
+      }
+    while (!AO_char_compare_and_swap_full(addr, old, old+incr));
+    return old;
+  }
+# define AO_HAVE_char_fetch_and_add_full
+#endif
+
+#if defined(AO_HAVE_char_compare_and_swap_acquire) \
+    && !defined(AO_HAVE_char_fetch_and_add_acquire)
+  AO_INLINE AO_t
+  AO_char_fetch_and_add_acquire(volatile unsigned char *addr,
+                                 unsigned char incr)
+  {
+    unsigned char old;
+    do
+      {
+        old = *addr;
+      }
+    while (!AO_char_compare_and_swap_acquire(addr, old, old+incr));
+    return old;
+  }
+# define AO_HAVE_char_fetch_and_add_acquire
+#endif
+
+#if defined(AO_HAVE_char_compare_and_swap_release) \
+    && !defined(AO_HAVE_char_fetch_and_add_release)
+  AO_INLINE AO_t
+  AO_char_fetch_and_add_release(volatile unsigned char *addr,
+                                 unsigned char incr)
+  {
+    unsigned char old;
+    do
+      {
+        old = *addr;
+      }
+    while (!AO_char_compare_and_swap_release(addr, old, old+incr));
+    return old;
+  }
+# define AO_HAVE_char_fetch_and_add_release
 #endif
 
 #if defined(AO_HAVE_char_fetch_and_add_full)
-#  if !defined(AO_HAVE_char_fetch_and_add_release)
-#    define AO_char_fetch_and_add_release(addr, val) \
-         AO_char_fetch_and_add_full(addr, val)
-#    define AO_HAVE_char_fetch_and_add_release
-#  endif
-#  if !defined(AO_HAVE_char_fetch_and_add_acquire)
-#    define AO_char_fetch_and_add_acquire(addr, val) \
-         AO_char_fetch_and_add_full(addr, val)
-#    define AO_HAVE_char_fetch_and_add_acquire
-#  endif
-#  if !defined(AO_HAVE_char_fetch_and_add_write)
-#    define AO_char_fetch_and_add_write(addr, val) \
-         AO_char_fetch_and_add_full(addr, val)
-#    define AO_HAVE_char_fetch_and_add_write
-#  endif
-#  if !defined(AO_HAVE_char_fetch_and_add_read)
-#    define AO_char_fetch_and_add_read(addr, val) \
-         AO_char_fetch_and_add_full(addr, val)
-#    define AO_HAVE_char_fetch_and_add_read
-#  endif
+# if !defined(AO_HAVE_char_fetch_and_add_release)
+#   define AO_char_fetch_and_add_release(addr, val) \
+                                AO_char_fetch_and_add_full(addr, val)
+#   define AO_HAVE_char_fetch_and_add_release
+# endif
+# if !defined(AO_HAVE_char_fetch_and_add_acquire)
+#   define AO_char_fetch_and_add_acquire(addr, val) \
+                                AO_char_fetch_and_add_full(addr, val)
+#   define AO_HAVE_char_fetch_and_add_acquire
+# endif
+# if !defined(AO_HAVE_char_fetch_and_add_write)
+#   define AO_char_fetch_and_add_write(addr, val) \
+                                AO_char_fetch_and_add_full(addr, val)
+#   define AO_HAVE_char_fetch_and_add_write
+# endif
+# if !defined(AO_HAVE_char_fetch_and_add_read)
+#   define AO_char_fetch_and_add_read(addr, val) \
+                                AO_char_fetch_and_add_full(addr, val)
+#   define AO_HAVE_char_fetch_and_add_read
+# endif
 #endif /* AO_HAVE_char_fetch_and_add_full */
 
-#if !defined(AO_HAVE_char_fetch_and_add) && \
-    defined(AO_HAVE_char_fetch_and_add_release)
-#  define AO_char_fetch_and_add(addr, val) \
-        AO_char_fetch_and_add_release(addr, val)
-#  define AO_HAVE_char_fetch_and_add
-#endif
-#if !defined(AO_HAVE_char_fetch_and_add) && \
-    defined(AO_HAVE_char_fetch_and_add_acquire)
-#  define AO_char_fetch_and_add(addr, val) \
-        AO_char_fetch_and_add_acquire(addr, val)
-#  define AO_HAVE_char_fetch_and_add
-#endif
-#if !defined(AO_HAVE_char_fetch_and_add) && \
-    defined(AO_HAVE_char_fetch_and_add_write)
-#  define AO_char_fetch_and_add(addr, val) \
-        AO_char_fetch_and_add_write(addr, val)
-#  define AO_HAVE_char_fetch_and_add
-#endif
-#if !defined(AO_HAVE_char_fetch_and_add) && \
-    defined(AO_HAVE_char_fetch_and_add_read)
-#  define AO_char_fetch_and_add(addr, val) \
-        AO_char_fetch_and_add_read(addr, val)
-#  define AO_HAVE_char_fetch_and_add
-#endif
-
-#if defined(AO_HAVE_char_fetch_and_add_acquire) &&\
-    defined(AO_HAVE_nop_full) && \
-    !defined(AO_HAVE_char_fetch_and_add_full)
-#  define AO_char_fetch_and_add_full(addr, val) \
-        (AO_nop_full(), AO_char_fetch_and_add_acquire(addr, val))
-#endif
-
-#if !defined(AO_HAVE_char_fetch_and_add_release_write) && \
-    defined(AO_HAVE_char_fetch_and_add_write)
-#  define AO_char_fetch_and_add_release_write(addr, val) \
-        AO_char_fetch_and_add_write(addr, val)
-#  define AO_HAVE_char_fetch_and_add_release_write
-#endif
-#if !defined(AO_HAVE_char_fetch_and_add_release_write) && \
-    defined(AO_HAVE_char_fetch_and_add_release)
-#  define AO_char_fetch_and_add_release_write(addr, val) \
-        AO_char_fetch_and_add_release(addr, val)
-#  define AO_HAVE_char_fetch_and_add_release_write
-#endif
-#if !defined(AO_HAVE_char_fetch_and_add_acquire_read) && \
-    defined(AO_HAVE_char_fetch_and_add_read)
-#  define AO_char_fetch_and_add_acquire_read(addr, val) \
-        AO_char_fetch_and_add_read(addr, val)
-#  define AO_HAVE_char_fetch_and_add_acquire_read
-#endif
-#if !defined(AO_HAVE_char_fetch_and_add_acquire_read) && \
-    defined(AO_HAVE_char_fetch_and_add_acquire)
-#  define AO_char_fetch_and_add_acquire_read(addr, val) \
-        AO_char_fetch_and_add_acquire(addr, val)
-#  define AO_HAVE_char_fetch_and_add_acquire_read
+#if !defined(AO_HAVE_char_fetch_and_add) \
+    && defined(AO_HAVE_char_fetch_and_add_release)
+# define AO_char_fetch_and_add(addr, val) \
+                                AO_char_fetch_and_add_release(addr, val)
+# define AO_HAVE_char_fetch_and_add
+#endif
+#if !defined(AO_HAVE_char_fetch_and_add) \
+    && defined(AO_HAVE_char_fetch_and_add_acquire)
+# define AO_char_fetch_and_add(addr, val) \
+                                AO_char_fetch_and_add_acquire(addr, val)
+# define AO_HAVE_char_fetch_and_add
+#endif
+#if !defined(AO_HAVE_char_fetch_and_add) \
+    && defined(AO_HAVE_char_fetch_and_add_write)
+# define AO_char_fetch_and_add(addr, val) \
+                                AO_char_fetch_and_add_write(addr, val)
+# define AO_HAVE_char_fetch_and_add
+#endif
+#if !defined(AO_HAVE_char_fetch_and_add) \
+    && defined(AO_HAVE_char_fetch_and_add_read)
+# define AO_char_fetch_and_add(addr, val) \
+                                AO_char_fetch_and_add_read(addr, val)
+# define AO_HAVE_char_fetch_and_add
+#endif
+
+#if defined(AO_HAVE_char_fetch_and_add_acquire) \
+    && defined(AO_HAVE_nop_full) && !defined(AO_HAVE_char_fetch_and_add_full)
+# define AO_char_fetch_and_add_full(addr, val) \
+                (AO_nop_full(), AO_char_fetch_and_add_acquire(addr, val))
+# define AO_HAVE_char_fetch_and_add_full
+#endif
+
+#if !defined(AO_HAVE_char_fetch_and_add_release_write) \
+    && defined(AO_HAVE_char_fetch_and_add_write)
+# define AO_char_fetch_and_add_release_write(addr, val) \
+                                AO_char_fetch_and_add_write(addr, val)
+# define AO_HAVE_char_fetch_and_add_release_write
+#endif
+#if !defined(AO_HAVE_char_fetch_and_add_release_write) \
+    && defined(AO_HAVE_char_fetch_and_add_release)
+# define AO_char_fetch_and_add_release_write(addr, val) \
+                                AO_char_fetch_and_add_release(addr, val)
+# define AO_HAVE_char_fetch_and_add_release_write
+#endif
+
+#if !defined(AO_HAVE_char_fetch_and_add_acquire_read) \
+    && defined(AO_HAVE_char_fetch_and_add_read)
+# define AO_char_fetch_and_add_acquire_read(addr, val) \
+                                AO_char_fetch_and_add_read(addr, val)
+# define AO_HAVE_char_fetch_and_add_acquire_read
+#endif
+#if !defined(AO_HAVE_char_fetch_and_add_acquire_read) \
+    && defined(AO_HAVE_char_fetch_and_add_acquire)
+# define AO_char_fetch_and_add_acquire_read(addr, val) \
+                                AO_char_fetch_and_add_acquire(addr, val)
+# define AO_HAVE_char_fetch_and_add_acquire_read
 #endif
 
 #ifdef AO_NO_DD_ORDERING
-#  if defined(AO_HAVE_char_fetch_and_add_acquire_read)
-#    define AO_char_fetch_and_add_dd_acquire_read(addr, val) \
-        AO_char_fetch_and_add_acquire_read(addr, val)
-#    define AO_HAVE_char_fetch_and_add_dd_acquire_read
-#  endif
+# if defined(AO_HAVE_char_fetch_and_add_acquire_read)
+#   define AO_char_fetch_and_add_dd_acquire_read(addr, val) \
+                                AO_char_fetch_and_add_acquire_read(addr, val)
+#   define AO_HAVE_char_fetch_and_add_dd_acquire_read
+# endif
 #else
-#  if defined(AO_HAVE_char_fetch_and_add)
-#    define AO_char_fetch_and_add_dd_acquire_read(addr, val) \
-        AO_char_fetch_and_add(addr, val)
-#    define AO_HAVE_char_fetch_and_add_dd_acquire_read
-#  endif
-#endif
+# if defined(AO_HAVE_char_fetch_and_add)
+#   define AO_char_fetch_and_add_dd_acquire_read(addr, val) \
+                                AO_char_fetch_and_add(addr, val)
+#   define AO_HAVE_char_fetch_and_add_dd_acquire_read
+# endif
+#endif /* !AO_NO_DD_ORDERING */
 
 /* char_fetch_and_add1 */
-
-#if defined(AO_HAVE_char_fetch_and_add_full) &&\
-    !defined(AO_HAVE_char_fetch_and_add1_full)
-#  define AO_char_fetch_and_add1_full(addr) \
-        AO_char_fetch_and_add_full(addr,1)
-#  define AO_HAVE_char_fetch_and_add1_full
-#endif
-#if defined(AO_HAVE_char_fetch_and_add_release) &&\
-    !defined(AO_HAVE_char_fetch_and_add1_release)
-#  define AO_char_fetch_and_add1_release(addr) \
-        AO_char_fetch_and_add_release(addr,1)
-#  define AO_HAVE_char_fetch_and_add1_release
-#endif
-#if defined(AO_HAVE_char_fetch_and_add_acquire) &&\
-    !defined(AO_HAVE_char_fetch_and_add1_acquire)
-#  define AO_char_fetch_and_add1_acquire(addr) \
-        AO_char_fetch_and_add_acquire(addr,1)
-#  define AO_HAVE_char_fetch_and_add1_acquire
-#endif
-#if defined(AO_HAVE_char_fetch_and_add_write) &&\
-    !defined(AO_HAVE_char_fetch_and_add1_write)
-#  define AO_char_fetch_and_add1_write(addr) \
-        AO_char_fetch_and_add_write(addr,1)
-#  define AO_HAVE_char_fetch_and_add1_write
-#endif
-#if defined(AO_HAVE_char_fetch_and_add_read) &&\
-    !defined(AO_HAVE_char_fetch_and_add1_read)
-#  define AO_char_fetch_and_add1_read(addr) \
-        AO_char_fetch_and_add_read(addr,1)
-#  define AO_HAVE_char_fetch_and_add1_read
-#endif
-#if defined(AO_HAVE_char_fetch_and_add_release_write) &&\
-    !defined(AO_HAVE_char_fetch_and_add1_release_write)
-#  define AO_char_fetch_and_add1_release_write(addr) \
-        AO_char_fetch_and_add_release_write(addr,1)
-#  define AO_HAVE_char_fetch_and_add1_release_write
-#endif
-#if defined(AO_HAVE_char_fetch_and_add_acquire_read) &&\
-    !defined(AO_HAVE_char_fetch_and_add1_acquire_read)
-#  define AO_char_fetch_and_add1_acquire_read(addr) \
-        AO_char_fetch_and_add_acquire_read(addr,1)
-#  define AO_HAVE_char_fetch_and_add1_acquire_read
-#endif
-#if defined(AO_HAVE_char_fetch_and_add) &&\
-    !defined(AO_HAVE_char_fetch_and_add1)
-#  define AO_char_fetch_and_add1(addr) \
-        AO_char_fetch_and_add(addr,1)
-#  define AO_HAVE_char_fetch_and_add1
+#if defined(AO_HAVE_char_fetch_and_add_full) \
+    && !defined(AO_HAVE_char_fetch_and_add1_full)
+# define AO_char_fetch_and_add1_full(addr) \
+                                AO_char_fetch_and_add_full(addr,1)
+# define AO_HAVE_char_fetch_and_add1_full
+#endif
+#if defined(AO_HAVE_char_fetch_and_add_release) \
+    && !defined(AO_HAVE_char_fetch_and_add1_release)
+# define AO_char_fetch_and_add1_release(addr) \
+                                AO_char_fetch_and_add_release(addr,1)
+# define AO_HAVE_char_fetch_and_add1_release
+#endif
+#if defined(AO_HAVE_char_fetch_and_add_acquire) \
+    && !defined(AO_HAVE_char_fetch_and_add1_acquire)
+# define AO_char_fetch_and_add1_acquire(addr) \
+                                AO_char_fetch_and_add_acquire(addr,1)
+# define AO_HAVE_char_fetch_and_add1_acquire
+#endif
+#if defined(AO_HAVE_char_fetch_and_add_write) \
+    && !defined(AO_HAVE_char_fetch_and_add1_write)
+# define AO_char_fetch_and_add1_write(addr) \
+                                AO_char_fetch_and_add_write(addr,1)
+# define AO_HAVE_char_fetch_and_add1_write
+#endif
+#if defined(AO_HAVE_char_fetch_and_add_read) \
+    && !defined(AO_HAVE_char_fetch_and_add1_read)
+# define AO_char_fetch_and_add1_read(addr) \
+                                AO_char_fetch_and_add_read(addr,1)
+# define AO_HAVE_char_fetch_and_add1_read
+#endif
+#if defined(AO_HAVE_char_fetch_and_add_release_write) \
+    && !defined(AO_HAVE_char_fetch_and_add1_release_write)
+# define AO_char_fetch_and_add1_release_write(addr) \
+                                AO_char_fetch_and_add_release_write(addr,1)
+# define AO_HAVE_char_fetch_and_add1_release_write
+#endif
+#if defined(AO_HAVE_char_fetch_and_add_acquire_read) \
+    && !defined(AO_HAVE_char_fetch_and_add1_acquire_read)
+# define AO_char_fetch_and_add1_acquire_read(addr) \
+                                AO_char_fetch_and_add_acquire_read(addr,1)
+# define AO_HAVE_char_fetch_and_add1_acquire_read
+#endif
+#if defined(AO_HAVE_char_fetch_and_add) \
+    && !defined(AO_HAVE_char_fetch_and_add1)
+# define AO_char_fetch_and_add1(addr) AO_char_fetch_and_add(addr,1)
+# define AO_HAVE_char_fetch_and_add1
 #endif
 
 #if defined(AO_HAVE_char_fetch_and_add1_full)
-#  if !defined(AO_HAVE_char_fetch_and_add1_release)
-#    define AO_char_fetch_and_add1_release(addr) \
-         AO_char_fetch_and_add1_full(addr)
-#    define AO_HAVE_char_fetch_and_add1_release
-#  endif
-#  if !defined(AO_HAVE_char_fetch_and_add1_acquire)
-#    define AO_char_fetch_and_add1_acquire(addr) \
-         AO_char_fetch_and_add1_full(addr)
-#    define AO_HAVE_char_fetch_and_add1_acquire
-#  endif
-#  if !defined(AO_HAVE_char_fetch_and_add1_write)
-#    define AO_char_fetch_and_add1_write(addr) \
-         AO_char_fetch_and_add1_full(addr)
-#    define AO_HAVE_char_fetch_and_add1_write
-#  endif
-#  if !defined(AO_HAVE_char_fetch_and_add1_read)
-#    define AO_char_fetch_and_add1_read(addr) \
-         AO_char_fetch_and_add1_full(addr)
-#    define AO_HAVE_char_fetch_and_add1_read
-#  endif
+# if !defined(AO_HAVE_char_fetch_and_add1_release)
+#   define AO_char_fetch_and_add1_release(addr) \
+                                AO_char_fetch_and_add1_full(addr)
+#   define AO_HAVE_char_fetch_and_add1_release
+# endif
+# if !defined(AO_HAVE_char_fetch_and_add1_acquire)
+#   define AO_char_fetch_and_add1_acquire(addr) \
+                                AO_char_fetch_and_add1_full(addr)
+#   define AO_HAVE_char_fetch_and_add1_acquire
+# endif
+# if !defined(AO_HAVE_char_fetch_and_add1_write)
+#   define AO_char_fetch_and_add1_write(addr) \
+                                AO_char_fetch_and_add1_full(addr)
+#   define AO_HAVE_char_fetch_and_add1_write
+# endif
+# if !defined(AO_HAVE_char_fetch_and_add1_read)
+#   define AO_char_fetch_and_add1_read(addr) \
+                                AO_char_fetch_and_add1_full(addr)
+#   define AO_HAVE_char_fetch_and_add1_read
+# endif
 #endif /* AO_HAVE_char_fetch_and_add1_full */
 
-#if !defined(AO_HAVE_char_fetch_and_add1) && \
-    defined(AO_HAVE_char_fetch_and_add1_release)
-#  define AO_char_fetch_and_add1(addr) \
-        AO_char_fetch_and_add1_release(addr)
-#  define AO_HAVE_char_fetch_and_add1
-#endif
-#if !defined(AO_HAVE_char_fetch_and_add1) && \
-    defined(AO_HAVE_char_fetch_and_add1_acquire)
-#  define AO_char_fetch_and_add1(addr) \
-        AO_char_fetch_and_add1_acquire(addr)
-#  define AO_HAVE_char_fetch_and_add1
-#endif
-#if !defined(AO_HAVE_char_fetch_and_add1) && \
-    defined(AO_HAVE_char_fetch_and_add1_write)
-#  define AO_char_fetch_and_add1(addr) \
-        AO_char_fetch_and_add1_write(addr)
-#  define AO_HAVE_char_fetch_and_add1
-#endif
-#if !defined(AO_HAVE_char_fetch_and_add1) && \
-    defined(AO_HAVE_char_fetch_and_add1_read)
-#  define AO_char_fetch_and_add1(addr) \
-        AO_char_fetch_and_add1_read(addr)
-#  define AO_HAVE_char_fetch_and_add1
-#endif
-
-#if defined(AO_HAVE_char_fetch_and_add1_acquire) &&\
-    defined(AO_HAVE_nop_full) && \
-    !defined(AO_HAVE_char_fetch_and_add1_full)
-#  define AO_char_fetch_and_add1_full(addr) \
-        (AO_nop_full(), AO_char_fetch_and_add1_acquire(addr))
-#  define AO_HAVE_char_fetch_and_add1_full
-#endif
-
-#if !defined(AO_HAVE_char_fetch_and_add1_release_write) && \
-    defined(AO_HAVE_char_fetch_and_add1_write)
-#  define AO_char_fetch_and_add1_release_write(addr) \
-        AO_char_fetch_and_add1_write(addr)
-#  define AO_HAVE_char_fetch_and_add1_release_write
-#endif
-#if !defined(AO_HAVE_char_fetch_and_add1_release_write) && \
-    defined(AO_HAVE_char_fetch_and_add1_release)
-#  define AO_char_fetch_and_add1_release_write(addr) \
-        AO_char_fetch_and_add1_release(addr)
-#  define AO_HAVE_char_fetch_and_add1_release_write
-#endif
-#if !defined(AO_HAVE_char_fetch_and_add1_acquire_read) && \
-    defined(AO_HAVE_char_fetch_and_add1_read)
-#  define AO_char_fetch_and_add1_acquire_read(addr) \
-        AO_char_fetch_and_add1_read(addr)
-#  define AO_HAVE_char_fetch_and_add1_acquire_read
-#endif
-#if !defined(AO_HAVE_char_fetch_and_add1_acquire_read) && \
-    defined(AO_HAVE_char_fetch_and_add1_acquire)
-#  define AO_char_fetch_and_add1_acquire_read(addr) \
-        AO_char_fetch_and_add1_acquire(addr)
-#  define AO_HAVE_char_fetch_and_add1_acquire_read
+#if !defined(AO_HAVE_char_fetch_and_add1) \
+    && defined(AO_HAVE_char_fetch_and_add1_release)
+# define AO_char_fetch_and_add1(addr) AO_char_fetch_and_add1_release(addr)
+# define AO_HAVE_char_fetch_and_add1
+#endif
+#if !defined(AO_HAVE_char_fetch_and_add1) \
+    && defined(AO_HAVE_char_fetch_and_add1_acquire)
+# define AO_char_fetch_and_add1(addr) AO_char_fetch_and_add1_acquire(addr)
+# define AO_HAVE_char_fetch_and_add1
+#endif
+#if !defined(AO_HAVE_char_fetch_and_add1) \
+    && defined(AO_HAVE_char_fetch_and_add1_write)
+# define AO_char_fetch_and_add1(addr) AO_char_fetch_and_add1_write(addr)
+# define AO_HAVE_char_fetch_and_add1
+#endif
+#if !defined(AO_HAVE_char_fetch_and_add1) \
+    && defined(AO_HAVE_char_fetch_and_add1_read)
+# define AO_char_fetch_and_add1(addr) AO_char_fetch_and_add1_read(addr)
+# define AO_HAVE_char_fetch_and_add1
+#endif
+
+#if defined(AO_HAVE_char_fetch_and_add1_acquire) \
+    && defined(AO_HAVE_nop_full) \
+    && !defined(AO_HAVE_char_fetch_and_add1_full)
+# define AO_char_fetch_and_add1_full(addr) \
+                        (AO_nop_full(), AO_char_fetch_and_add1_acquire(addr))
+# define AO_HAVE_char_fetch_and_add1_full
+#endif
+
+#if !defined(AO_HAVE_char_fetch_and_add1_release_write) \
+    && defined(AO_HAVE_char_fetch_and_add1_write)
+# define AO_char_fetch_and_add1_release_write(addr) \
+                                AO_char_fetch_and_add1_write(addr)
+# define AO_HAVE_char_fetch_and_add1_release_write
+#endif
+#if !defined(AO_HAVE_char_fetch_and_add1_release_write) \
+    && defined(AO_HAVE_char_fetch_and_add1_release)
+# define AO_char_fetch_and_add1_release_write(addr) \
+                                AO_char_fetch_and_add1_release(addr)
+# define AO_HAVE_char_fetch_and_add1_release_write
+#endif
+#if !defined(AO_HAVE_char_fetch_and_add1_acquire_read) \
+    && defined(AO_HAVE_char_fetch_and_add1_read)
+# define AO_char_fetch_and_add1_acquire_read(addr) \
+                                AO_char_fetch_and_add1_read(addr)
+# define AO_HAVE_char_fetch_and_add1_acquire_read
+#endif
+#if !defined(AO_HAVE_char_fetch_and_add1_acquire_read) \
+    && defined(AO_HAVE_char_fetch_and_add1_acquire)
+# define AO_char_fetch_and_add1_acquire_read(addr) \
+                                AO_char_fetch_and_add1_acquire(addr)
+# define AO_HAVE_char_fetch_and_add1_acquire_read
 #endif
 
 #ifdef AO_NO_DD_ORDERING
-#  if defined(AO_HAVE_char_fetch_and_add1_acquire_read)
-#    define AO_char_fetch_and_add1_dd_acquire_read(addr) \
-        AO_char_fetch_and_add1_acquire_read(addr)
-#    define AO_HAVE_char_fetch_and_add1_dd_acquire_read
-#  endif
+# if defined(AO_HAVE_char_fetch_and_add1_acquire_read)
+#   define AO_char_fetch_and_add1_dd_acquire_read(addr) \
+                                AO_char_fetch_and_add1_acquire_read(addr)
+#   define AO_HAVE_char_fetch_and_add1_dd_acquire_read
+# endif
 #else
-#  if defined(AO_HAVE_char_fetch_and_add1)
-#    define AO_char_fetch_and_add1_dd_acquire_read(addr) \
-        AO_char_fetch_and_add1(addr)
-#    define AO_HAVE_char_fetch_and_add1_dd_acquire_read
-#  endif
-#endif
+# if defined(AO_HAVE_char_fetch_and_add1)
+#   define AO_char_fetch_and_add1_dd_acquire_read(addr) \
+                                AO_char_fetch_and_add1(addr)
+#   define AO_HAVE_char_fetch_and_add1_dd_acquire_read
+# endif
+#endif /* !AO_NO_DD_ORDERING */
 
 /* char_fetch_and_sub1 */
-
-#if defined(AO_HAVE_char_fetch_and_add_full) &&\
-    !defined(AO_HAVE_char_fetch_and_sub1_full)
-#  define AO_char_fetch_and_sub1_full(addr) \
-        AO_char_fetch_and_add_full(addr,(unsigned char)(-1))
-#  define AO_HAVE_char_fetch_and_sub1_full
-#endif
-#if defined(AO_HAVE_char_fetch_and_add_release) &&\
-    !defined(AO_HAVE_char_fetch_and_sub1_release)
-#  define AO_char_fetch_and_sub1_release(addr) \
-        AO_char_fetch_and_add_release(addr,(unsigned char)(-1))
-#  define AO_HAVE_char_fetch_and_sub1_release
-#endif
-#if defined(AO_HAVE_char_fetch_and_add_acquire) &&\
-    !defined(AO_HAVE_char_fetch_and_sub1_acquire)
-#  define AO_char_fetch_and_sub1_acquire(addr) \
-        AO_char_fetch_and_add_acquire(addr,(unsigned char)(-1))
-#  define AO_HAVE_char_fetch_and_sub1_acquire
-#endif
-#if defined(AO_HAVE_char_fetch_and_add_write) &&\
-    !defined(AO_HAVE_char_fetch_and_sub1_write)
-#  define AO_char_fetch_and_sub1_write(addr) \
-        AO_char_fetch_and_add_write(addr,(unsigned char)(-1))
-#  define AO_HAVE_char_fetch_and_sub1_write
-#endif
-#if defined(AO_HAVE_char_fetch_and_add_read) &&\
-    !defined(AO_HAVE_char_fetch_and_sub1_read)
-#  define AO_char_fetch_and_sub1_read(addr) \
-        AO_char_fetch_and_add_read(addr,(unsigned char)(-1))
-#  define AO_HAVE_char_fetch_and_sub1_read
-#endif
-#if defined(AO_HAVE_char_fetch_and_add_release_write) &&\
-    !defined(AO_HAVE_char_fetch_and_sub1_release_write)
-#  define AO_char_fetch_and_sub1_release_write(addr) \
+#if defined(AO_HAVE_char_fetch_and_add_full) \
+    && !defined(AO_HAVE_char_fetch_and_sub1_full)
+# define AO_char_fetch_and_sub1_full(addr) \
+                AO_char_fetch_and_add_full(addr,(unsigned char)(-1))
+# define AO_HAVE_char_fetch_and_sub1_full
+#endif
+#if defined(AO_HAVE_char_fetch_and_add_release) \
+    && !defined(AO_HAVE_char_fetch_and_sub1_release)
+# define AO_char_fetch_and_sub1_release(addr) \
+                AO_char_fetch_and_add_release(addr,(unsigned char)(-1))
+# define AO_HAVE_char_fetch_and_sub1_release
+#endif
+#if defined(AO_HAVE_char_fetch_and_add_acquire) \
+    && !defined(AO_HAVE_char_fetch_and_sub1_acquire)
+# define AO_char_fetch_and_sub1_acquire(addr) \
+                AO_char_fetch_and_add_acquire(addr,(unsigned char)(-1))
+# define AO_HAVE_char_fetch_and_sub1_acquire
+#endif
+#if defined(AO_HAVE_char_fetch_and_add_write) \
+    && !defined(AO_HAVE_char_fetch_and_sub1_write)
+# define AO_char_fetch_and_sub1_write(addr) \
+                AO_char_fetch_and_add_write(addr,(unsigned char)(-1))
+# define AO_HAVE_char_fetch_and_sub1_write
+#endif
+#if defined(AO_HAVE_char_fetch_and_add_read) \
+    && !defined(AO_HAVE_char_fetch_and_sub1_read)
+# define AO_char_fetch_and_sub1_read(addr) \
+                AO_char_fetch_and_add_read(addr,(unsigned char)(-1))
+# define AO_HAVE_char_fetch_and_sub1_read
+#endif
+#if defined(AO_HAVE_char_fetch_and_add_release_write) \
+    && !defined(AO_HAVE_char_fetch_and_sub1_release_write)
+# define AO_char_fetch_and_sub1_release_write(addr) \
         AO_char_fetch_and_add_release_write(addr,(unsigned char)(-1))
-#  define AO_HAVE_char_fetch_and_sub1_release_write
+# define AO_HAVE_char_fetch_and_sub1_release_write
 #endif
-#if defined(AO_HAVE_char_fetch_and_add_acquire_read) &&\
-    !defined(AO_HAVE_char_fetch_and_sub1_acquire_read)
-#  define AO_char_fetch_and_sub1_acquire_read(addr) \
+#if defined(AO_HAVE_char_fetch_and_add_acquire_read) \
+    && !defined(AO_HAVE_char_fetch_and_sub1_acquire_read)
+# define AO_char_fetch_and_sub1_acquire_read(addr) \
         AO_char_fetch_and_add_acquire_read(addr,(unsigned char)(-1))
-#  define AO_HAVE_char_fetch_and_sub1_acquire_read
+# define AO_HAVE_char_fetch_and_sub1_acquire_read
 #endif
-#if defined(AO_HAVE_char_fetch_and_add) &&\
-    !defined(AO_HAVE_char_fetch_and_sub1)
-#  define AO_char_fetch_and_sub1(addr) \
-        AO_char_fetch_and_add(addr,(unsigned char)(-1))
-#  define AO_HAVE_char_fetch_and_sub1
+#if defined(AO_HAVE_char_fetch_and_add) \
+    && !defined(AO_HAVE_char_fetch_and_sub1)
+# define AO_char_fetch_and_sub1(addr) \
+                AO_char_fetch_and_add(addr,(unsigned char)(-1))
+# define AO_HAVE_char_fetch_and_sub1
 #endif
 
 #if defined(AO_HAVE_char_fetch_and_sub1_full)
-#  if !defined(AO_HAVE_char_fetch_and_sub1_release)
-#    define AO_char_fetch_and_sub1_release(addr) \
-         AO_char_fetch_and_sub1_full(addr)
-#    define AO_HAVE_char_fetch_and_sub1_release
-#  endif
-#  if !defined(AO_HAVE_char_fetch_and_sub1_acquire)
-#    define AO_char_fetch_and_sub1_acquire(addr) \
-         AO_char_fetch_and_sub1_full(addr)
-#    define AO_HAVE_char_fetch_and_sub1_acquire
-#  endif
-#  if !defined(AO_HAVE_char_fetch_and_sub1_write)
-#    define AO_char_fetch_and_sub1_write(addr) \
-         AO_char_fetch_and_sub1_full(addr)
-#    define AO_HAVE_char_fetch_and_sub1_write
-#  endif
-#  if !defined(AO_HAVE_char_fetch_and_sub1_read)
-#    define AO_char_fetch_and_sub1_read(addr) \
-         AO_char_fetch_and_sub1_full(addr)
-#    define AO_HAVE_char_fetch_and_sub1_read
-#  endif
+# if !defined(AO_HAVE_char_fetch_and_sub1_release)
+#   define AO_char_fetch_and_sub1_release(addr) \
+                                AO_char_fetch_and_sub1_full(addr)
+#   define AO_HAVE_char_fetch_and_sub1_release
+# endif
+# if !defined(AO_HAVE_char_fetch_and_sub1_acquire)
+#   define AO_char_fetch_and_sub1_acquire(addr) \
+                                AO_char_fetch_and_sub1_full(addr)
+#   define AO_HAVE_char_fetch_and_sub1_acquire
+# endif
+# if !defined(AO_HAVE_char_fetch_and_sub1_write)
+#   define AO_char_fetch_and_sub1_write(addr) \
+                                AO_char_fetch_and_sub1_full(addr)
+#   define AO_HAVE_char_fetch_and_sub1_write
+# endif
+# if !defined(AO_HAVE_char_fetch_and_sub1_read)
+#   define AO_char_fetch_and_sub1_read(addr) \
+                                AO_char_fetch_and_sub1_full(addr)
+#   define AO_HAVE_char_fetch_and_sub1_read
+# endif
 #endif /* AO_HAVE_char_fetch_and_sub1_full */
 
-#if !defined(AO_HAVE_char_fetch_and_sub1) && \
-    defined(AO_HAVE_char_fetch_and_sub1_release)
-#  define AO_char_fetch_and_sub1(addr) \
-        AO_char_fetch_and_sub1_release(addr)
-#  define AO_HAVE_char_fetch_and_sub1
-#endif
-#if !defined(AO_HAVE_char_fetch_and_sub1) && \
-    defined(AO_HAVE_char_fetch_and_sub1_acquire)
-#  define AO_char_fetch_and_sub1(addr) \
-        AO_char_fetch_and_sub1_acquire(addr)
-#  define AO_HAVE_char_fetch_and_sub1
-#endif
-#if !defined(AO_HAVE_char_fetch_and_sub1) && \
-    defined(AO_HAVE_char_fetch_and_sub1_write)
-#  define AO_char_fetch_and_sub1(addr) \
-        AO_char_fetch_and_sub1_write(addr)
-#  define AO_HAVE_char_fetch_and_sub1
-#endif
-#if !defined(AO_HAVE_char_fetch_and_sub1) && \
-    defined(AO_HAVE_char_fetch_and_sub1_read)
-#  define AO_char_fetch_and_sub1(addr) \
-        AO_char_fetch_and_sub1_read(addr)
-#  define AO_HAVE_char_fetch_and_sub1
-#endif
-
-#if defined(AO_HAVE_char_fetch_and_sub1_acquire) &&\
-    defined(AO_HAVE_nop_full) && \
-    !defined(AO_HAVE_char_fetch_and_sub1_full)
-#  define AO_char_fetch_and_sub1_full(addr) \
-        (AO_nop_full(), AO_char_fetch_and_sub1_acquire(addr))
-#  define AO_HAVE_char_fetch_and_sub1_full
-#endif
-
-#if !defined(AO_HAVE_char_fetch_and_sub1_release_write) && \
-    defined(AO_HAVE_char_fetch_and_sub1_write)
-#  define AO_char_fetch_and_sub1_release_write(addr) \
-        AO_char_fetch_and_sub1_write(addr)
-#  define AO_HAVE_char_fetch_and_sub1_release_write
-#endif
-#if !defined(AO_HAVE_char_fetch_and_sub1_release_write) && \
-    defined(AO_HAVE_char_fetch_and_sub1_release)
-#  define AO_char_fetch_and_sub1_release_write(addr) \
-        AO_char_fetch_and_sub1_release(addr)
-#  define AO_HAVE_char_fetch_and_sub1_release_write
-#endif
-#if !defined(AO_HAVE_char_fetch_and_sub1_acquire_read) && \
-    defined(AO_HAVE_char_fetch_and_sub1_read)
-#  define AO_char_fetch_and_sub1_acquire_read(addr) \
-        AO_char_fetch_and_sub1_read(addr)
-#  define AO_HAVE_char_fetch_and_sub1_acquire_read
-#endif
-#if !defined(AO_HAVE_char_fetch_and_sub1_acquire_read) && \
-    defined(AO_HAVE_char_fetch_and_sub1_acquire)
-#  define AO_char_fetch_and_sub1_acquire_read(addr) \
-        AO_char_fetch_and_sub1_acquire(addr)
-#  define AO_HAVE_char_fetch_and_sub1_acquire_read
+#if !defined(AO_HAVE_char_fetch_and_sub1) \
+    && defined(AO_HAVE_char_fetch_and_sub1_release)
+# define AO_char_fetch_and_sub1(addr) AO_char_fetch_and_sub1_release(addr)
+# define AO_HAVE_char_fetch_and_sub1
+#endif
+#if !defined(AO_HAVE_char_fetch_and_sub1) \
+    && defined(AO_HAVE_char_fetch_and_sub1_acquire)
+# define AO_char_fetch_and_sub1(addr) AO_char_fetch_and_sub1_acquire(addr)
+# define AO_HAVE_char_fetch_and_sub1
+#endif
+#if !defined(AO_HAVE_char_fetch_and_sub1) \
+    && defined(AO_HAVE_char_fetch_and_sub1_write)
+# define AO_char_fetch_and_sub1(addr) AO_char_fetch_and_sub1_write(addr)
+# define AO_HAVE_char_fetch_and_sub1
+#endif
+#if !defined(AO_HAVE_char_fetch_and_sub1) \
+    && defined(AO_HAVE_char_fetch_and_sub1_read)
+# define AO_char_fetch_and_sub1(addr) AO_char_fetch_and_sub1_read(addr)
+# define AO_HAVE_char_fetch_and_sub1
+#endif
+
+#if defined(AO_HAVE_char_fetch_and_sub1_acquire) \
+    && defined(AO_HAVE_nop_full) \
+    && !defined(AO_HAVE_char_fetch_and_sub1_full)
+# define AO_char_fetch_and_sub1_full(addr) \
+                        (AO_nop_full(), AO_char_fetch_and_sub1_acquire(addr))
+# define AO_HAVE_char_fetch_and_sub1_full
+#endif
+
+#if !defined(AO_HAVE_char_fetch_and_sub1_release_write) \
+    && defined(AO_HAVE_char_fetch_and_sub1_write)
+# define AO_char_fetch_and_sub1_release_write(addr) \
+                                AO_char_fetch_and_sub1_write(addr)
+# define AO_HAVE_char_fetch_and_sub1_release_write
+#endif
+#if !defined(AO_HAVE_char_fetch_and_sub1_release_write) \
+    && defined(AO_HAVE_char_fetch_and_sub1_release)
+# define AO_char_fetch_and_sub1_release_write(addr) \
+                                AO_char_fetch_and_sub1_release(addr)
+# define AO_HAVE_char_fetch_and_sub1_release_write
+#endif
+#if !defined(AO_HAVE_char_fetch_and_sub1_acquire_read) \
+    && defined(AO_HAVE_char_fetch_and_sub1_read)
+# define AO_char_fetch_and_sub1_acquire_read(addr) \
+                                AO_char_fetch_and_sub1_read(addr)
+# define AO_HAVE_char_fetch_and_sub1_acquire_read
+#endif
+#if !defined(AO_HAVE_char_fetch_and_sub1_acquire_read) \
+    && defined(AO_HAVE_char_fetch_and_sub1_acquire)
+# define AO_char_fetch_and_sub1_acquire_read(addr) \
+                                AO_char_fetch_and_sub1_acquire(addr)
+# define AO_HAVE_char_fetch_and_sub1_acquire_read
 #endif
 
 #ifdef AO_NO_DD_ORDERING
-#  if defined(AO_HAVE_char_fetch_and_sub1_acquire_read)
-#    define AO_char_fetch_and_sub1_dd_acquire_read(addr) \
-        AO_char_fetch_and_sub1_acquire_read(addr)
-#    define AO_HAVE_char_fetch_and_sub1_dd_acquire_read
-#  endif
+# if defined(AO_HAVE_char_fetch_and_sub1_acquire_read)
+#   define AO_char_fetch_and_sub1_dd_acquire_read(addr) \
+                                AO_char_fetch_and_sub1_acquire_read(addr)
+#   define AO_HAVE_char_fetch_and_sub1_dd_acquire_read
+# endif
 #else
-#  if defined(AO_HAVE_char_fetch_and_sub1)
-#    define AO_char_fetch_and_sub1_dd_acquire_read(addr) \
-        AO_char_fetch_and_sub1(addr)
-#    define AO_HAVE_char_fetch_and_sub1_dd_acquire_read
-#  endif
-#endif
+# if defined(AO_HAVE_char_fetch_and_sub1)
+#   define AO_char_fetch_and_sub1_dd_acquire_read(addr) \
+                                AO_char_fetch_and_sub1(addr)
+#   define AO_HAVE_char_fetch_and_sub1_dd_acquire_read
+# endif
+#endif /* !AO_NO_DD_ORDERING */
+/*
+ * Copyright (c) 2003-2004 Hewlett-Packard Development Company, L.P.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
 
 /* short_load */
 #if defined(AO_HAVE_short_load_acquire) && !defined(AO_HAVE_short_load)
-#  define AO_short_load(addr) AO_short_load_acquire(addr)
-#  define AO_HAVE_short_load
+# define AO_short_load(addr) AO_short_load_acquire(addr)
+# define AO_HAVE_short_load
 #endif
 
 #if defined(AO_HAVE_short_load_full) && !defined(AO_HAVE_short_load_acquire)
-#  define AO_short_load_acquire(addr) AO_short_load_full(addr)
-#  define AO_HAVE_short_load_acquire
+# define AO_short_load_acquire(addr) AO_short_load_full(addr)
+# define AO_HAVE_short_load_acquire
 #endif
 
 #if defined(AO_HAVE_short_load_full) && !defined(AO_HAVE_short_load_read)
-#  define AO_short_load_read(addr) AO_short_load_full(addr)
-#  define AO_HAVE_short_load_read
+# define AO_short_load_read(addr) AO_short_load_full(addr)
+# define AO_HAVE_short_load_read
 #endif
 
-#if !defined(AO_HAVE_short_load_acquire_read) && defined(AO_HAVE_short_load_acquire)
-#  define AO_short_load_acquire_read(addr) AO_short_load_acquire(addr)
-#  define AO_HAVE_short_load_acquire_read
+#if !defined(AO_HAVE_short_load_acquire_read) \
+    && defined(AO_HAVE_short_load_acquire)
+# define AO_short_load_acquire_read(addr) AO_short_load_acquire(addr)
+# define AO_HAVE_short_load_acquire_read
 #endif
 
-#if defined(AO_HAVE_short_load) && defined(AO_HAVE_nop_full) && \
-    !defined(AO_HAVE_short_load_acquire)
-   AO_INLINE unsigned short
-   AO_short_load_acquire(const volatile unsigned short *addr)
-   {
-     unsigned short result = AO_short_load(addr);
-     /* Acquire barrier would be useless, since the load could be delayed  */
-     /* beyond it.                                                         */
-     AO_nop_full();
-     return result;
-   }
-#  define AO_HAVE_short_load_acquire
+#if defined(AO_HAVE_short_load) && defined(AO_HAVE_nop_full) \
+    && !defined(AO_HAVE_short_load_acquire)
+  AO_INLINE unsigned short
+  AO_short_load_acquire(const volatile unsigned short *addr)
+  {
+    unsigned short result = AO_short_load(addr);
+    /* Acquire barrier would be useless, since the load could be delayed    */
+    /* beyond it.                                                           */
+    AO_nop_full();
+    return result;
+  }
+# define AO_HAVE_short_load_acquire
 #endif
 
-#if defined(AO_HAVE_short_load) && defined(AO_HAVE_nop_read) && \
-    !defined(AO_HAVE_short_load_read)
-   AO_INLINE unsigned short
-   AO_short_load_read(const volatile unsigned short *addr)
-   {
-     unsigned short result = AO_short_load(addr);
-     /* Acquire barrier would be useless, since the load could be delayed  */
-     /* beyond it.                                                         */
-     AO_nop_read();
-     return result;
-   }
-#  define AO_HAVE_short_load_read
+#if defined(AO_HAVE_short_load) && defined(AO_HAVE_nop_read) \
+    && !defined(AO_HAVE_short_load_read)
+  AO_INLINE unsigned short
+  AO_short_load_read(const volatile unsigned short *addr)
+  {
+    unsigned short result = AO_short_load(addr);
+    /* Acquire barrier would be useless, since the load could be delayed    */
+    /* beyond it.                                                           */
+    AO_nop_read();
+    return result;
+  }
+# define AO_HAVE_short_load_read
 #endif
 
-#if defined(AO_HAVE_short_load_acquire) && defined(AO_HAVE_nop_full) && \
-    !defined(AO_HAVE_short_load_full)
-#  define AO_short_load_full(addr) (AO_nop_full(), AO_short_load_acquire(addr))
-#  define AO_HAVE_short_load_full
+#if defined(AO_HAVE_short_load_acquire) && defined(AO_HAVE_nop_full) \
+    && !defined(AO_HAVE_short_load_full)
+# define AO_short_load_full(addr) (AO_nop_full(), AO_short_load_acquire(addr))
+# define AO_HAVE_short_load_full
 #endif
 
-#if !defined(AO_HAVE_short_load_acquire_read) && defined(AO_HAVE_short_load_read)
-#  define AO_short_load_acquire_read(addr) AO_short_load_read(addr)
-#  define AO_HAVE_short_load_acquire_read
+#if !defined(AO_HAVE_short_load_acquire_read) \
+    && defined(AO_HAVE_short_load_read)
+# define AO_short_load_acquire_read(addr) AO_short_load_read(addr)
+# define AO_HAVE_short_load_acquire_read
 #endif
 
 #if defined(AO_HAVE_short_load_acquire_read) && !defined(AO_HAVE_short_load)
-#  define AO_short_load(addr) AO_short_load_acquire_read(addr)
-#  define AO_HAVE_short_load
+# define AO_short_load(addr) AO_short_load_acquire_read(addr)
+# define AO_HAVE_short_load
 #endif
 
 #ifdef AO_NO_DD_ORDERING
-#  if defined(AO_HAVE_short_load_acquire_read)
-#    define AO_short_load_dd_acquire_read(addr) \
-        AO_short_load_acquire_read(addr)
-#    define AO_HAVE_short_load_dd_acquire_read
-#  endif
+# if defined(AO_HAVE_short_load_acquire_read)
+#   define AO_short_load_dd_acquire_read(addr) AO_short_load_acquire_read(addr)
+#   define AO_HAVE_short_load_dd_acquire_read
+# endif
 #else
-#  if defined(AO_HAVE_short_load)
-#    define AO_short_load_dd_acquire_read(addr) \
-        AO_short_load(addr)
-#    define AO_HAVE_short_load_dd_acquire_read
-#  endif
-#endif
-
+# if defined(AO_HAVE_short_load)
+#   define AO_short_load_dd_acquire_read(addr) AO_short_load(addr)
+#   define AO_HAVE_short_load_dd_acquire_read
+# endif
+#endif /* !AO_NO_DD_ORDERING */
 
 /* short_store */
-
 #if defined(AO_HAVE_short_store_release) && !defined(AO_HAVE_short_store)
-#  define AO_short_store(addr, val) AO_short_store_release(addr,val)
-#  define AO_HAVE_short_store
+# define AO_short_store(addr, val) AO_short_store_release(addr,val)
+# define AO_HAVE_short_store
 #endif
 
 #if defined(AO_HAVE_short_store_full) && !defined(AO_HAVE_short_store_release)
-#  define AO_short_store_release(addr,val) AO_short_store_full(addr,val)
-#  define AO_HAVE_short_store_release
+# define AO_short_store_release(addr,val) AO_short_store_full(addr,val)
+# define AO_HAVE_short_store_release
 #endif
 
 #if defined(AO_HAVE_short_store_full) && !defined(AO_HAVE_short_store_write)
-#  define AO_short_store_write(addr,val) AO_short_store_full(addr,val)
-#  define AO_HAVE_short_store_write
+# define AO_short_store_write(addr,val) AO_short_store_full(addr,val)
+# define AO_HAVE_short_store_write
 #endif
 
-#if defined(AO_HAVE_short_store_release) && \
-        !defined(AO_HAVE_short_store_release_write)
-#  define AO_short_store_release_write(addr, val) \
-        AO_short_store_release(addr,val)
-#  define AO_HAVE_short_store_release_write
+#if defined(AO_HAVE_short_store_release) \
+    && !defined(AO_HAVE_short_store_release_write)
+# define AO_short_store_release_write(addr, val) \
+                            AO_short_store_release(addr,val)
+# define AO_HAVE_short_store_release_write
 #endif
 
 #if defined(AO_HAVE_short_store_write) && !defined(AO_HAVE_short_store)
-#  define AO_short_store(addr, val) AO_short_store_write(addr,val)
-#  define AO_HAVE_short_store
+# define AO_short_store(addr, val) AO_short_store_write(addr,val)
+# define AO_HAVE_short_store
 #endif
 
-#if defined(AO_HAVE_short_store) && defined(AO_HAVE_nop_full) && \
-    !defined(AO_HAVE_short_store_release)
-#  define AO_short_store_release(addr,val) \
-        (AO_nop_full(), AO_short_store(addr,val))
-#  define AO_HAVE_short_store_release
+#if defined(AO_HAVE_short_store) && defined(AO_HAVE_nop_full) \
+    && !defined(AO_HAVE_short_store_release)
+# define AO_short_store_release(addr,val) \
+                                (AO_nop_full(), AO_short_store(addr,val))
+# define AO_HAVE_short_store_release
 #endif
 
-#if defined(AO_HAVE_nop_write) && defined(AO_HAVE_short_store) && \
-     !defined(AO_HAVE_short_store_write)
-#  define AO_short_store_write(addr, val) \
-        (AO_nop_write(), AO_short_store(addr,val))
-#  define AO_HAVE_short_store_write
+#if defined(AO_HAVE_nop_write) && defined(AO_HAVE_short_store) \
+    && !defined(AO_HAVE_short_store_write)
+# define AO_short_store_write(addr, val) \
+                                (AO_nop_write(), AO_short_store(addr,val))
+# define AO_HAVE_short_store_write
 #endif
 
-#if defined(AO_HAVE_short_store_write) && \
-     !defined(AO_HAVE_short_store_release_write)
-#  define AO_short_store_release_write(addr, val) AO_short_store_write(addr,val)
-#  define AO_HAVE_short_store_release_write
+#if defined(AO_HAVE_short_store_write) \
+    && !defined(AO_HAVE_short_store_release_write)
+# define AO_short_store_release_write(addr, val) AO_short_store_write(addr,val)
+# define AO_HAVE_short_store_release_write
 #endif
 
-#if defined(AO_HAVE_short_store_release) && defined(AO_HAVE_nop_full) && \
-    !defined(AO_HAVE_short_store_full)
-#  define AO_short_store_full(addr, val) \
-        (AO_short_store_release(addr, val), AO_nop_full())
-#  define AO_HAVE_short_store_full
+#if defined(AO_HAVE_short_store_release) && defined(AO_HAVE_nop_full) \
+    && !defined(AO_HAVE_short_store_full)
+# define AO_short_store_full(addr, val) \
+                        (AO_short_store_release(addr, val), AO_nop_full())
+# define AO_HAVE_short_store_full
 #endif
 
-
 /* short_fetch_and_add */
-#if defined(AO_HAVE_short_compare_and_swap_full) && \
-    !defined(AO_HAVE_short_fetch_and_add_full)
-   AO_INLINE AO_t
-   AO_short_fetch_and_add_full(volatile unsigned short *addr,
-                               unsigned short incr)
-   {
-     unsigned short old;
-     do
-       {
-         old = *addr;
-       }
-     while (!AO_short_compare_and_swap_full(addr, old, old+incr));
-     return old;
-   }
-#  define AO_HAVE_short_fetch_and_add_full
-#endif
-
-#if defined(AO_HAVE_short_compare_and_swap_acquire) && \
-    !defined(AO_HAVE_short_fetch_and_add_acquire)
-   AO_INLINE AO_t
-   AO_short_fetch_and_add_acquire(volatile unsigned short *addr,
-                                  unsigned short incr)
-   {
-     unsigned short old;
-     do
-       {
-         old = *addr;
-       }
-     while (!AO_short_compare_and_swap_acquire(addr, old, old+incr));
-     return old;
-   }
-#  define AO_HAVE_short_fetch_and_add_acquire
-#endif
-
-#if defined(AO_HAVE_short_compare_and_swap_release) && \
-    !defined(AO_HAVE_short_fetch_and_add_release)
-   AO_INLINE AO_t
-   AO_short_fetch_and_add_release(volatile unsigned short *addr,
-                                  unsigned short incr)
-   {
-     unsigned short old;
-     do
-       {
-         old = *addr;
-       }
-     while (!AO_short_compare_and_swap_release(addr, old, old+incr));
-     return old;
-   }
-#  define AO_HAVE_short_fetch_and_add_release
+#if defined(AO_HAVE_short_compare_and_swap_full) \
+    && !defined(AO_HAVE_short_fetch_and_add_full)
+  AO_INLINE AO_t
+  AO_short_fetch_and_add_full(volatile unsigned short *addr,
+                              unsigned short incr)
+  {
+    unsigned short old;
+    do
+      {
+        old = *addr;
+      }
+    while (!AO_short_compare_and_swap_full(addr, old, old+incr));
+    return old;
+  }
+# define AO_HAVE_short_fetch_and_add_full
+#endif
+
+#if defined(AO_HAVE_short_compare_and_swap_acquire) \
+    && !defined(AO_HAVE_short_fetch_and_add_acquire)
+  AO_INLINE AO_t
+  AO_short_fetch_and_add_acquire(volatile unsigned short *addr,
+                                 unsigned short incr)
+  {
+    unsigned short old;
+    do
+      {
+        old = *addr;
+      }
+    while (!AO_short_compare_and_swap_acquire(addr, old, old+incr));
+    return old;
+  }
+# define AO_HAVE_short_fetch_and_add_acquire
+#endif
+
+#if defined(AO_HAVE_short_compare_and_swap_release) \
+    && !defined(AO_HAVE_short_fetch_and_add_release)
+  AO_INLINE AO_t
+  AO_short_fetch_and_add_release(volatile unsigned short *addr,
+                                 unsigned short incr)
+  {
+    unsigned short old;
+    do
+      {
+        old = *addr;
+      }
+    while (!AO_short_compare_and_swap_release(addr, old, old+incr));
+    return old;
+  }
+# define AO_HAVE_short_fetch_and_add_release
 #endif
 
 #if defined(AO_HAVE_short_fetch_and_add_full)
-#  if !defined(AO_HAVE_short_fetch_and_add_release)
-#    define AO_short_fetch_and_add_release(addr, val) \
-         AO_short_fetch_and_add_full(addr, val)
-#    define AO_HAVE_short_fetch_and_add_release
-#  endif
-#  if !defined(AO_HAVE_short_fetch_and_add_acquire)
-#    define AO_short_fetch_and_add_acquire(addr, val) \
-         AO_short_fetch_and_add_full(addr, val)
-#    define AO_HAVE_short_fetch_and_add_acquire
-#  endif
-#  if !defined(AO_HAVE_short_fetch_and_add_write)
-#    define AO_short_fetch_and_add_write(addr, val) \
-         AO_short_fetch_and_add_full(addr, val)
-#    define AO_HAVE_short_fetch_and_add_write
-#  endif
-#  if !defined(AO_HAVE_short_fetch_and_add_read)
-#    define AO_short_fetch_and_add_read(addr, val) \
-         AO_short_fetch_and_add_full(addr, val)
-#    define AO_HAVE_short_fetch_and_add_read
-#  endif
+# if !defined(AO_HAVE_short_fetch_and_add_release)
+#   define AO_short_fetch_and_add_release(addr, val) \
+                                AO_short_fetch_and_add_full(addr, val)
+#   define AO_HAVE_short_fetch_and_add_release
+# endif
+# if !defined(AO_HAVE_short_fetch_and_add_acquire)
+#   define AO_short_fetch_and_add_acquire(addr, val) \
+                                AO_short_fetch_and_add_full(addr, val)
+#   define AO_HAVE_short_fetch_and_add_acquire
+# endif
+# if !defined(AO_HAVE_short_fetch_and_add_write)
+#   define AO_short_fetch_and_add_write(addr, val) \
+                                AO_short_fetch_and_add_full(addr, val)
+#   define AO_HAVE_short_fetch_and_add_write
+# endif
+# if !defined(AO_HAVE_short_fetch_and_add_read)
+#   define AO_short_fetch_and_add_read(addr, val) \
+                                AO_short_fetch_and_add_full(addr, val)
+#   define AO_HAVE_short_fetch_and_add_read
+# endif
 #endif /* AO_HAVE_short_fetch_and_add_full */
 
-#if !defined(AO_HAVE_short_fetch_and_add) && \
-    defined(AO_HAVE_short_fetch_and_add_release)
-#  define AO_short_fetch_and_add(addr, val) \
-        AO_short_fetch_and_add_release(addr, val)
-#  define AO_HAVE_short_fetch_and_add
-#endif
-#if !defined(AO_HAVE_short_fetch_and_add) && \
-    defined(AO_HAVE_short_fetch_and_add_acquire)
-#  define AO_short_fetch_and_add(addr, val) \
-        AO_short_fetch_and_add_acquire(addr, val)
-#  define AO_HAVE_short_fetch_and_add
-#endif
-#if !defined(AO_HAVE_short_fetch_and_add) && \
-    defined(AO_HAVE_short_fetch_and_add_write)
-#  define AO_short_fetch_and_add(addr, val) \
-        AO_short_fetch_and_add_write(addr, val)
-#  define AO_HAVE_short_fetch_and_add
-#endif
-#if !defined(AO_HAVE_short_fetch_and_add) && \
-    defined(AO_HAVE_short_fetch_and_add_read)
-#  define AO_short_fetch_and_add(addr, val) \
-        AO_short_fetch_and_add_read(addr, val)
-#  define AO_HAVE_short_fetch_and_add
-#endif
-
-#if defined(AO_HAVE_short_fetch_and_add_acquire) &&\
-    defined(AO_HAVE_nop_full) && \
-    !defined(AO_HAVE_short_fetch_and_add_full)
-#  define AO_short_fetch_and_add_full(addr, val) \
-        (AO_nop_full(), AO_short_fetch_and_add_acquire(addr, val))
-#endif
-
-#if !defined(AO_HAVE_short_fetch_and_add_release_write) && \
-    defined(AO_HAVE_short_fetch_and_add_write)
-#  define AO_short_fetch_and_add_release_write(addr, val) \
-        AO_short_fetch_and_add_write(addr, val)
-#  define AO_HAVE_short_fetch_and_add_release_write
-#endif
-#if !defined(AO_HAVE_short_fetch_and_add_release_write) && \
-    defined(AO_HAVE_short_fetch_and_add_release)
-#  define AO_short_fetch_and_add_release_write(addr, val) \
-        AO_short_fetch_and_add_release(addr, val)
-#  define AO_HAVE_short_fetch_and_add_release_write
-#endif
-#if !defined(AO_HAVE_short_fetch_and_add_acquire_read) && \
-    defined(AO_HAVE_short_fetch_and_add_read)
-#  define AO_short_fetch_and_add_acquire_read(addr, val) \
-        AO_short_fetch_and_add_read(addr, val)
-#  define AO_HAVE_short_fetch_and_add_acquire_read
-#endif
-#if !defined(AO_HAVE_short_fetch_and_add_acquire_read) && \
-    defined(AO_HAVE_short_fetch_and_add_acquire)
-#  define AO_short_fetch_and_add_acquire_read(addr, val) \
-        AO_short_fetch_and_add_acquire(addr, val)
-#  define AO_HAVE_short_fetch_and_add_acquire_read
+#if !defined(AO_HAVE_short_fetch_and_add) \
+    && defined(AO_HAVE_short_fetch_and_add_release)
+# define AO_short_fetch_and_add(addr, val) \
+                                AO_short_fetch_and_add_release(addr, val)
+# define AO_HAVE_short_fetch_and_add
+#endif
+#if !defined(AO_HAVE_short_fetch_and_add) \
+    && defined(AO_HAVE_short_fetch_and_add_acquire)
+# define AO_short_fetch_and_add(addr, val) \
+                                AO_short_fetch_and_add_acquire(addr, val)
+# define AO_HAVE_short_fetch_and_add
+#endif
+#if !defined(AO_HAVE_short_fetch_and_add) \
+    && defined(AO_HAVE_short_fetch_and_add_write)
+# define AO_short_fetch_and_add(addr, val) \
+                                AO_short_fetch_and_add_write(addr, val)
+# define AO_HAVE_short_fetch_and_add
+#endif
+#if !defined(AO_HAVE_short_fetch_and_add) \
+    && defined(AO_HAVE_short_fetch_and_add_read)
+# define AO_short_fetch_and_add(addr, val) \
+                                AO_short_fetch_and_add_read(addr, val)
+# define AO_HAVE_short_fetch_and_add
+#endif
+
+#if defined(AO_HAVE_short_fetch_and_add_acquire) \
+    && defined(AO_HAVE_nop_full) && !defined(AO_HAVE_short_fetch_and_add_full)
+# define AO_short_fetch_and_add_full(addr, val) \
+                (AO_nop_full(), AO_short_fetch_and_add_acquire(addr, val))
+# define AO_HAVE_short_fetch_and_add_full
+#endif
+
+#if !defined(AO_HAVE_short_fetch_and_add_release_write) \
+    && defined(AO_HAVE_short_fetch_and_add_write)
+# define AO_short_fetch_and_add_release_write(addr, val) \
+                                AO_short_fetch_and_add_write(addr, val)
+# define AO_HAVE_short_fetch_and_add_release_write
+#endif
+#if !defined(AO_HAVE_short_fetch_and_add_release_write) \
+    && defined(AO_HAVE_short_fetch_and_add_release)
+# define AO_short_fetch_and_add_release_write(addr, val) \
+                                AO_short_fetch_and_add_release(addr, val)
+# define AO_HAVE_short_fetch_and_add_release_write
+#endif
+
+#if !defined(AO_HAVE_short_fetch_and_add_acquire_read) \
+    && defined(AO_HAVE_short_fetch_and_add_read)
+# define AO_short_fetch_and_add_acquire_read(addr, val) \
+                                AO_short_fetch_and_add_read(addr, val)
+# define AO_HAVE_short_fetch_and_add_acquire_read
+#endif
+#if !defined(AO_HAVE_short_fetch_and_add_acquire_read) \
+    && defined(AO_HAVE_short_fetch_and_add_acquire)
+# define AO_short_fetch_and_add_acquire_read(addr, val) \
+                                AO_short_fetch_and_add_acquire(addr, val)
+# define AO_HAVE_short_fetch_and_add_acquire_read
 #endif
 
 #ifdef AO_NO_DD_ORDERING
-#  if defined(AO_HAVE_short_fetch_and_add_acquire_read)
-#    define AO_short_fetch_and_add_dd_acquire_read(addr, val) \
-        AO_short_fetch_and_add_acquire_read(addr, val)
-#    define AO_HAVE_short_fetch_and_add_dd_acquire_read
-#  endif
+# if defined(AO_HAVE_short_fetch_and_add_acquire_read)
+#   define AO_short_fetch_and_add_dd_acquire_read(addr, val) \
+                                AO_short_fetch_and_add_acquire_read(addr, val)
+#   define AO_HAVE_short_fetch_and_add_dd_acquire_read
+# endif
 #else
-#  if defined(AO_HAVE_short_fetch_and_add)
-#    define AO_short_fetch_and_add_dd_acquire_read(addr, val) \
-        AO_short_fetch_and_add(addr, val)
-#    define AO_HAVE_short_fetch_and_add_dd_acquire_read
-#  endif
-#endif
+# if defined(AO_HAVE_short_fetch_and_add)
+#   define AO_short_fetch_and_add_dd_acquire_read(addr, val) \
+                                AO_short_fetch_and_add(addr, val)
+#   define AO_HAVE_short_fetch_and_add_dd_acquire_read
+# endif
+#endif /* !AO_NO_DD_ORDERING */
 
 /* short_fetch_and_add1 */
-
-#if defined(AO_HAVE_short_fetch_and_add_full) &&\
-    !defined(AO_HAVE_short_fetch_and_add1_full)
-#  define AO_short_fetch_and_add1_full(addr) \
-        AO_short_fetch_and_add_full(addr,1)
-#  define AO_HAVE_short_fetch_and_add1_full
-#endif
-#if defined(AO_HAVE_short_fetch_and_add_release) &&\
-    !defined(AO_HAVE_short_fetch_and_add1_release)
-#  define AO_short_fetch_and_add1_release(addr) \
-        AO_short_fetch_and_add_release(addr,1)
-#  define AO_HAVE_short_fetch_and_add1_release
-#endif
-#if defined(AO_HAVE_short_fetch_and_add_acquire) &&\
-    !defined(AO_HAVE_short_fetch_and_add1_acquire)
-#  define AO_short_fetch_and_add1_acquire(addr) \
-        AO_short_fetch_and_add_acquire(addr,1)
-#  define AO_HAVE_short_fetch_and_add1_acquire
-#endif
-#if defined(AO_HAVE_short_fetch_and_add_write) &&\
-    !defined(AO_HAVE_short_fetch_and_add1_write)
-#  define AO_short_fetch_and_add1_write(addr) \
-        AO_short_fetch_and_add_write(addr,1)
-#  define AO_HAVE_short_fetch_and_add1_write
-#endif
-#if defined(AO_HAVE_short_fetch_and_add_read) &&\
-    !defined(AO_HAVE_short_fetch_and_add1_read)
-#  define AO_short_fetch_and_add1_read(addr) \
-        AO_short_fetch_and_add_read(addr,1)
-#  define AO_HAVE_short_fetch_and_add1_read
-#endif
-#if defined(AO_HAVE_short_fetch_and_add_release_write) &&\
-    !defined(AO_HAVE_short_fetch_and_add1_release_write)
-#  define AO_short_fetch_and_add1_release_write(addr) \
-        AO_short_fetch_and_add_release_write(addr,1)
-#  define AO_HAVE_short_fetch_and_add1_release_write
-#endif
-#if defined(AO_HAVE_short_fetch_and_add_acquire_read) &&\
-    !defined(AO_HAVE_short_fetch_and_add1_acquire_read)
-#  define AO_short_fetch_and_add1_acquire_read(addr) \
-        AO_short_fetch_and_add_acquire_read(addr,1)
-#  define AO_HAVE_short_fetch_and_add1_acquire_read
-#endif
-#if defined(AO_HAVE_short_fetch_and_add) &&\
-    !defined(AO_HAVE_short_fetch_and_add1)
-#  define AO_short_fetch_and_add1(addr) \
-        AO_short_fetch_and_add(addr,1)
-#  define AO_HAVE_short_fetch_and_add1
+#if defined(AO_HAVE_short_fetch_and_add_full) \
+    && !defined(AO_HAVE_short_fetch_and_add1_full)
+# define AO_short_fetch_and_add1_full(addr) \
+                                AO_short_fetch_and_add_full(addr,1)
+# define AO_HAVE_short_fetch_and_add1_full
+#endif
+#if defined(AO_HAVE_short_fetch_and_add_release) \
+    && !defined(AO_HAVE_short_fetch_and_add1_release)
+# define AO_short_fetch_and_add1_release(addr) \
+                                AO_short_fetch_and_add_release(addr,1)
+# define AO_HAVE_short_fetch_and_add1_release
+#endif
+#if defined(AO_HAVE_short_fetch_and_add_acquire) \
+    && !defined(AO_HAVE_short_fetch_and_add1_acquire)
+# define AO_short_fetch_and_add1_acquire(addr) \
+                                AO_short_fetch_and_add_acquire(addr,1)
+# define AO_HAVE_short_fetch_and_add1_acquire
+#endif
+#if defined(AO_HAVE_short_fetch_and_add_write) \
+    && !defined(AO_HAVE_short_fetch_and_add1_write)
+# define AO_short_fetch_and_add1_write(addr) \
+                                AO_short_fetch_and_add_write(addr,1)
+# define AO_HAVE_short_fetch_and_add1_write
+#endif
+#if defined(AO_HAVE_short_fetch_and_add_read) \
+    && !defined(AO_HAVE_short_fetch_and_add1_read)
+# define AO_short_fetch_and_add1_read(addr) \
+                                AO_short_fetch_and_add_read(addr,1)
+# define AO_HAVE_short_fetch_and_add1_read
+#endif
+#if defined(AO_HAVE_short_fetch_and_add_release_write) \
+    && !defined(AO_HAVE_short_fetch_and_add1_release_write)
+# define AO_short_fetch_and_add1_release_write(addr) \
+                                AO_short_fetch_and_add_release_write(addr,1)
+# define AO_HAVE_short_fetch_and_add1_release_write
+#endif
+#if defined(AO_HAVE_short_fetch_and_add_acquire_read) \
+    && !defined(AO_HAVE_short_fetch_and_add1_acquire_read)
+# define AO_short_fetch_and_add1_acquire_read(addr) \
+                                AO_short_fetch_and_add_acquire_read(addr,1)
+# define AO_HAVE_short_fetch_and_add1_acquire_read
+#endif
+#if defined(AO_HAVE_short_fetch_and_add) \
+    && !defined(AO_HAVE_short_fetch_and_add1)
+# define AO_short_fetch_and_add1(addr) AO_short_fetch_and_add(addr,1)
+# define AO_HAVE_short_fetch_and_add1
 #endif
 
 #if defined(AO_HAVE_short_fetch_and_add1_full)
-#  if !defined(AO_HAVE_short_fetch_and_add1_release)
-#    define AO_short_fetch_and_add1_release(addr) \
-         AO_short_fetch_and_add1_full(addr)
-#    define AO_HAVE_short_fetch_and_add1_release
-#  endif
-#  if !defined(AO_HAVE_short_fetch_and_add1_acquire)
-#    define AO_short_fetch_and_add1_acquire(addr) \
-         AO_short_fetch_and_add1_full(addr)
-#    define AO_HAVE_short_fetch_and_add1_acquire
-#  endif
-#  if !defined(AO_HAVE_short_fetch_and_add1_write)
-#    define AO_short_fetch_and_add1_write(addr) \
-         AO_short_fetch_and_add1_full(addr)
-#    define AO_HAVE_short_fetch_and_add1_write
-#  endif
-#  if !defined(AO_HAVE_short_fetch_and_add1_read)
-#    define AO_short_fetch_and_add1_read(addr) \
-         AO_short_fetch_and_add1_full(addr)
-#    define AO_HAVE_short_fetch_and_add1_read
-#  endif
+# if !defined(AO_HAVE_short_fetch_and_add1_release)
+#   define AO_short_fetch_and_add1_release(addr) \
+                                AO_short_fetch_and_add1_full(addr)
+#   define AO_HAVE_short_fetch_and_add1_release
+# endif
+# if !defined(AO_HAVE_short_fetch_and_add1_acquire)
+#   define AO_short_fetch_and_add1_acquire(addr) \
+                                AO_short_fetch_and_add1_full(addr)
+#   define AO_HAVE_short_fetch_and_add1_acquire
+# endif
+# if !defined(AO_HAVE_short_fetch_and_add1_write)
+#   define AO_short_fetch_and_add1_write(addr) \
+                                AO_short_fetch_and_add1_full(addr)
+#   define AO_HAVE_short_fetch_and_add1_write
+# endif
+# if !defined(AO_HAVE_short_fetch_and_add1_read)
+#   define AO_short_fetch_and_add1_read(addr) \
+                                AO_short_fetch_and_add1_full(addr)
+#   define AO_HAVE_short_fetch_and_add1_read
+# endif
 #endif /* AO_HAVE_short_fetch_and_add1_full */
 
-#if !defined(AO_HAVE_short_fetch_and_add1) && \
-    defined(AO_HAVE_short_fetch_and_add1_release)
-#  define AO_short_fetch_and_add1(addr) \
-        AO_short_fetch_and_add1_release(addr)
-#  define AO_HAVE_short_fetch_and_add1
-#endif
-#if !defined(AO_HAVE_short_fetch_and_add1) && \
-    defined(AO_HAVE_short_fetch_and_add1_acquire)
-#  define AO_short_fetch_and_add1(addr) \
-        AO_short_fetch_and_add1_acquire(addr)
-#  define AO_HAVE_short_fetch_and_add1
-#endif
-#if !defined(AO_HAVE_short_fetch_and_add1) && \
-    defined(AO_HAVE_short_fetch_and_add1_write)
-#  define AO_short_fetch_and_add1(addr) \
-        AO_short_fetch_and_add1_write(addr)
-#  define AO_HAVE_short_fetch_and_add1
-#endif
-#if !defined(AO_HAVE_short_fetch_and_add1) && \
-    defined(AO_HAVE_short_fetch_and_add1_read)
-#  define AO_short_fetch_and_add1(addr) \
-        AO_short_fetch_and_add1_read(addr)
-#  define AO_HAVE_short_fetch_and_add1
-#endif
-
-#if defined(AO_HAVE_short_fetch_and_add1_acquire) &&\
-    defined(AO_HAVE_nop_full) && \
-    !defined(AO_HAVE_short_fetch_and_add1_full)
-#  define AO_short_fetch_and_add1_full(addr) \
-        (AO_nop_full(), AO_short_fetch_and_add1_acquire(addr))
-#  define AO_HAVE_short_fetch_and_add1_full
-#endif
-
-#if !defined(AO_HAVE_short_fetch_and_add1_release_write) && \
-    defined(AO_HAVE_short_fetch_and_add1_write)
-#  define AO_short_fetch_and_add1_release_write(addr) \
-        AO_short_fetch_and_add1_write(addr)
-#  define AO_HAVE_short_fetch_and_add1_release_write
-#endif
-#if !defined(AO_HAVE_short_fetch_and_add1_release_write) && \
-    defined(AO_HAVE_short_fetch_and_add1_release)
-#  define AO_short_fetch_and_add1_release_write(addr) \
-        AO_short_fetch_and_add1_release(addr)
-#  define AO_HAVE_short_fetch_and_add1_release_write
-#endif
-#if !defined(AO_HAVE_short_fetch_and_add1_acquire_read) && \
-    defined(AO_HAVE_short_fetch_and_add1_read)
-#  define AO_short_fetch_and_add1_acquire_read(addr) \
-        AO_short_fetch_and_add1_read(addr)
-#  define AO_HAVE_short_fetch_and_add1_acquire_read
-#endif
-#if !defined(AO_HAVE_short_fetch_and_add1_acquire_read) && \
-    defined(AO_HAVE_short_fetch_and_add1_acquire)
-#  define AO_short_fetch_and_add1_acquire_read(addr) \
-        AO_short_fetch_and_add1_acquire(addr)
-#  define AO_HAVE_short_fetch_and_add1_acquire_read
+#if !defined(AO_HAVE_short_fetch_and_add1) \
+    && defined(AO_HAVE_short_fetch_and_add1_release)
+# define AO_short_fetch_and_add1(addr) AO_short_fetch_and_add1_release(addr)
+# define AO_HAVE_short_fetch_and_add1
+#endif
+#if !defined(AO_HAVE_short_fetch_and_add1) \
+    && defined(AO_HAVE_short_fetch_and_add1_acquire)
+# define AO_short_fetch_and_add1(addr) AO_short_fetch_and_add1_acquire(addr)
+# define AO_HAVE_short_fetch_and_add1
+#endif
+#if !defined(AO_HAVE_short_fetch_and_add1) \
+    && defined(AO_HAVE_short_fetch_and_add1_write)
+# define AO_short_fetch_and_add1(addr) AO_short_fetch_and_add1_write(addr)
+# define AO_HAVE_short_fetch_and_add1
+#endif
+#if !defined(AO_HAVE_short_fetch_and_add1) \
+    && defined(AO_HAVE_short_fetch_and_add1_read)
+# define AO_short_fetch_and_add1(addr) AO_short_fetch_and_add1_read(addr)
+# define AO_HAVE_short_fetch_and_add1
+#endif
+
+#if defined(AO_HAVE_short_fetch_and_add1_acquire) \
+    && defined(AO_HAVE_nop_full) \
+    && !defined(AO_HAVE_short_fetch_and_add1_full)
+# define AO_short_fetch_and_add1_full(addr) \
+                        (AO_nop_full(), AO_short_fetch_and_add1_acquire(addr))
+# define AO_HAVE_short_fetch_and_add1_full
+#endif
+
+#if !defined(AO_HAVE_short_fetch_and_add1_release_write) \
+    && defined(AO_HAVE_short_fetch_and_add1_write)
+# define AO_short_fetch_and_add1_release_write(addr) \
+                                AO_short_fetch_and_add1_write(addr)
+# define AO_HAVE_short_fetch_and_add1_release_write
+#endif
+#if !defined(AO_HAVE_short_fetch_and_add1_release_write) \
+    && defined(AO_HAVE_short_fetch_and_add1_release)
+# define AO_short_fetch_and_add1_release_write(addr) \
+                                AO_short_fetch_and_add1_release(addr)
+# define AO_HAVE_short_fetch_and_add1_release_write
+#endif
+#if !defined(AO_HAVE_short_fetch_and_add1_acquire_read) \
+    && defined(AO_HAVE_short_fetch_and_add1_read)
+# define AO_short_fetch_and_add1_acquire_read(addr) \
+                                AO_short_fetch_and_add1_read(addr)
+# define AO_HAVE_short_fetch_and_add1_acquire_read
+#endif
+#if !defined(AO_HAVE_short_fetch_and_add1_acquire_read) \
+    && defined(AO_HAVE_short_fetch_and_add1_acquire)
+# define AO_short_fetch_and_add1_acquire_read(addr) \
+                                AO_short_fetch_and_add1_acquire(addr)
+# define AO_HAVE_short_fetch_and_add1_acquire_read
 #endif
 
 #ifdef AO_NO_DD_ORDERING
-#  if defined(AO_HAVE_short_fetch_and_add1_acquire_read)
-#    define AO_short_fetch_and_add1_dd_acquire_read(addr) \
-        AO_short_fetch_and_add1_acquire_read(addr)
-#    define AO_HAVE_short_fetch_and_add1_dd_acquire_read
-#  endif
+# if defined(AO_HAVE_short_fetch_and_add1_acquire_read)
+#   define AO_short_fetch_and_add1_dd_acquire_read(addr) \
+                                AO_short_fetch_and_add1_acquire_read(addr)
+#   define AO_HAVE_short_fetch_and_add1_dd_acquire_read
+# endif
 #else
-#  if defined(AO_HAVE_short_fetch_and_add1)
-#    define AO_short_fetch_and_add1_dd_acquire_read(addr) \
-        AO_short_fetch_and_add1(addr)
-#    define AO_HAVE_short_fetch_and_add1_dd_acquire_read
-#  endif
-#endif
+# if defined(AO_HAVE_short_fetch_and_add1)
+#   define AO_short_fetch_and_add1_dd_acquire_read(addr) \
+                                AO_short_fetch_and_add1(addr)
+#   define AO_HAVE_short_fetch_and_add1_dd_acquire_read
+# endif
+#endif /* !AO_NO_DD_ORDERING */
 
 /* short_fetch_and_sub1 */
-
-#if defined(AO_HAVE_short_fetch_and_add_full) &&\
-    !defined(AO_HAVE_short_fetch_and_sub1_full)
-#  define AO_short_fetch_and_sub1_full(addr) \
-        AO_short_fetch_and_add_full(addr,(unsigned short)(-1))
-#  define AO_HAVE_short_fetch_and_sub1_full
-#endif
-#if defined(AO_HAVE_short_fetch_and_add_release) &&\
-    !defined(AO_HAVE_short_fetch_and_sub1_release)
-#  define AO_short_fetch_and_sub1_release(addr) \
-        AO_short_fetch_and_add_release(addr,(unsigned short)(-1))
-#  define AO_HAVE_short_fetch_and_sub1_release
-#endif
-#if defined(AO_HAVE_short_fetch_and_add_acquire) &&\
-    !defined(AO_HAVE_short_fetch_and_sub1_acquire)
-#  define AO_short_fetch_and_sub1_acquire(addr) \
-        AO_short_fetch_and_add_acquire(addr,(unsigned short)(-1))
-#  define AO_HAVE_short_fetch_and_sub1_acquire
-#endif
-#if defined(AO_HAVE_short_fetch_and_add_write) &&\
-    !defined(AO_HAVE_short_fetch_and_sub1_write)
-#  define AO_short_fetch_and_sub1_write(addr) \
-        AO_short_fetch_and_add_write(addr,(unsigned short)(-1))
-#  define AO_HAVE_short_fetch_and_sub1_write
-#endif
-#if defined(AO_HAVE_short_fetch_and_add_read) &&\
-    !defined(AO_HAVE_short_fetch_and_sub1_read)
-#  define AO_short_fetch_and_sub1_read(addr) \
-        AO_short_fetch_and_add_read(addr,(unsigned short)(-1))
-#  define AO_HAVE_short_fetch_and_sub1_read
-#endif
-#if defined(AO_HAVE_short_fetch_and_add_release_write) &&\
-    !defined(AO_HAVE_short_fetch_and_sub1_release_write)
-#  define AO_short_fetch_and_sub1_release_write(addr) \
+#if defined(AO_HAVE_short_fetch_and_add_full) \
+    && !defined(AO_HAVE_short_fetch_and_sub1_full)
+# define AO_short_fetch_and_sub1_full(addr) \
+                AO_short_fetch_and_add_full(addr,(unsigned short)(-1))
+# define AO_HAVE_short_fetch_and_sub1_full
+#endif
+#if defined(AO_HAVE_short_fetch_and_add_release) \
+    && !defined(AO_HAVE_short_fetch_and_sub1_release)
+# define AO_short_fetch_and_sub1_release(addr) \
+                AO_short_fetch_and_add_release(addr,(unsigned short)(-1))
+# define AO_HAVE_short_fetch_and_sub1_release
+#endif
+#if defined(AO_HAVE_short_fetch_and_add_acquire) \
+    && !defined(AO_HAVE_short_fetch_and_sub1_acquire)
+# define AO_short_fetch_and_sub1_acquire(addr) \
+                AO_short_fetch_and_add_acquire(addr,(unsigned short)(-1))
+# define AO_HAVE_short_fetch_and_sub1_acquire
+#endif
+#if defined(AO_HAVE_short_fetch_and_add_write) \
+    && !defined(AO_HAVE_short_fetch_and_sub1_write)
+# define AO_short_fetch_and_sub1_write(addr) \
+                AO_short_fetch_and_add_write(addr,(unsigned short)(-1))
+# define AO_HAVE_short_fetch_and_sub1_write
+#endif
+#if defined(AO_HAVE_short_fetch_and_add_read) \
+    && !defined(AO_HAVE_short_fetch_and_sub1_read)
+# define AO_short_fetch_and_sub1_read(addr) \
+                AO_short_fetch_and_add_read(addr,(unsigned short)(-1))
+# define AO_HAVE_short_fetch_and_sub1_read
+#endif
+#if defined(AO_HAVE_short_fetch_and_add_release_write) \
+    && !defined(AO_HAVE_short_fetch_and_sub1_release_write)
+# define AO_short_fetch_and_sub1_release_write(addr) \
         AO_short_fetch_and_add_release_write(addr,(unsigned short)(-1))
-#  define AO_HAVE_short_fetch_and_sub1_release_write
+# define AO_HAVE_short_fetch_and_sub1_release_write
 #endif
-#if defined(AO_HAVE_short_fetch_and_add_acquire_read) &&\
-    !defined(AO_HAVE_short_fetch_and_sub1_acquire_read)
-#  define AO_short_fetch_and_sub1_acquire_read(addr) \
+#if defined(AO_HAVE_short_fetch_and_add_acquire_read) \
+    && !defined(AO_HAVE_short_fetch_and_sub1_acquire_read)
+# define AO_short_fetch_and_sub1_acquire_read(addr) \
         AO_short_fetch_and_add_acquire_read(addr,(unsigned short)(-1))
-#  define AO_HAVE_short_fetch_and_sub1_acquire_read
+# define AO_HAVE_short_fetch_and_sub1_acquire_read
 #endif
-#if defined(AO_HAVE_short_fetch_and_add) &&\
-    !defined(AO_HAVE_short_fetch_and_sub1)
-#  define AO_short_fetch_and_sub1(addr) \
-        AO_short_fetch_and_add(addr,(unsigned short)(-1))
-#  define AO_HAVE_short_fetch_and_sub1
+#if defined(AO_HAVE_short_fetch_and_add) \
+    && !defined(AO_HAVE_short_fetch_and_sub1)
+# define AO_short_fetch_and_sub1(addr) \
+                AO_short_fetch_and_add(addr,(unsigned short)(-1))
+# define AO_HAVE_short_fetch_and_sub1
 #endif
 
 #if defined(AO_HAVE_short_fetch_and_sub1_full)
-#  if !defined(AO_HAVE_short_fetch_and_sub1_release)
-#    define AO_short_fetch_and_sub1_release(addr) \
-         AO_short_fetch_and_sub1_full(addr)
-#    define AO_HAVE_short_fetch_and_sub1_release
-#  endif
-#  if !defined(AO_HAVE_short_fetch_and_sub1_acquire)
-#    define AO_short_fetch_and_sub1_acquire(addr) \
-         AO_short_fetch_and_sub1_full(addr)
-#    define AO_HAVE_short_fetch_and_sub1_acquire
-#  endif
-#  if !defined(AO_HAVE_short_fetch_and_sub1_write)
-#    define AO_short_fetch_and_sub1_write(addr) \
-         AO_short_fetch_and_sub1_full(addr)
-#    define AO_HAVE_short_fetch_and_sub1_write
-#  endif
-#  if !defined(AO_HAVE_short_fetch_and_sub1_read)
-#    define AO_short_fetch_and_sub1_read(addr) \
-         AO_short_fetch_and_sub1_full(addr)
-#    define AO_HAVE_short_fetch_and_sub1_read
-#  endif
+# if !defined(AO_HAVE_short_fetch_and_sub1_release)
+#   define AO_short_fetch_and_sub1_release(addr) \
+                                AO_short_fetch_and_sub1_full(addr)
+#   define AO_HAVE_short_fetch_and_sub1_release
+# endif
+# if !defined(AO_HAVE_short_fetch_and_sub1_acquire)
+#   define AO_short_fetch_and_sub1_acquire(addr) \
+                                AO_short_fetch_and_sub1_full(addr)
+#   define AO_HAVE_short_fetch_and_sub1_acquire
+# endif
+# if !defined(AO_HAVE_short_fetch_and_sub1_write)
+#   define AO_short_fetch_and_sub1_write(addr) \
+                                AO_short_fetch_and_sub1_full(addr)
+#   define AO_HAVE_short_fetch_and_sub1_write
+# endif
+# if !defined(AO_HAVE_short_fetch_and_sub1_read)
+#   define AO_short_fetch_and_sub1_read(addr) \
+                                AO_short_fetch_and_sub1_full(addr)
+#   define AO_HAVE_short_fetch_and_sub1_read
+# endif
 #endif /* AO_HAVE_short_fetch_and_sub1_full */
 
-#if !defined(AO_HAVE_short_fetch_and_sub1) && \
-    defined(AO_HAVE_short_fetch_and_sub1_release)
-#  define AO_short_fetch_and_sub1(addr) \
-        AO_short_fetch_and_sub1_release(addr)
-#  define AO_HAVE_short_fetch_and_sub1
-#endif
-#if !defined(AO_HAVE_short_fetch_and_sub1) && \
-    defined(AO_HAVE_short_fetch_and_sub1_acquire)
-#  define AO_short_fetch_and_sub1(addr) \
-        AO_short_fetch_and_sub1_acquire(addr)
-#  define AO_HAVE_short_fetch_and_sub1
-#endif
-#if !defined(AO_HAVE_short_fetch_and_sub1) && \
-    defined(AO_HAVE_short_fetch_and_sub1_write)
-#  define AO_short_fetch_and_sub1(addr) \
-        AO_short_fetch_and_sub1_write(addr)
-#  define AO_HAVE_short_fetch_and_sub1
-#endif
-#if !defined(AO_HAVE_short_fetch_and_sub1) && \
-    defined(AO_HAVE_short_fetch_and_sub1_read)
-#  define AO_short_fetch_and_sub1(addr) \
-        AO_short_fetch_and_sub1_read(addr)
-#  define AO_HAVE_short_fetch_and_sub1
-#endif
-
-#if defined(AO_HAVE_short_fetch_and_sub1_acquire) &&\
-    defined(AO_HAVE_nop_full) && \
-    !defined(AO_HAVE_short_fetch_and_sub1_full)
-#  define AO_short_fetch_and_sub1_full(addr) \
-        (AO_nop_full(), AO_short_fetch_and_sub1_acquire(addr))
-#  define AO_HAVE_short_fetch_and_sub1_full
-#endif
-
-#if !defined(AO_HAVE_short_fetch_and_sub1_release_write) && \
-    defined(AO_HAVE_short_fetch_and_sub1_write)
-#  define AO_short_fetch_and_sub1_release_write(addr) \
-        AO_short_fetch_and_sub1_write(addr)
-#  define AO_HAVE_short_fetch_and_sub1_release_write
-#endif
-#if !defined(AO_HAVE_short_fetch_and_sub1_release_write) && \
-    defined(AO_HAVE_short_fetch_and_sub1_release)
-#  define AO_short_fetch_and_sub1_release_write(addr) \
-        AO_short_fetch_and_sub1_release(addr)
-#  define AO_HAVE_short_fetch_and_sub1_release_write
-#endif
-#if !defined(AO_HAVE_short_fetch_and_sub1_acquire_read) && \
-    defined(AO_HAVE_short_fetch_and_sub1_read)
-#  define AO_short_fetch_and_sub1_acquire_read(addr) \
-        AO_short_fetch_and_sub1_read(addr)
-#  define AO_HAVE_short_fetch_and_sub1_acquire_read
-#endif
-#if !defined(AO_HAVE_short_fetch_and_sub1_acquire_read) && \
-    defined(AO_HAVE_short_fetch_and_sub1_acquire)
-#  define AO_short_fetch_and_sub1_acquire_read(addr) \
-        AO_short_fetch_and_sub1_acquire(addr)
-#  define AO_HAVE_short_fetch_and_sub1_acquire_read
+#if !defined(AO_HAVE_short_fetch_and_sub1) \
+    && defined(AO_HAVE_short_fetch_and_sub1_release)
+# define AO_short_fetch_and_sub1(addr) AO_short_fetch_and_sub1_release(addr)
+# define AO_HAVE_short_fetch_and_sub1
+#endif
+#if !defined(AO_HAVE_short_fetch_and_sub1) \
+    && defined(AO_HAVE_short_fetch_and_sub1_acquire)
+# define AO_short_fetch_and_sub1(addr) AO_short_fetch_and_sub1_acquire(addr)
+# define AO_HAVE_short_fetch_and_sub1
+#endif
+#if !defined(AO_HAVE_short_fetch_and_sub1) \
+    && defined(AO_HAVE_short_fetch_and_sub1_write)
+# define AO_short_fetch_and_sub1(addr) AO_short_fetch_and_sub1_write(addr)
+# define AO_HAVE_short_fetch_and_sub1
+#endif
+#if !defined(AO_HAVE_short_fetch_and_sub1) \
+    && defined(AO_HAVE_short_fetch_and_sub1_read)
+# define AO_short_fetch_and_sub1(addr) AO_short_fetch_and_sub1_read(addr)
+# define AO_HAVE_short_fetch_and_sub1
+#endif
+
+#if defined(AO_HAVE_short_fetch_and_sub1_acquire) \
+    && defined(AO_HAVE_nop_full) \
+    && !defined(AO_HAVE_short_fetch_and_sub1_full)
+# define AO_short_fetch_and_sub1_full(addr) \
+                        (AO_nop_full(), AO_short_fetch_and_sub1_acquire(addr))
+# define AO_HAVE_short_fetch_and_sub1_full
+#endif
+
+#if !defined(AO_HAVE_short_fetch_and_sub1_release_write) \
+    && defined(AO_HAVE_short_fetch_and_sub1_write)
+# define AO_short_fetch_and_sub1_release_write(addr) \
+                                AO_short_fetch_and_sub1_write(addr)
+# define AO_HAVE_short_fetch_and_sub1_release_write
+#endif
+#if !defined(AO_HAVE_short_fetch_and_sub1_release_write) \
+    && defined(AO_HAVE_short_fetch_and_sub1_release)
+# define AO_short_fetch_and_sub1_release_write(addr) \
+                                AO_short_fetch_and_sub1_release(addr)
+# define AO_HAVE_short_fetch_and_sub1_release_write
+#endif
+#if !defined(AO_HAVE_short_fetch_and_sub1_acquire_read) \
+    && defined(AO_HAVE_short_fetch_and_sub1_read)
+# define AO_short_fetch_and_sub1_acquire_read(addr) \
+                                AO_short_fetch_and_sub1_read(addr)
+# define AO_HAVE_short_fetch_and_sub1_acquire_read
+#endif
+#if !defined(AO_HAVE_short_fetch_and_sub1_acquire_read) \
+    && defined(AO_HAVE_short_fetch_and_sub1_acquire)
+# define AO_short_fetch_and_sub1_acquire_read(addr) \
+                                AO_short_fetch_and_sub1_acquire(addr)
+# define AO_HAVE_short_fetch_and_sub1_acquire_read
 #endif
 
 #ifdef AO_NO_DD_ORDERING
-#  if defined(AO_HAVE_short_fetch_and_sub1_acquire_read)
-#    define AO_short_fetch_and_sub1_dd_acquire_read(addr) \
-        AO_short_fetch_and_sub1_acquire_read(addr)
-#    define AO_HAVE_short_fetch_and_sub1_dd_acquire_read
-#  endif
+# if defined(AO_HAVE_short_fetch_and_sub1_acquire_read)
+#   define AO_short_fetch_and_sub1_dd_acquire_read(addr) \
+                                AO_short_fetch_and_sub1_acquire_read(addr)
+#   define AO_HAVE_short_fetch_and_sub1_dd_acquire_read
+# endif
 #else
-#  if defined(AO_HAVE_short_fetch_and_sub1)
-#    define AO_short_fetch_and_sub1_dd_acquire_read(addr) \
-        AO_short_fetch_and_sub1(addr)
-#    define AO_HAVE_short_fetch_and_sub1_dd_acquire_read
-#  endif
-#endif
+# if defined(AO_HAVE_short_fetch_and_sub1)
+#   define AO_short_fetch_and_sub1_dd_acquire_read(addr) \
+                                AO_short_fetch_and_sub1(addr)
+#   define AO_HAVE_short_fetch_and_sub1_dd_acquire_read
+# endif
+#endif /* !AO_NO_DD_ORDERING */
+/*
+ * Copyright (c) 2003-2004 Hewlett-Packard Development Company, L.P.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
 
 /* int_load */
 #if defined(AO_HAVE_int_load_acquire) && !defined(AO_HAVE_int_load)
-#  define AO_int_load(addr) AO_int_load_acquire(addr)
-#  define AO_HAVE_int_load
+# define AO_int_load(addr) AO_int_load_acquire(addr)
+# define AO_HAVE_int_load
 #endif
 
 #if defined(AO_HAVE_int_load_full) && !defined(AO_HAVE_int_load_acquire)
-#  define AO_int_load_acquire(addr) AO_int_load_full(addr)
-#  define AO_HAVE_int_load_acquire
+# define AO_int_load_acquire(addr) AO_int_load_full(addr)
+# define AO_HAVE_int_load_acquire
 #endif
 
 #if defined(AO_HAVE_int_load_full) && !defined(AO_HAVE_int_load_read)
-#  define AO_int_load_read(addr) AO_int_load_full(addr)
-#  define AO_HAVE_int_load_read
+# define AO_int_load_read(addr) AO_int_load_full(addr)
+# define AO_HAVE_int_load_read
 #endif
 
-#if !defined(AO_HAVE_int_load_acquire_read) && defined(AO_HAVE_int_load_acquire)
-#  define AO_int_load_acquire_read(addr) AO_int_load_acquire(addr)
-#  define AO_HAVE_int_load_acquire_read
+#if !defined(AO_HAVE_int_load_acquire_read) \
+    && defined(AO_HAVE_int_load_acquire)
+# define AO_int_load_acquire_read(addr) AO_int_load_acquire(addr)
+# define AO_HAVE_int_load_acquire_read
 #endif
 
-#if defined(AO_HAVE_int_load) && defined(AO_HAVE_nop_full) && \
-    !defined(AO_HAVE_int_load_acquire)
-   AO_INLINE unsigned int
-   AO_int_load_acquire(const volatile unsigned int *addr)
-   {
-     unsigned int result = AO_int_load(addr);
-     /* Acquire barrier would be useless, since the load could be delayed  */
-     /* beyond it.                                                         */
-     AO_nop_full();
-     return result;
-   }
-#  define AO_HAVE_int_load_acquire
+#if defined(AO_HAVE_int_load) && defined(AO_HAVE_nop_full) \
+    && !defined(AO_HAVE_int_load_acquire)
+  AO_INLINE unsigned int
+  AO_int_load_acquire(const volatile unsigned int *addr)
+  {
+    unsigned int result = AO_int_load(addr);
+    /* Acquire barrier would be useless, since the load could be delayed    */
+    /* beyond it.                                                           */
+    AO_nop_full();
+    return result;
+  }
+# define AO_HAVE_int_load_acquire
 #endif
 
-#if defined(AO_HAVE_int_load) && defined(AO_HAVE_nop_read) && \
-    !defined(AO_HAVE_int_load_read)
-   AO_INLINE unsigned int
-   AO_int_load_read(const volatile unsigned int *addr)
-   {
-     unsigned int result = AO_int_load(addr);
-     /* Acquire barrier would be useless, since the load could be delayed  */
-     /* beyond it.                                                         */
-     AO_nop_read();
-     return result;
-   }
-#  define AO_HAVE_int_load_read
+#if defined(AO_HAVE_int_load) && defined(AO_HAVE_nop_read) \
+    && !defined(AO_HAVE_int_load_read)
+  AO_INLINE unsigned int
+  AO_int_load_read(const volatile unsigned int *addr)
+  {
+    unsigned int result = AO_int_load(addr);
+    /* Acquire barrier would be useless, since the load could be delayed    */
+    /* beyond it.                                                           */
+    AO_nop_read();
+    return result;
+  }
+# define AO_HAVE_int_load_read
 #endif
 
-#if defined(AO_HAVE_int_load_acquire) && defined(AO_HAVE_nop_full) && \
-    !defined(AO_HAVE_int_load_full)
-#  define AO_int_load_full(addr) (AO_nop_full(), AO_int_load_acquire(addr))
-#  define AO_HAVE_int_load_full
+#if defined(AO_HAVE_int_load_acquire) && defined(AO_HAVE_nop_full) \
+    && !defined(AO_HAVE_int_load_full)
+# define AO_int_load_full(addr) (AO_nop_full(), AO_int_load_acquire(addr))
+# define AO_HAVE_int_load_full
 #endif
 
-#if !defined(AO_HAVE_int_load_acquire_read) && defined(AO_HAVE_int_load_read)
-#  define AO_int_load_acquire_read(addr) AO_int_load_read(addr)
-#  define AO_HAVE_int_load_acquire_read
+#if !defined(AO_HAVE_int_load_acquire_read) \
+    && defined(AO_HAVE_int_load_read)
+# define AO_int_load_acquire_read(addr) AO_int_load_read(addr)
+# define AO_HAVE_int_load_acquire_read
 #endif
 
 #if defined(AO_HAVE_int_load_acquire_read) && !defined(AO_HAVE_int_load)
-#  define AO_int_load(addr) AO_int_load_acquire_read(addr)
-#  define AO_HAVE_int_load
+# define AO_int_load(addr) AO_int_load_acquire_read(addr)
+# define AO_HAVE_int_load
 #endif
 
 #ifdef AO_NO_DD_ORDERING
-#  if defined(AO_HAVE_int_load_acquire_read)
-#    define AO_int_load_dd_acquire_read(addr) \
-        AO_int_load_acquire_read(addr)
-#    define AO_HAVE_int_load_dd_acquire_read
-#  endif
+# if defined(AO_HAVE_int_load_acquire_read)
+#   define AO_int_load_dd_acquire_read(addr) AO_int_load_acquire_read(addr)
+#   define AO_HAVE_int_load_dd_acquire_read
+# endif
 #else
-#  if defined(AO_HAVE_int_load)
-#    define AO_int_load_dd_acquire_read(addr) \
-        AO_int_load(addr)
-#    define AO_HAVE_int_load_dd_acquire_read
-#  endif
-#endif
-
+# if defined(AO_HAVE_int_load)
+#   define AO_int_load_dd_acquire_read(addr) AO_int_load(addr)
+#   define AO_HAVE_int_load_dd_acquire_read
+# endif
+#endif /* !AO_NO_DD_ORDERING */
 
 /* int_store */
-
 #if defined(AO_HAVE_int_store_release) && !defined(AO_HAVE_int_store)
-#  define AO_int_store(addr, val) AO_int_store_release(addr,val)
-#  define AO_HAVE_int_store
+# define AO_int_store(addr, val) AO_int_store_release(addr,val)
+# define AO_HAVE_int_store
 #endif
 
 #if defined(AO_HAVE_int_store_full) && !defined(AO_HAVE_int_store_release)
-#  define AO_int_store_release(addr,val) AO_int_store_full(addr,val)
-#  define AO_HAVE_int_store_release
+# define AO_int_store_release(addr,val) AO_int_store_full(addr,val)
+# define AO_HAVE_int_store_release
 #endif
 
 #if defined(AO_HAVE_int_store_full) && !defined(AO_HAVE_int_store_write)
-#  define AO_int_store_write(addr,val) AO_int_store_full(addr,val)
-#  define AO_HAVE_int_store_write
+# define AO_int_store_write(addr,val) AO_int_store_full(addr,val)
+# define AO_HAVE_int_store_write
 #endif
 
-#if defined(AO_HAVE_int_store_release) && \
-        !defined(AO_HAVE_int_store_release_write)
-#  define AO_int_store_release_write(addr, val) \
-        AO_int_store_release(addr,val)
-#  define AO_HAVE_int_store_release_write
+#if defined(AO_HAVE_int_store_release) \
+    && !defined(AO_HAVE_int_store_release_write)
+# define AO_int_store_release_write(addr, val) \
+                            AO_int_store_release(addr,val)
+# define AO_HAVE_int_store_release_write
 #endif
 
 #if defined(AO_HAVE_int_store_write) && !defined(AO_HAVE_int_store)
-#  define AO_int_store(addr, val) AO_int_store_write(addr,val)
-#  define AO_HAVE_int_store
+# define AO_int_store(addr, val) AO_int_store_write(addr,val)
+# define AO_HAVE_int_store
 #endif
 
-#if defined(AO_HAVE_int_store) && defined(AO_HAVE_nop_full) && \
-    !defined(AO_HAVE_int_store_release)
-#  define AO_int_store_release(addr,val) \
-        (AO_nop_full(), AO_int_store(addr,val))
-#  define AO_HAVE_int_store_release
+#if defined(AO_HAVE_int_store) && defined(AO_HAVE_nop_full) \
+    && !defined(AO_HAVE_int_store_release)
+# define AO_int_store_release(addr,val) \
+                                (AO_nop_full(), AO_int_store(addr,val))
+# define AO_HAVE_int_store_release
 #endif
 
-#if defined(AO_HAVE_nop_write) && defined(AO_HAVE_int_store) && \
-     !defined(AO_HAVE_int_store_write)
-#  define AO_int_store_write(addr, val) \
-        (AO_nop_write(), AO_int_store(addr,val))
-#  define AO_HAVE_int_store_write
+#if defined(AO_HAVE_nop_write) && defined(AO_HAVE_int_store) \
+    && !defined(AO_HAVE_int_store_write)
+# define AO_int_store_write(addr, val) \
+                                (AO_nop_write(), AO_int_store(addr,val))
+# define AO_HAVE_int_store_write
 #endif
 
-#if defined(AO_HAVE_int_store_write) && \
-     !defined(AO_HAVE_int_store_release_write)
-#  define AO_int_store_release_write(addr, val) AO_int_store_write(addr,val)
-#  define AO_HAVE_int_store_release_write
+#if defined(AO_HAVE_int_store_write) \
+    && !defined(AO_HAVE_int_store_release_write)
+# define AO_int_store_release_write(addr, val) AO_int_store_write(addr,val)
+# define AO_HAVE_int_store_release_write
 #endif
 
-#if defined(AO_HAVE_int_store_release) && defined(AO_HAVE_nop_full) && \
-    !defined(AO_HAVE_int_store_full)
-#  define AO_int_store_full(addr, val) \
-        (AO_int_store_release(addr, val), AO_nop_full())
-#  define AO_HAVE_int_store_full
+#if defined(AO_HAVE_int_store_release) && defined(AO_HAVE_nop_full) \
+    && !defined(AO_HAVE_int_store_full)
+# define AO_int_store_full(addr, val) \
+                        (AO_int_store_release(addr, val), AO_nop_full())
+# define AO_HAVE_int_store_full
 #endif
 
-
 /* int_fetch_and_add */
-#if defined(AO_HAVE_int_compare_and_swap_full) && \
-    !defined(AO_HAVE_int_fetch_and_add_full)
-   AO_INLINE AO_t
-   AO_int_fetch_and_add_full(volatile unsigned int *addr,
-                               unsigned int incr)
-   {
-     unsigned int old;
-     do
-       {
-         old = *addr;
-       }
-     while (!AO_int_compare_and_swap_full(addr, old, old+incr));
-     return old;
-   }
-#  define AO_HAVE_int_fetch_and_add_full
-#endif
-
-#if defined(AO_HAVE_int_compare_and_swap_acquire) && \
-    !defined(AO_HAVE_int_fetch_and_add_acquire)
-   AO_INLINE AO_t
-   AO_int_fetch_and_add_acquire(volatile unsigned int *addr,
-                                  unsigned int incr)
-   {
-     unsigned int old;
-     do
-       {
-         old = *addr;
-       }
-     while (!AO_int_compare_and_swap_acquire(addr, old, old+incr));
-     return old;
-   }
-#  define AO_HAVE_int_fetch_and_add_acquire
-#endif
-
-#if defined(AO_HAVE_int_compare_and_swap_release) && \
-    !defined(AO_HAVE_int_fetch_and_add_release)
-   AO_INLINE AO_t
-   AO_int_fetch_and_add_release(volatile unsigned int *addr,
-                                  unsigned int incr)
-   {
-     unsigned int old;
-     do
-       {
-         old = *addr;
-       }
-     while (!AO_int_compare_and_swap_release(addr, old, old+incr));
-     return old;
-   }
-#  define AO_HAVE_int_fetch_and_add_release
+#if defined(AO_HAVE_int_compare_and_swap_full) \
+    && !defined(AO_HAVE_int_fetch_and_add_full)
+  AO_INLINE AO_t
+  AO_int_fetch_and_add_full(volatile unsigned int *addr,
+                              unsigned int incr)
+  {
+    unsigned int old;
+    do
+      {
+        old = *addr;
+      }
+    while (!AO_int_compare_and_swap_full(addr, old, old+incr));
+    return old;
+  }
+# define AO_HAVE_int_fetch_and_add_full
+#endif
+
+#if defined(AO_HAVE_int_compare_and_swap_acquire) \
+    && !defined(AO_HAVE_int_fetch_and_add_acquire)
+  AO_INLINE AO_t
+  AO_int_fetch_and_add_acquire(volatile unsigned int *addr,
+                                 unsigned int incr)
+  {
+    unsigned int old;
+    do
+      {
+        old = *addr;
+      }
+    while (!AO_int_compare_and_swap_acquire(addr, old, old+incr));
+    return old;
+  }
+# define AO_HAVE_int_fetch_and_add_acquire
+#endif
+
+#if defined(AO_HAVE_int_compare_and_swap_release) \
+    && !defined(AO_HAVE_int_fetch_and_add_release)
+  AO_INLINE AO_t
+  AO_int_fetch_and_add_release(volatile unsigned int *addr,
+                                 unsigned int incr)
+  {
+    unsigned int old;
+    do
+      {
+        old = *addr;
+      }
+    while (!AO_int_compare_and_swap_release(addr, old, old+incr));
+    return old;
+  }
+# define AO_HAVE_int_fetch_and_add_release
 #endif
 
 #if defined(AO_HAVE_int_fetch_and_add_full)
-#  if !defined(AO_HAVE_int_fetch_and_add_release)
-#    define AO_int_fetch_and_add_release(addr, val) \
-         AO_int_fetch_and_add_full(addr, val)
-#    define AO_HAVE_int_fetch_and_add_release
-#  endif
-#  if !defined(AO_HAVE_int_fetch_and_add_acquire)
-#    define AO_int_fetch_and_add_acquire(addr, val) \
-         AO_int_fetch_and_add_full(addr, val)
-#    define AO_HAVE_int_fetch_and_add_acquire
-#  endif
-#  if !defined(AO_HAVE_int_fetch_and_add_write)
-#    define AO_int_fetch_and_add_write(addr, val) \
-         AO_int_fetch_and_add_full(addr, val)
-#    define AO_HAVE_int_fetch_and_add_write
-#  endif
-#  if !defined(AO_HAVE_int_fetch_and_add_read)
-#    define AO_int_fetch_and_add_read(addr, val) \
-         AO_int_fetch_and_add_full(addr, val)
-#    define AO_HAVE_int_fetch_and_add_read
-#  endif
+# if !defined(AO_HAVE_int_fetch_and_add_release)
+#   define AO_int_fetch_and_add_release(addr, val) \
+                                AO_int_fetch_and_add_full(addr, val)
+#   define AO_HAVE_int_fetch_and_add_release
+# endif
+# if !defined(AO_HAVE_int_fetch_and_add_acquire)
+#   define AO_int_fetch_and_add_acquire(addr, val) \
+                                AO_int_fetch_and_add_full(addr, val)
+#   define AO_HAVE_int_fetch_and_add_acquire
+# endif
+# if !defined(AO_HAVE_int_fetch_and_add_write)
+#   define AO_int_fetch_and_add_write(addr, val) \
+                                AO_int_fetch_and_add_full(addr, val)
+#   define AO_HAVE_int_fetch_and_add_write
+# endif
+# if !defined(AO_HAVE_int_fetch_and_add_read)
+#   define AO_int_fetch_and_add_read(addr, val) \
+                                AO_int_fetch_and_add_full(addr, val)
+#   define AO_HAVE_int_fetch_and_add_read
+# endif
 #endif /* AO_HAVE_int_fetch_and_add_full */
 
-#if !defined(AO_HAVE_int_fetch_and_add) && \
-    defined(AO_HAVE_int_fetch_and_add_release)
-#  define AO_int_fetch_and_add(addr, val) \
-        AO_int_fetch_and_add_release(addr, val)
-#  define AO_HAVE_int_fetch_and_add
-#endif
-#if !defined(AO_HAVE_int_fetch_and_add) && \
-    defined(AO_HAVE_int_fetch_and_add_acquire)
-#  define AO_int_fetch_and_add(addr, val) \
-        AO_int_fetch_and_add_acquire(addr, val)
-#  define AO_HAVE_int_fetch_and_add
-#endif
-#if !defined(AO_HAVE_int_fetch_and_add) && \
-    defined(AO_HAVE_int_fetch_and_add_write)
-#  define AO_int_fetch_and_add(addr, val) \
-        AO_int_fetch_and_add_write(addr, val)
-#  define AO_HAVE_int_fetch_and_add
-#endif
-#if !defined(AO_HAVE_int_fetch_and_add) && \
-    defined(AO_HAVE_int_fetch_and_add_read)
-#  define AO_int_fetch_and_add(addr, val) \
-        AO_int_fetch_and_add_read(addr, val)
-#  define AO_HAVE_int_fetch_and_add
-#endif
-
-#if defined(AO_HAVE_int_fetch_and_add_acquire) &&\
-    defined(AO_HAVE_nop_full) && \
-    !defined(AO_HAVE_int_fetch_and_add_full)
-#  define AO_int_fetch_and_add_full(addr, val) \
-        (AO_nop_full(), AO_int_fetch_and_add_acquire(addr, val))
-#endif
-
-#if !defined(AO_HAVE_int_fetch_and_add_release_write) && \
-    defined(AO_HAVE_int_fetch_and_add_write)
-#  define AO_int_fetch_and_add_release_write(addr, val) \
-        AO_int_fetch_and_add_write(addr, val)
-#  define AO_HAVE_int_fetch_and_add_release_write
-#endif
-#if !defined(AO_HAVE_int_fetch_and_add_release_write) && \
-    defined(AO_HAVE_int_fetch_and_add_release)
-#  define AO_int_fetch_and_add_release_write(addr, val) \
-        AO_int_fetch_and_add_release(addr, val)
-#  define AO_HAVE_int_fetch_and_add_release_write
-#endif
-#if !defined(AO_HAVE_int_fetch_and_add_acquire_read) && \
-    defined(AO_HAVE_int_fetch_and_add_read)
-#  define AO_int_fetch_and_add_acquire_read(addr, val) \
-        AO_int_fetch_and_add_read(addr, val)
-#  define AO_HAVE_int_fetch_and_add_acquire_read
-#endif
-#if !defined(AO_HAVE_int_fetch_and_add_acquire_read) && \
-    defined(AO_HAVE_int_fetch_and_add_acquire)
-#  define AO_int_fetch_and_add_acquire_read(addr, val) \
-        AO_int_fetch_and_add_acquire(addr, val)
-#  define AO_HAVE_int_fetch_and_add_acquire_read
+#if !defined(AO_HAVE_int_fetch_and_add) \
+    && defined(AO_HAVE_int_fetch_and_add_release)
+# define AO_int_fetch_and_add(addr, val) \
+                                AO_int_fetch_and_add_release(addr, val)
+# define AO_HAVE_int_fetch_and_add
+#endif
+#if !defined(AO_HAVE_int_fetch_and_add) \
+    && defined(AO_HAVE_int_fetch_and_add_acquire)
+# define AO_int_fetch_and_add(addr, val) \
+                                AO_int_fetch_and_add_acquire(addr, val)
+# define AO_HAVE_int_fetch_and_add
+#endif
+#if !defined(AO_HAVE_int_fetch_and_add) \
+    && defined(AO_HAVE_int_fetch_and_add_write)
+# define AO_int_fetch_and_add(addr, val) \
+                                AO_int_fetch_and_add_write(addr, val)
+# define AO_HAVE_int_fetch_and_add
+#endif
+#if !defined(AO_HAVE_int_fetch_and_add) \
+    && defined(AO_HAVE_int_fetch_and_add_read)
+# define AO_int_fetch_and_add(addr, val) \
+                                AO_int_fetch_and_add_read(addr, val)
+# define AO_HAVE_int_fetch_and_add
+#endif
+
+#if defined(AO_HAVE_int_fetch_and_add_acquire) \
+    && defined(AO_HAVE_nop_full) && !defined(AO_HAVE_int_fetch_and_add_full)
+# define AO_int_fetch_and_add_full(addr, val) \
+                (AO_nop_full(), AO_int_fetch_and_add_acquire(addr, val))
+# define AO_HAVE_int_fetch_and_add_full
+#endif
+
+#if !defined(AO_HAVE_int_fetch_and_add_release_write) \
+    && defined(AO_HAVE_int_fetch_and_add_write)
+# define AO_int_fetch_and_add_release_write(addr, val) \
+                                AO_int_fetch_and_add_write(addr, val)
+# define AO_HAVE_int_fetch_and_add_release_write
+#endif
+#if !defined(AO_HAVE_int_fetch_and_add_release_write) \
+    && defined(AO_HAVE_int_fetch_and_add_release)
+# define AO_int_fetch_and_add_release_write(addr, val) \
+                                AO_int_fetch_and_add_release(addr, val)
+# define AO_HAVE_int_fetch_and_add_release_write
+#endif
+
+#if !defined(AO_HAVE_int_fetch_and_add_acquire_read) \
+    && defined(AO_HAVE_int_fetch_and_add_read)
+# define AO_int_fetch_and_add_acquire_read(addr, val) \
+                                AO_int_fetch_and_add_read(addr, val)
+# define AO_HAVE_int_fetch_and_add_acquire_read
+#endif
+#if !defined(AO_HAVE_int_fetch_and_add_acquire_read) \
+    && defined(AO_HAVE_int_fetch_and_add_acquire)
+# define AO_int_fetch_and_add_acquire_read(addr, val) \
+                                AO_int_fetch_and_add_acquire(addr, val)
+# define AO_HAVE_int_fetch_and_add_acquire_read
 #endif
 
 #ifdef AO_NO_DD_ORDERING
-#  if defined(AO_HAVE_int_fetch_and_add_acquire_read)
-#    define AO_int_fetch_and_add_dd_acquire_read(addr, val) \
-        AO_int_fetch_and_add_acquire_read(addr, val)
-#    define AO_HAVE_int_fetch_and_add_dd_acquire_read
-#  endif
+# if defined(AO_HAVE_int_fetch_and_add_acquire_read)
+#   define AO_int_fetch_and_add_dd_acquire_read(addr, val) \
+                                AO_int_fetch_and_add_acquire_read(addr, val)
+#   define AO_HAVE_int_fetch_and_add_dd_acquire_read
+# endif
 #else
-#  if defined(AO_HAVE_int_fetch_and_add)
-#    define AO_int_fetch_and_add_dd_acquire_read(addr, val) \
-        AO_int_fetch_and_add(addr, val)
-#    define AO_HAVE_int_fetch_and_add_dd_acquire_read
-#  endif
-#endif
+# if defined(AO_HAVE_int_fetch_and_add)
+#   define AO_int_fetch_and_add_dd_acquire_read(addr, val) \
+                                AO_int_fetch_and_add(addr, val)
+#   define AO_HAVE_int_fetch_and_add_dd_acquire_read
+# endif
+#endif /* !AO_NO_DD_ORDERING */
 
 /* int_fetch_and_add1 */
-
-#if defined(AO_HAVE_int_fetch_and_add_full) &&\
-    !defined(AO_HAVE_int_fetch_and_add1_full)
-#  define AO_int_fetch_and_add1_full(addr) \
-        AO_int_fetch_and_add_full(addr,1)
-#  define AO_HAVE_int_fetch_and_add1_full
-#endif
-#if defined(AO_HAVE_int_fetch_and_add_release) &&\
-    !defined(AO_HAVE_int_fetch_and_add1_release)
-#  define AO_int_fetch_and_add1_release(addr) \
-        AO_int_fetch_and_add_release(addr,1)
-#  define AO_HAVE_int_fetch_and_add1_release
-#endif
-#if defined(AO_HAVE_int_fetch_and_add_acquire) &&\
-    !defined(AO_HAVE_int_fetch_and_add1_acquire)
-#  define AO_int_fetch_and_add1_acquire(addr) \
-        AO_int_fetch_and_add_acquire(addr,1)
-#  define AO_HAVE_int_fetch_and_add1_acquire
-#endif
-#if defined(AO_HAVE_int_fetch_and_add_write) &&\
-    !defined(AO_HAVE_int_fetch_and_add1_write)
-#  define AO_int_fetch_and_add1_write(addr) \
-        AO_int_fetch_and_add_write(addr,1)
-#  define AO_HAVE_int_fetch_and_add1_write
-#endif
-#if defined(AO_HAVE_int_fetch_and_add_read) &&\
-    !defined(AO_HAVE_int_fetch_and_add1_read)
-#  define AO_int_fetch_and_add1_read(addr) \
-        AO_int_fetch_and_add_read(addr,1)
-#  define AO_HAVE_int_fetch_and_add1_read
-#endif
-#if defined(AO_HAVE_int_fetch_and_add_release_write) &&\
-    !defined(AO_HAVE_int_fetch_and_add1_release_write)
-#  define AO_int_fetch_and_add1_release_write(addr) \
-        AO_int_fetch_and_add_release_write(addr,1)
-#  define AO_HAVE_int_fetch_and_add1_release_write
-#endif
-#if defined(AO_HAVE_int_fetch_and_add_acquire_read) &&\
-    !defined(AO_HAVE_int_fetch_and_add1_acquire_read)
-#  define AO_int_fetch_and_add1_acquire_read(addr) \
-        AO_int_fetch_and_add_acquire_read(addr,1)
-#  define AO_HAVE_int_fetch_and_add1_acquire_read
-#endif
-#if defined(AO_HAVE_int_fetch_and_add) &&\
-    !defined(AO_HAVE_int_fetch_and_add1)
-#  define AO_int_fetch_and_add1(addr) \
-        AO_int_fetch_and_add(addr,1)
-#  define AO_HAVE_int_fetch_and_add1
+#if defined(AO_HAVE_int_fetch_and_add_full) \
+    && !defined(AO_HAVE_int_fetch_and_add1_full)
+# define AO_int_fetch_and_add1_full(addr) \
+                                AO_int_fetch_and_add_full(addr,1)
+# define AO_HAVE_int_fetch_and_add1_full
+#endif
+#if defined(AO_HAVE_int_fetch_and_add_release) \
+    && !defined(AO_HAVE_int_fetch_and_add1_release)
+# define AO_int_fetch_and_add1_release(addr) \
+                                AO_int_fetch_and_add_release(addr,1)
+# define AO_HAVE_int_fetch_and_add1_release
+#endif
+#if defined(AO_HAVE_int_fetch_and_add_acquire) \
+    && !defined(AO_HAVE_int_fetch_and_add1_acquire)
+# define AO_int_fetch_and_add1_acquire(addr) \
+                                AO_int_fetch_and_add_acquire(addr,1)
+# define AO_HAVE_int_fetch_and_add1_acquire
+#endif
+#if defined(AO_HAVE_int_fetch_and_add_write) \
+    && !defined(AO_HAVE_int_fetch_and_add1_write)
+# define AO_int_fetch_and_add1_write(addr) \
+                                AO_int_fetch_and_add_write(addr,1)
+# define AO_HAVE_int_fetch_and_add1_write
+#endif
+#if defined(AO_HAVE_int_fetch_and_add_read) \
+    && !defined(AO_HAVE_int_fetch_and_add1_read)
+# define AO_int_fetch_and_add1_read(addr) \
+                                AO_int_fetch_and_add_read(addr,1)
+# define AO_HAVE_int_fetch_and_add1_read
+#endif
+#if defined(AO_HAVE_int_fetch_and_add_release_write) \
+    && !defined(AO_HAVE_int_fetch_and_add1_release_write)
+# define AO_int_fetch_and_add1_release_write(addr) \
+                                AO_int_fetch_and_add_release_write(addr,1)
+# define AO_HAVE_int_fetch_and_add1_release_write
+#endif
+#if defined(AO_HAVE_int_fetch_and_add_acquire_read) \
+    && !defined(AO_HAVE_int_fetch_and_add1_acquire_read)
+# define AO_int_fetch_and_add1_acquire_read(addr) \
+                                AO_int_fetch_and_add_acquire_read(addr,1)
+# define AO_HAVE_int_fetch_and_add1_acquire_read
+#endif
+#if defined(AO_HAVE_int_fetch_and_add) \
+    && !defined(AO_HAVE_int_fetch_and_add1)
+# define AO_int_fetch_and_add1(addr) AO_int_fetch_and_add(addr,1)
+# define AO_HAVE_int_fetch_and_add1
 #endif
 
 #if defined(AO_HAVE_int_fetch_and_add1_full)
-#  if !defined(AO_HAVE_int_fetch_and_add1_release)
-#    define AO_int_fetch_and_add1_release(addr) \
-         AO_int_fetch_and_add1_full(addr)
-#    define AO_HAVE_int_fetch_and_add1_release
-#  endif
-#  if !defined(AO_HAVE_int_fetch_and_add1_acquire)
-#    define AO_int_fetch_and_add1_acquire(addr) \
-         AO_int_fetch_and_add1_full(addr)
-#    define AO_HAVE_int_fetch_and_add1_acquire
-#  endif
-#  if !defined(AO_HAVE_int_fetch_and_add1_write)
-#    define AO_int_fetch_and_add1_write(addr) \
-         AO_int_fetch_and_add1_full(addr)
-#    define AO_HAVE_int_fetch_and_add1_write
-#  endif
-#  if !defined(AO_HAVE_int_fetch_and_add1_read)
-#    define AO_int_fetch_and_add1_read(addr) \
-         AO_int_fetch_and_add1_full(addr)
-#    define AO_HAVE_int_fetch_and_add1_read
-#  endif
+# if !defined(AO_HAVE_int_fetch_and_add1_release)
+#   define AO_int_fetch_and_add1_release(addr) \
+                                AO_int_fetch_and_add1_full(addr)
+#   define AO_HAVE_int_fetch_and_add1_release
+# endif
+# if !defined(AO_HAVE_int_fetch_and_add1_acquire)
+#   define AO_int_fetch_and_add1_acquire(addr) \
+                                AO_int_fetch_and_add1_full(addr)
+#   define AO_HAVE_int_fetch_and_add1_acquire
+# endif
+# if !defined(AO_HAVE_int_fetch_and_add1_write)
+#   define AO_int_fetch_and_add1_write(addr) \
+                                AO_int_fetch_and_add1_full(addr)
+#   define AO_HAVE_int_fetch_and_add1_write
+# endif
+# if !defined(AO_HAVE_int_fetch_and_add1_read)
+#   define AO_int_fetch_and_add1_read(addr) \
+                                AO_int_fetch_and_add1_full(addr)
+#   define AO_HAVE_int_fetch_and_add1_read
+# endif
 #endif /* AO_HAVE_int_fetch_and_add1_full */
 
-#if !defined(AO_HAVE_int_fetch_and_add1) && \
-    defined(AO_HAVE_int_fetch_and_add1_release)
-#  define AO_int_fetch_and_add1(addr) \
-        AO_int_fetch_and_add1_release(addr)
-#  define AO_HAVE_int_fetch_and_add1
-#endif
-#if !defined(AO_HAVE_int_fetch_and_add1) && \
-    defined(AO_HAVE_int_fetch_and_add1_acquire)
-#  define AO_int_fetch_and_add1(addr) \
-        AO_int_fetch_and_add1_acquire(addr)
-#  define AO_HAVE_int_fetch_and_add1
-#endif
-#if !defined(AO_HAVE_int_fetch_and_add1) && \
-    defined(AO_HAVE_int_fetch_and_add1_write)
-#  define AO_int_fetch_and_add1(addr) \
-        AO_int_fetch_and_add1_write(addr)
-#  define AO_HAVE_int_fetch_and_add1
-#endif
-#if !defined(AO_HAVE_int_fetch_and_add1) && \
-    defined(AO_HAVE_int_fetch_and_add1_read)
-#  define AO_int_fetch_and_add1(addr) \
-        AO_int_fetch_and_add1_read(addr)
-#  define AO_HAVE_int_fetch_and_add1
-#endif
-
-#if defined(AO_HAVE_int_fetch_and_add1_acquire) &&\
-    defined(AO_HAVE_nop_full) && \
-    !defined(AO_HAVE_int_fetch_and_add1_full)
-#  define AO_int_fetch_and_add1_full(addr) \
-        (AO_nop_full(), AO_int_fetch_and_add1_acquire(addr))
-#  define AO_HAVE_int_fetch_and_add1_full
-#endif
-
-#if !defined(AO_HAVE_int_fetch_and_add1_release_write) && \
-    defined(AO_HAVE_int_fetch_and_add1_write)
-#  define AO_int_fetch_and_add1_release_write(addr) \
-        AO_int_fetch_and_add1_write(addr)
-#  define AO_HAVE_int_fetch_and_add1_release_write
-#endif
-#if !defined(AO_HAVE_int_fetch_and_add1_release_write) && \
-    defined(AO_HAVE_int_fetch_and_add1_release)
-#  define AO_int_fetch_and_add1_release_write(addr) \
-        AO_int_fetch_and_add1_release(addr)
-#  define AO_HAVE_int_fetch_and_add1_release_write
-#endif
-#if !defined(AO_HAVE_int_fetch_and_add1_acquire_read) && \
-    defined(AO_HAVE_int_fetch_and_add1_read)
-#  define AO_int_fetch_and_add1_acquire_read(addr) \
-        AO_int_fetch_and_add1_read(addr)
-#  define AO_HAVE_int_fetch_and_add1_acquire_read
-#endif
-#if !defined(AO_HAVE_int_fetch_and_add1_acquire_read) && \
-    defined(AO_HAVE_int_fetch_and_add1_acquire)
-#  define AO_int_fetch_and_add1_acquire_read(addr) \
-        AO_int_fetch_and_add1_acquire(addr)
-#  define AO_HAVE_int_fetch_and_add1_acquire_read
+#if !defined(AO_HAVE_int_fetch_and_add1) \
+    && defined(AO_HAVE_int_fetch_and_add1_release)
+# define AO_int_fetch_and_add1(addr) AO_int_fetch_and_add1_release(addr)
+# define AO_HAVE_int_fetch_and_add1
+#endif
+#if !defined(AO_HAVE_int_fetch_and_add1) \
+    && defined(AO_HAVE_int_fetch_and_add1_acquire)
+# define AO_int_fetch_and_add1(addr) AO_int_fetch_and_add1_acquire(addr)
+# define AO_HAVE_int_fetch_and_add1
+#endif
+#if !defined(AO_HAVE_int_fetch_and_add1) \
+    && defined(AO_HAVE_int_fetch_and_add1_write)
+# define AO_int_fetch_and_add1(addr) AO_int_fetch_and_add1_write(addr)
+# define AO_HAVE_int_fetch_and_add1
+#endif
+#if !defined(AO_HAVE_int_fetch_and_add1) \
+    && defined(AO_HAVE_int_fetch_and_add1_read)
+# define AO_int_fetch_and_add1(addr) AO_int_fetch_and_add1_read(addr)
+# define AO_HAVE_int_fetch_and_add1
+#endif
+
+#if defined(AO_HAVE_int_fetch_and_add1_acquire) \
+    && defined(AO_HAVE_nop_full) \
+    && !defined(AO_HAVE_int_fetch_and_add1_full)
+# define AO_int_fetch_and_add1_full(addr) \
+                        (AO_nop_full(), AO_int_fetch_and_add1_acquire(addr))
+# define AO_HAVE_int_fetch_and_add1_full
+#endif
+
+#if !defined(AO_HAVE_int_fetch_and_add1_release_write) \
+    && defined(AO_HAVE_int_fetch_and_add1_write)
+# define AO_int_fetch_and_add1_release_write(addr) \
+                                AO_int_fetch_and_add1_write(addr)
+# define AO_HAVE_int_fetch_and_add1_release_write
+#endif
+#if !defined(AO_HAVE_int_fetch_and_add1_release_write) \
+    && defined(AO_HAVE_int_fetch_and_add1_release)
+# define AO_int_fetch_and_add1_release_write(addr) \
+                                AO_int_fetch_and_add1_release(addr)
+# define AO_HAVE_int_fetch_and_add1_release_write
+#endif
+#if !defined(AO_HAVE_int_fetch_and_add1_acquire_read) \
+    && defined(AO_HAVE_int_fetch_and_add1_read)
+# define AO_int_fetch_and_add1_acquire_read(addr) \
+                                AO_int_fetch_and_add1_read(addr)
+# define AO_HAVE_int_fetch_and_add1_acquire_read
+#endif
+#if !defined(AO_HAVE_int_fetch_and_add1_acquire_read) \
+    && defined(AO_HAVE_int_fetch_and_add1_acquire)
+# define AO_int_fetch_and_add1_acquire_read(addr) \
+                                AO_int_fetch_and_add1_acquire(addr)
+# define AO_HAVE_int_fetch_and_add1_acquire_read
 #endif
 
 #ifdef AO_NO_DD_ORDERING
-#  if defined(AO_HAVE_int_fetch_and_add1_acquire_read)
-#    define AO_int_fetch_and_add1_dd_acquire_read(addr) \
-        AO_int_fetch_and_add1_acquire_read(addr)
-#    define AO_HAVE_int_fetch_and_add1_dd_acquire_read
-#  endif
+# if defined(AO_HAVE_int_fetch_and_add1_acquire_read)
+#   define AO_int_fetch_and_add1_dd_acquire_read(addr) \
+                                AO_int_fetch_and_add1_acquire_read(addr)
+#   define AO_HAVE_int_fetch_and_add1_dd_acquire_read
+# endif
 #else
-#  if defined(AO_HAVE_int_fetch_and_add1)
-#    define AO_int_fetch_and_add1_dd_acquire_read(addr) \
-        AO_int_fetch_and_add1(addr)
-#    define AO_HAVE_int_fetch_and_add1_dd_acquire_read
-#  endif
-#endif
+# if defined(AO_HAVE_int_fetch_and_add1)
+#   define AO_int_fetch_and_add1_dd_acquire_read(addr) \
+                                AO_int_fetch_and_add1(addr)
+#   define AO_HAVE_int_fetch_and_add1_dd_acquire_read
+# endif
+#endif /* !AO_NO_DD_ORDERING */
 
 /* int_fetch_and_sub1 */
-
-#if defined(AO_HAVE_int_fetch_and_add_full) &&\
-    !defined(AO_HAVE_int_fetch_and_sub1_full)
-#  define AO_int_fetch_and_sub1_full(addr) \
-        AO_int_fetch_and_add_full(addr,(unsigned int)(-1))
-#  define AO_HAVE_int_fetch_and_sub1_full
-#endif
-#if defined(AO_HAVE_int_fetch_and_add_release) &&\
-    !defined(AO_HAVE_int_fetch_and_sub1_release)
-#  define AO_int_fetch_and_sub1_release(addr) \
-        AO_int_fetch_and_add_release(addr,(unsigned int)(-1))
-#  define AO_HAVE_int_fetch_and_sub1_release
-#endif
-#if defined(AO_HAVE_int_fetch_and_add_acquire) &&\
-    !defined(AO_HAVE_int_fetch_and_sub1_acquire)
-#  define AO_int_fetch_and_sub1_acquire(addr) \
-        AO_int_fetch_and_add_acquire(addr,(unsigned int)(-1))
-#  define AO_HAVE_int_fetch_and_sub1_acquire
-#endif
-#if defined(AO_HAVE_int_fetch_and_add_write) &&\
-    !defined(AO_HAVE_int_fetch_and_sub1_write)
-#  define AO_int_fetch_and_sub1_write(addr) \
-        AO_int_fetch_and_add_write(addr,(unsigned int)(-1))
-#  define AO_HAVE_int_fetch_and_sub1_write
-#endif
-#if defined(AO_HAVE_int_fetch_and_add_read) &&\
-    !defined(AO_HAVE_int_fetch_and_sub1_read)
-#  define AO_int_fetch_and_sub1_read(addr) \
-        AO_int_fetch_and_add_read(addr,(unsigned int)(-1))
-#  define AO_HAVE_int_fetch_and_sub1_read
-#endif
-#if defined(AO_HAVE_int_fetch_and_add_release_write) &&\
-    !defined(AO_HAVE_int_fetch_and_sub1_release_write)
-#  define AO_int_fetch_and_sub1_release_write(addr) \
+#if defined(AO_HAVE_int_fetch_and_add_full) \
+    && !defined(AO_HAVE_int_fetch_and_sub1_full)
+# define AO_int_fetch_and_sub1_full(addr) \
+                AO_int_fetch_and_add_full(addr,(unsigned int)(-1))
+# define AO_HAVE_int_fetch_and_sub1_full
+#endif
+#if defined(AO_HAVE_int_fetch_and_add_release) \
+    && !defined(AO_HAVE_int_fetch_and_sub1_release)
+# define AO_int_fetch_and_sub1_release(addr) \
+                AO_int_fetch_and_add_release(addr,(unsigned int)(-1))
+# define AO_HAVE_int_fetch_and_sub1_release
+#endif
+#if defined(AO_HAVE_int_fetch_and_add_acquire) \
+    && !defined(AO_HAVE_int_fetch_and_sub1_acquire)
+# define AO_int_fetch_and_sub1_acquire(addr) \
+                AO_int_fetch_and_add_acquire(addr,(unsigned int)(-1))
+# define AO_HAVE_int_fetch_and_sub1_acquire
+#endif
+#if defined(AO_HAVE_int_fetch_and_add_write) \
+    && !defined(AO_HAVE_int_fetch_and_sub1_write)
+# define AO_int_fetch_and_sub1_write(addr) \
+                AO_int_fetch_and_add_write(addr,(unsigned int)(-1))
+# define AO_HAVE_int_fetch_and_sub1_write
+#endif
+#if defined(AO_HAVE_int_fetch_and_add_read) \
+    && !defined(AO_HAVE_int_fetch_and_sub1_read)
+# define AO_int_fetch_and_sub1_read(addr) \
+                AO_int_fetch_and_add_read(addr,(unsigned int)(-1))
+# define AO_HAVE_int_fetch_and_sub1_read
+#endif
+#if defined(AO_HAVE_int_fetch_and_add_release_write) \
+    && !defined(AO_HAVE_int_fetch_and_sub1_release_write)
+# define AO_int_fetch_and_sub1_release_write(addr) \
         AO_int_fetch_and_add_release_write(addr,(unsigned int)(-1))
-#  define AO_HAVE_int_fetch_and_sub1_release_write
+# define AO_HAVE_int_fetch_and_sub1_release_write
 #endif
-#if defined(AO_HAVE_int_fetch_and_add_acquire_read) &&\
-    !defined(AO_HAVE_int_fetch_and_sub1_acquire_read)
-#  define AO_int_fetch_and_sub1_acquire_read(addr) \
+#if defined(AO_HAVE_int_fetch_and_add_acquire_read) \
+    && !defined(AO_HAVE_int_fetch_and_sub1_acquire_read)
+# define AO_int_fetch_and_sub1_acquire_read(addr) \
         AO_int_fetch_and_add_acquire_read(addr,(unsigned int)(-1))
-#  define AO_HAVE_int_fetch_and_sub1_acquire_read
+# define AO_HAVE_int_fetch_and_sub1_acquire_read
 #endif
-#if defined(AO_HAVE_int_fetch_and_add) &&\
-    !defined(AO_HAVE_int_fetch_and_sub1)
-#  define AO_int_fetch_and_sub1(addr) \
-        AO_int_fetch_and_add(addr,(unsigned int)(-1))
-#  define AO_HAVE_int_fetch_and_sub1
+#if defined(AO_HAVE_int_fetch_and_add) \
+    && !defined(AO_HAVE_int_fetch_and_sub1)
+# define AO_int_fetch_and_sub1(addr) \
+                AO_int_fetch_and_add(addr,(unsigned int)(-1))
+# define AO_HAVE_int_fetch_and_sub1
 #endif
 
 #if defined(AO_HAVE_int_fetch_and_sub1_full)
-#  if !defined(AO_HAVE_int_fetch_and_sub1_release)
-#    define AO_int_fetch_and_sub1_release(addr) \
-         AO_int_fetch_and_sub1_full(addr)
-#    define AO_HAVE_int_fetch_and_sub1_release
-#  endif
-#  if !defined(AO_HAVE_int_fetch_and_sub1_acquire)
-#    define AO_int_fetch_and_sub1_acquire(addr) \
-         AO_int_fetch_and_sub1_full(addr)
-#    define AO_HAVE_int_fetch_and_sub1_acquire
-#  endif
-#  if !defined(AO_HAVE_int_fetch_and_sub1_write)
-#    define AO_int_fetch_and_sub1_write(addr) \
-         AO_int_fetch_and_sub1_full(addr)
-#    define AO_HAVE_int_fetch_and_sub1_write
-#  endif
-#  if !defined(AO_HAVE_int_fetch_and_sub1_read)
-#    define AO_int_fetch_and_sub1_read(addr) \
-         AO_int_fetch_and_sub1_full(addr)
-#    define AO_HAVE_int_fetch_and_sub1_read
-#  endif
+# if !defined(AO_HAVE_int_fetch_and_sub1_release)
+#   define AO_int_fetch_and_sub1_release(addr) \
+                                AO_int_fetch_and_sub1_full(addr)
+#   define AO_HAVE_int_fetch_and_sub1_release
+# endif
+# if !defined(AO_HAVE_int_fetch_and_sub1_acquire)
+#   define AO_int_fetch_and_sub1_acquire(addr) \
+                                AO_int_fetch_and_sub1_full(addr)
+#   define AO_HAVE_int_fetch_and_sub1_acquire
+# endif
+# if !defined(AO_HAVE_int_fetch_and_sub1_write)
+#   define AO_int_fetch_and_sub1_write(addr) \
+                                AO_int_fetch_and_sub1_full(addr)
+#   define AO_HAVE_int_fetch_and_sub1_write
+# endif
+# if !defined(AO_HAVE_int_fetch_and_sub1_read)
+#   define AO_int_fetch_and_sub1_read(addr) \
+                                AO_int_fetch_and_sub1_full(addr)
+#   define AO_HAVE_int_fetch_and_sub1_read
+# endif
 #endif /* AO_HAVE_int_fetch_and_sub1_full */
 
-#if !defined(AO_HAVE_int_fetch_and_sub1) && \
-    defined(AO_HAVE_int_fetch_and_sub1_release)
-#  define AO_int_fetch_and_sub1(addr) \
-        AO_int_fetch_and_sub1_release(addr)
-#  define AO_HAVE_int_fetch_and_sub1
-#endif
-#if !defined(AO_HAVE_int_fetch_and_sub1) && \
-    defined(AO_HAVE_int_fetch_and_sub1_acquire)
-#  define AO_int_fetch_and_sub1(addr) \
-        AO_int_fetch_and_sub1_acquire(addr)
-#  define AO_HAVE_int_fetch_and_sub1
-#endif
-#if !defined(AO_HAVE_int_fetch_and_sub1) && \
-    defined(AO_HAVE_int_fetch_and_sub1_write)
-#  define AO_int_fetch_and_sub1(addr) \
-        AO_int_fetch_and_sub1_write(addr)
-#  define AO_HAVE_int_fetch_and_sub1
-#endif
-#if !defined(AO_HAVE_int_fetch_and_sub1) && \
-    defined(AO_HAVE_int_fetch_and_sub1_read)
-#  define AO_int_fetch_and_sub1(addr) \
-        AO_int_fetch_and_sub1_read(addr)
-#  define AO_HAVE_int_fetch_and_sub1
-#endif
-
-#if defined(AO_HAVE_int_fetch_and_sub1_acquire) &&\
-    defined(AO_HAVE_nop_full) && \
-    !defined(AO_HAVE_int_fetch_and_sub1_full)
-#  define AO_int_fetch_and_sub1_full(addr) \
-        (AO_nop_full(), AO_int_fetch_and_sub1_acquire(addr))
-#  define AO_HAVE_int_fetch_and_sub1_full
-#endif
-
-#if !defined(AO_HAVE_int_fetch_and_sub1_release_write) && \
-    defined(AO_HAVE_int_fetch_and_sub1_write)
-#  define AO_int_fetch_and_sub1_release_write(addr) \
-        AO_int_fetch_and_sub1_write(addr)
-#  define AO_HAVE_int_fetch_and_sub1_release_write
-#endif
-#if !defined(AO_HAVE_int_fetch_and_sub1_release_write) && \
-    defined(AO_HAVE_int_fetch_and_sub1_release)
-#  define AO_int_fetch_and_sub1_release_write(addr) \
-        AO_int_fetch_and_sub1_release(addr)
-#  define AO_HAVE_int_fetch_and_sub1_release_write
-#endif
-#if !defined(AO_HAVE_int_fetch_and_sub1_acquire_read) && \
-    defined(AO_HAVE_int_fetch_and_sub1_read)
-#  define AO_int_fetch_and_sub1_acquire_read(addr) \
-        AO_int_fetch_and_sub1_read(addr)
-#  define AO_HAVE_int_fetch_and_sub1_acquire_read
-#endif
-#if !defined(AO_HAVE_int_fetch_and_sub1_acquire_read) && \
-    defined(AO_HAVE_int_fetch_and_sub1_acquire)
-#  define AO_int_fetch_and_sub1_acquire_read(addr) \
-        AO_int_fetch_and_sub1_acquire(addr)
-#  define AO_HAVE_int_fetch_and_sub1_acquire_read
+#if !defined(AO_HAVE_int_fetch_and_sub1) \
+    && defined(AO_HAVE_int_fetch_and_sub1_release)
+# define AO_int_fetch_and_sub1(addr) AO_int_fetch_and_sub1_release(addr)
+# define AO_HAVE_int_fetch_and_sub1
+#endif
+#if !defined(AO_HAVE_int_fetch_and_sub1) \
+    && defined(AO_HAVE_int_fetch_and_sub1_acquire)
+# define AO_int_fetch_and_sub1(addr) AO_int_fetch_and_sub1_acquire(addr)
+# define AO_HAVE_int_fetch_and_sub1
+#endif
+#if !defined(AO_HAVE_int_fetch_and_sub1) \
+    && defined(AO_HAVE_int_fetch_and_sub1_write)
+# define AO_int_fetch_and_sub1(addr) AO_int_fetch_and_sub1_write(addr)
+# define AO_HAVE_int_fetch_and_sub1
+#endif
+#if !defined(AO_HAVE_int_fetch_and_sub1) \
+    && defined(AO_HAVE_int_fetch_and_sub1_read)
+# define AO_int_fetch_and_sub1(addr) AO_int_fetch_and_sub1_read(addr)
+# define AO_HAVE_int_fetch_and_sub1
+#endif
+
+#if defined(AO_HAVE_int_fetch_and_sub1_acquire) \
+    && defined(AO_HAVE_nop_full) \
+    && !defined(AO_HAVE_int_fetch_and_sub1_full)
+# define AO_int_fetch_and_sub1_full(addr) \
+                        (AO_nop_full(), AO_int_fetch_and_sub1_acquire(addr))
+# define AO_HAVE_int_fetch_and_sub1_full
+#endif
+
+#if !defined(AO_HAVE_int_fetch_and_sub1_release_write) \
+    && defined(AO_HAVE_int_fetch_and_sub1_write)
+# define AO_int_fetch_and_sub1_release_write(addr) \
+                                AO_int_fetch_and_sub1_write(addr)
+# define AO_HAVE_int_fetch_and_sub1_release_write
+#endif
+#if !defined(AO_HAVE_int_fetch_and_sub1_release_write) \
+    && defined(AO_HAVE_int_fetch_and_sub1_release)
+# define AO_int_fetch_and_sub1_release_write(addr) \
+                                AO_int_fetch_and_sub1_release(addr)
+# define AO_HAVE_int_fetch_and_sub1_release_write
+#endif
+#if !defined(AO_HAVE_int_fetch_and_sub1_acquire_read) \
+    && defined(AO_HAVE_int_fetch_and_sub1_read)
+# define AO_int_fetch_and_sub1_acquire_read(addr) \
+                                AO_int_fetch_and_sub1_read(addr)
+# define AO_HAVE_int_fetch_and_sub1_acquire_read
+#endif
+#if !defined(AO_HAVE_int_fetch_and_sub1_acquire_read) \
+    && defined(AO_HAVE_int_fetch_and_sub1_acquire)
+# define AO_int_fetch_and_sub1_acquire_read(addr) \
+                                AO_int_fetch_and_sub1_acquire(addr)
+# define AO_HAVE_int_fetch_and_sub1_acquire_read
 #endif
 
 #ifdef AO_NO_DD_ORDERING
-#  if defined(AO_HAVE_int_fetch_and_sub1_acquire_read)
-#    define AO_int_fetch_and_sub1_dd_acquire_read(addr) \
-        AO_int_fetch_and_sub1_acquire_read(addr)
-#    define AO_HAVE_int_fetch_and_sub1_dd_acquire_read
-#  endif
+# if defined(AO_HAVE_int_fetch_and_sub1_acquire_read)
+#   define AO_int_fetch_and_sub1_dd_acquire_read(addr) \
+                                AO_int_fetch_and_sub1_acquire_read(addr)
+#   define AO_HAVE_int_fetch_and_sub1_dd_acquire_read
+# endif
 #else
-#  if defined(AO_HAVE_int_fetch_and_sub1)
-#    define AO_int_fetch_and_sub1_dd_acquire_read(addr) \
-        AO_int_fetch_and_sub1(addr)
-#    define AO_HAVE_int_fetch_and_sub1_dd_acquire_read
-#  endif
-#endif
+# if defined(AO_HAVE_int_fetch_and_sub1)
+#   define AO_int_fetch_and_sub1_dd_acquire_read(addr) \
+                                AO_int_fetch_and_sub1(addr)
+#   define AO_HAVE_int_fetch_and_sub1_dd_acquire_read
+# endif
+#endif /* !AO_NO_DD_ORDERING */

diff --git a/src/atomic_ops/generalize-small.template b/src/atomic_ops/generalize-small.template
index c9373df..1200159 100644 (file)
--- a/src/atomic_ops/generalize-small.template
+++ b/src/atomic_ops/generalize-small.template
@@ -1,575 +1,583 @@
+/*
+ * Copyright (c) 2003-2004 Hewlett-Packard Development Company, L.P.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
 /* XSIZE_load */
 #if defined(AO_HAVE_XSIZE_load_acquire) && !defined(AO_HAVE_XSIZE_load)
-#  define AO_XSIZE_load(addr) AO_XSIZE_load_acquire(addr)
-#  define AO_HAVE_XSIZE_load
+# define AO_XSIZE_load(addr) AO_XSIZE_load_acquire(addr)
+# define AO_HAVE_XSIZE_load
 #endif
 
 #if defined(AO_HAVE_XSIZE_load_full) && !defined(AO_HAVE_XSIZE_load_acquire)
-#  define AO_XSIZE_load_acquire(addr) AO_XSIZE_load_full(addr)
-#  define AO_HAVE_XSIZE_load_acquire
+# define AO_XSIZE_load_acquire(addr) AO_XSIZE_load_full(addr)
+# define AO_HAVE_XSIZE_load_acquire
 #endif
 
 #if defined(AO_HAVE_XSIZE_load_full) && !defined(AO_HAVE_XSIZE_load_read)
-#  define AO_XSIZE_load_read(addr) AO_XSIZE_load_full(addr)
-#  define AO_HAVE_XSIZE_load_read
-#endif
-
-#if !defined(AO_HAVE_XSIZE_load_acquire_read) && defined(AO_HAVE_XSIZE_load_acquire)
-#  define AO_XSIZE_load_acquire_read(addr) AO_XSIZE_load_acquire(addr)
-#  define AO_HAVE_XSIZE_load_acquire_read
-#endif
-
-#if defined(AO_HAVE_XSIZE_load) && defined(AO_HAVE_nop_full) && \
-    !defined(AO_HAVE_XSIZE_load_acquire)
-   AO_INLINE unsigned XCTYPE
-   AO_XSIZE_load_acquire(const volatile unsigned XCTYPE *addr)
-   {
-     unsigned XCTYPE result = AO_XSIZE_load(addr);
-     /* Acquire barrier would be useless, since the load could be delayed  */
-     /* beyond it.                                                        */
-     AO_nop_full();
-     return result;
-   }
-#  define AO_HAVE_XSIZE_load_acquire
-#endif
-
-#if defined(AO_HAVE_XSIZE_load) && defined(AO_HAVE_nop_read) && \
-    !defined(AO_HAVE_XSIZE_load_read)
-   AO_INLINE unsigned XCTYPE
-   AO_XSIZE_load_read(const volatile unsigned XCTYPE *addr)
-   {
-     unsigned XCTYPE result = AO_XSIZE_load(addr);
-     /* Acquire barrier would be useless, since the load could be delayed  */
-     /* beyond it.                                                        */
-     AO_nop_read();
-     return result;
-   }
-#  define AO_HAVE_XSIZE_load_read
-#endif
-
-#if defined(AO_HAVE_XSIZE_load_acquire) && defined(AO_HAVE_nop_full) && \
-    !defined(AO_HAVE_XSIZE_load_full)
-#  define AO_XSIZE_load_full(addr) (AO_nop_full(), AO_XSIZE_load_acquire(addr))
-#  define AO_HAVE_XSIZE_load_full
-#endif
- 
-#if !defined(AO_HAVE_XSIZE_load_acquire_read) && defined(AO_HAVE_XSIZE_load_read)
-#  define AO_XSIZE_load_acquire_read(addr) AO_XSIZE_load_read(addr)
-#  define AO_HAVE_XSIZE_load_acquire_read
+# define AO_XSIZE_load_read(addr) AO_XSIZE_load_full(addr)
+# define AO_HAVE_XSIZE_load_read
+#endif
+
+#if !defined(AO_HAVE_XSIZE_load_acquire_read) \
+    && defined(AO_HAVE_XSIZE_load_acquire)
+# define AO_XSIZE_load_acquire_read(addr) AO_XSIZE_load_acquire(addr)
+# define AO_HAVE_XSIZE_load_acquire_read
+#endif
+
+#if defined(AO_HAVE_XSIZE_load) && defined(AO_HAVE_nop_full) \
+    && !defined(AO_HAVE_XSIZE_load_acquire)
+  AO_INLINE unsigned XCTYPE
+  AO_XSIZE_load_acquire(const volatile unsigned XCTYPE *addr)
+  {
+    unsigned XCTYPE result = AO_XSIZE_load(addr);
+    /* Acquire barrier would be useless, since the load could be delayed    */
+    /* beyond it.                                                           */
+    AO_nop_full();
+    return result;
+  }
+# define AO_HAVE_XSIZE_load_acquire
+#endif
+
+#if defined(AO_HAVE_XSIZE_load) && defined(AO_HAVE_nop_read) \
+    && !defined(AO_HAVE_XSIZE_load_read)
+  AO_INLINE unsigned XCTYPE
+  AO_XSIZE_load_read(const volatile unsigned XCTYPE *addr)
+  {
+    unsigned XCTYPE result = AO_XSIZE_load(addr);
+    /* Acquire barrier would be useless, since the load could be delayed    */
+    /* beyond it.                                                           */
+    AO_nop_read();
+    return result;
+  }
+# define AO_HAVE_XSIZE_load_read
+#endif
+
+#if defined(AO_HAVE_XSIZE_load_acquire) && defined(AO_HAVE_nop_full) \
+    && !defined(AO_HAVE_XSIZE_load_full)
+# define AO_XSIZE_load_full(addr) (AO_nop_full(), AO_XSIZE_load_acquire(addr))
+# define AO_HAVE_XSIZE_load_full
+#endif
+
+#if !defined(AO_HAVE_XSIZE_load_acquire_read) \
+    && defined(AO_HAVE_XSIZE_load_read)
+# define AO_XSIZE_load_acquire_read(addr) AO_XSIZE_load_read(addr)
+# define AO_HAVE_XSIZE_load_acquire_read
 #endif
 
 #if defined(AO_HAVE_XSIZE_load_acquire_read) && !defined(AO_HAVE_XSIZE_load)
-#  define AO_XSIZE_load(addr) AO_XSIZE_load_acquire_read(addr)
-#  define AO_HAVE_XSIZE_load
+# define AO_XSIZE_load(addr) AO_XSIZE_load_acquire_read(addr)
+# define AO_HAVE_XSIZE_load
 #endif
 
 #ifdef AO_NO_DD_ORDERING
-#  if defined(AO_HAVE_XSIZE_load_acquire_read)
-#    define AO_XSIZE_load_dd_acquire_read(addr) \
-       AO_XSIZE_load_acquire_read(addr)
-#    define AO_HAVE_XSIZE_load_dd_acquire_read
-#  endif
+# if defined(AO_HAVE_XSIZE_load_acquire_read)
+#   define AO_XSIZE_load_dd_acquire_read(addr) AO_XSIZE_load_acquire_read(addr)
+#   define AO_HAVE_XSIZE_load_dd_acquire_read
+# endif
 #else
-#  if defined(AO_HAVE_XSIZE_load)
-#    define AO_XSIZE_load_dd_acquire_read(addr) \
-       AO_XSIZE_load(addr)
-#    define AO_HAVE_XSIZE_load_dd_acquire_read
-#  endif
-#endif
-
+# if defined(AO_HAVE_XSIZE_load)
+#   define AO_XSIZE_load_dd_acquire_read(addr) AO_XSIZE_load(addr)
+#   define AO_HAVE_XSIZE_load_dd_acquire_read
+# endif
+#endif /* !AO_NO_DD_ORDERING */
 
 /* XSIZE_store */
-
 #if defined(AO_HAVE_XSIZE_store_release) && !defined(AO_HAVE_XSIZE_store)
-#  define AO_XSIZE_store(addr, val) AO_XSIZE_store_release(addr,val)
-#  define AO_HAVE_XSIZE_store
+# define AO_XSIZE_store(addr, val) AO_XSIZE_store_release(addr,val)
+# define AO_HAVE_XSIZE_store
 #endif
 
 #if defined(AO_HAVE_XSIZE_store_full) && !defined(AO_HAVE_XSIZE_store_release)
-#  define AO_XSIZE_store_release(addr,val) AO_XSIZE_store_full(addr,val)
-#  define AO_HAVE_XSIZE_store_release
+# define AO_XSIZE_store_release(addr,val) AO_XSIZE_store_full(addr,val)
+# define AO_HAVE_XSIZE_store_release
 #endif
 
 #if defined(AO_HAVE_XSIZE_store_full) && !defined(AO_HAVE_XSIZE_store_write)
-#  define AO_XSIZE_store_write(addr,val) AO_XSIZE_store_full(addr,val)
-#  define AO_HAVE_XSIZE_store_write
+# define AO_XSIZE_store_write(addr,val) AO_XSIZE_store_full(addr,val)
+# define AO_HAVE_XSIZE_store_write
 #endif
 
-#if defined(AO_HAVE_XSIZE_store_release) && \
-       !defined(AO_HAVE_XSIZE_store_release_write)
-#  define AO_XSIZE_store_release_write(addr, val) \
-       AO_XSIZE_store_release(addr,val)
-#  define AO_HAVE_XSIZE_store_release_write
+#if defined(AO_HAVE_XSIZE_store_release) \
+    && !defined(AO_HAVE_XSIZE_store_release_write)
+# define AO_XSIZE_store_release_write(addr, val) \
+                            AO_XSIZE_store_release(addr,val)
+# define AO_HAVE_XSIZE_store_release_write
 #endif
 
 #if defined(AO_HAVE_XSIZE_store_write) && !defined(AO_HAVE_XSIZE_store)
-#  define AO_XSIZE_store(addr, val) AO_XSIZE_store_write(addr,val)
-#  define AO_HAVE_XSIZE_store
+# define AO_XSIZE_store(addr, val) AO_XSIZE_store_write(addr,val)
+# define AO_HAVE_XSIZE_store
 #endif
 
-#if defined(AO_HAVE_XSIZE_store) && defined(AO_HAVE_nop_full) && \
-    !defined(AO_HAVE_XSIZE_store_release)
-#  define AO_XSIZE_store_release(addr,val) \
-       (AO_nop_full(), AO_XSIZE_store(addr,val))
-#  define AO_HAVE_XSIZE_store_release
+#if defined(AO_HAVE_XSIZE_store) && defined(AO_HAVE_nop_full) \
+    && !defined(AO_HAVE_XSIZE_store_release)
+# define AO_XSIZE_store_release(addr,val) \
+                                (AO_nop_full(), AO_XSIZE_store(addr,val))
+# define AO_HAVE_XSIZE_store_release
 #endif
 
-#if defined(AO_HAVE_nop_write) && defined(AO_HAVE_XSIZE_store) && \
-     !defined(AO_HAVE_XSIZE_store_write)
-#  define AO_XSIZE_store_write(addr, val) \
-       (AO_nop_write(), AO_XSIZE_store(addr,val))
-#  define AO_HAVE_XSIZE_store_write
+#if defined(AO_HAVE_nop_write) && defined(AO_HAVE_XSIZE_store) \
+    && !defined(AO_HAVE_XSIZE_store_write)
+# define AO_XSIZE_store_write(addr, val) \
+                                (AO_nop_write(), AO_XSIZE_store(addr,val))
+# define AO_HAVE_XSIZE_store_write
 #endif
 
-#if defined(AO_HAVE_XSIZE_store_write) && \
-     !defined(AO_HAVE_XSIZE_store_release_write)
-#  define AO_XSIZE_store_release_write(addr, val) AO_XSIZE_store_write(addr,val)
-#  define AO_HAVE_XSIZE_store_release_write
+#if defined(AO_HAVE_XSIZE_store_write) \
+    && !defined(AO_HAVE_XSIZE_store_release_write)
+# define AO_XSIZE_store_release_write(addr, val) AO_XSIZE_store_write(addr,val)
+# define AO_HAVE_XSIZE_store_release_write
 #endif
 
-#if defined(AO_HAVE_XSIZE_store_release) && defined(AO_HAVE_nop_full) && \
-    !defined(AO_HAVE_XSIZE_store_full)
-#  define AO_XSIZE_store_full(addr, val) \
-       (AO_XSIZE_store_release(addr, val), AO_nop_full())
-#  define AO_HAVE_XSIZE_store_full
+#if defined(AO_HAVE_XSIZE_store_release) && defined(AO_HAVE_nop_full) \
+    && !defined(AO_HAVE_XSIZE_store_full)
+# define AO_XSIZE_store_full(addr, val) \
+                        (AO_XSIZE_store_release(addr, val), AO_nop_full())
+# define AO_HAVE_XSIZE_store_full
 #endif
 
-
 /* XSIZE_fetch_and_add */
-#if defined(AO_HAVE_XSIZE_compare_and_swap_full) && \
-    !defined(AO_HAVE_XSIZE_fetch_and_add_full)
-   AO_INLINE AO_t
-   AO_XSIZE_fetch_and_add_full(volatile unsigned XCTYPE *addr,
-                              unsigned XCTYPE incr)
-   {
-     unsigned XCTYPE old;
-     do
-       {
-         old = *addr;
-       }
-     while (!AO_XSIZE_compare_and_swap_full(addr, old, old+incr));
-     return old;
-   }
-#  define AO_HAVE_XSIZE_fetch_and_add_full
-#endif
-
-#if defined(AO_HAVE_XSIZE_compare_and_swap_acquire) && \
-    !defined(AO_HAVE_XSIZE_fetch_and_add_acquire)
-   AO_INLINE AO_t
-   AO_XSIZE_fetch_and_add_acquire(volatile unsigned XCTYPE *addr,
-                                 unsigned XCTYPE incr)
-   {
-     unsigned XCTYPE old;
-     do
-       {
-         old = *addr;
-       }
-     while (!AO_XSIZE_compare_and_swap_acquire(addr, old, old+incr));
-     return old;
-   }
-#  define AO_HAVE_XSIZE_fetch_and_add_acquire
-#endif
-
-#if defined(AO_HAVE_XSIZE_compare_and_swap_release) && \
-    !defined(AO_HAVE_XSIZE_fetch_and_add_release)
-   AO_INLINE AO_t
-   AO_XSIZE_fetch_and_add_release(volatile unsigned XCTYPE *addr,
-                                 unsigned XCTYPE incr)
-   {
-     unsigned XCTYPE old;
-     do
-       {
-         old = *addr;
-       }
-     while (!AO_XSIZE_compare_and_swap_release(addr, old, old+incr));
-     return old;
-   }
-#  define AO_HAVE_XSIZE_fetch_and_add_release
+#if defined(AO_HAVE_XSIZE_compare_and_swap_full) \
+    && !defined(AO_HAVE_XSIZE_fetch_and_add_full)
+  AO_INLINE AO_t
+  AO_XSIZE_fetch_and_add_full(volatile unsigned XCTYPE *addr,
+                              unsigned XCTYPE incr)
+  {
+    unsigned XCTYPE old;
+    do
+      {
+        old = *addr;
+      }
+    while (!AO_XSIZE_compare_and_swap_full(addr, old, old+incr));
+    return old;
+  }
+# define AO_HAVE_XSIZE_fetch_and_add_full
+#endif
+
+#if defined(AO_HAVE_XSIZE_compare_and_swap_acquire) \
+    && !defined(AO_HAVE_XSIZE_fetch_and_add_acquire)
+  AO_INLINE AO_t
+  AO_XSIZE_fetch_and_add_acquire(volatile unsigned XCTYPE *addr,
+                                 unsigned XCTYPE incr)
+  {
+    unsigned XCTYPE old;
+    do
+      {
+        old = *addr;
+      }
+    while (!AO_XSIZE_compare_and_swap_acquire(addr, old, old+incr));
+    return old;
+  }
+# define AO_HAVE_XSIZE_fetch_and_add_acquire
+#endif
+
+#if defined(AO_HAVE_XSIZE_compare_and_swap_release) \
+    && !defined(AO_HAVE_XSIZE_fetch_and_add_release)
+  AO_INLINE AO_t
+  AO_XSIZE_fetch_and_add_release(volatile unsigned XCTYPE *addr,
+                                 unsigned XCTYPE incr)
+  {
+    unsigned XCTYPE old;
+    do
+      {
+        old = *addr;
+      }
+    while (!AO_XSIZE_compare_and_swap_release(addr, old, old+incr));
+    return old;
+  }
+# define AO_HAVE_XSIZE_fetch_and_add_release
 #endif
 
 #if defined(AO_HAVE_XSIZE_fetch_and_add_full)
-#  if !defined(AO_HAVE_XSIZE_fetch_and_add_release)
-#    define AO_XSIZE_fetch_and_add_release(addr, val) \
-        AO_XSIZE_fetch_and_add_full(addr, val)
-#    define AO_HAVE_XSIZE_fetch_and_add_release
-#  endif
-#  if !defined(AO_HAVE_XSIZE_fetch_and_add_acquire)
-#    define AO_XSIZE_fetch_and_add_acquire(addr, val) \
-        AO_XSIZE_fetch_and_add_full(addr, val)
-#    define AO_HAVE_XSIZE_fetch_and_add_acquire
-#  endif
-#  if !defined(AO_HAVE_XSIZE_fetch_and_add_write)
-#    define AO_XSIZE_fetch_and_add_write(addr, val) \
-        AO_XSIZE_fetch_and_add_full(addr, val)
-#    define AO_HAVE_XSIZE_fetch_and_add_write
-#  endif
-#  if !defined(AO_HAVE_XSIZE_fetch_and_add_read)
-#    define AO_XSIZE_fetch_and_add_read(addr, val) \
-        AO_XSIZE_fetch_and_add_full(addr, val)
-#    define AO_HAVE_XSIZE_fetch_and_add_read
-#  endif
+# if !defined(AO_HAVE_XSIZE_fetch_and_add_release)
+#   define AO_XSIZE_fetch_and_add_release(addr, val) \
+                                AO_XSIZE_fetch_and_add_full(addr, val)
+#   define AO_HAVE_XSIZE_fetch_and_add_release
+# endif
+# if !defined(AO_HAVE_XSIZE_fetch_and_add_acquire)
+#   define AO_XSIZE_fetch_and_add_acquire(addr, val) \
+                                AO_XSIZE_fetch_and_add_full(addr, val)
+#   define AO_HAVE_XSIZE_fetch_and_add_acquire
+# endif
+# if !defined(AO_HAVE_XSIZE_fetch_and_add_write)
+#   define AO_XSIZE_fetch_and_add_write(addr, val) \
+                                AO_XSIZE_fetch_and_add_full(addr, val)
+#   define AO_HAVE_XSIZE_fetch_and_add_write
+# endif
+# if !defined(AO_HAVE_XSIZE_fetch_and_add_read)
+#   define AO_XSIZE_fetch_and_add_read(addr, val) \
+                                AO_XSIZE_fetch_and_add_full(addr, val)
+#   define AO_HAVE_XSIZE_fetch_and_add_read
+# endif
 #endif /* AO_HAVE_XSIZE_fetch_and_add_full */
 
-#if !defined(AO_HAVE_XSIZE_fetch_and_add) && \
-    defined(AO_HAVE_XSIZE_fetch_and_add_release)
-#  define AO_XSIZE_fetch_and_add(addr, val) \
-       AO_XSIZE_fetch_and_add_release(addr, val)
-#  define AO_HAVE_XSIZE_fetch_and_add
-#endif
-#if !defined(AO_HAVE_XSIZE_fetch_and_add) && \
-    defined(AO_HAVE_XSIZE_fetch_and_add_acquire)
-#  define AO_XSIZE_fetch_and_add(addr, val) \
-       AO_XSIZE_fetch_and_add_acquire(addr, val)
-#  define AO_HAVE_XSIZE_fetch_and_add
-#endif
-#if !defined(AO_HAVE_XSIZE_fetch_and_add) && \
-    defined(AO_HAVE_XSIZE_fetch_and_add_write)
-#  define AO_XSIZE_fetch_and_add(addr, val) \
-       AO_XSIZE_fetch_and_add_write(addr, val)
-#  define AO_HAVE_XSIZE_fetch_and_add
-#endif
-#if !defined(AO_HAVE_XSIZE_fetch_and_add) && \
-    defined(AO_HAVE_XSIZE_fetch_and_add_read)
-#  define AO_XSIZE_fetch_and_add(addr, val) \
-       AO_XSIZE_fetch_and_add_read(addr, val)
-#  define AO_HAVE_XSIZE_fetch_and_add
-#endif
-
-#if defined(AO_HAVE_XSIZE_fetch_and_add_acquire) &&\
-    defined(AO_HAVE_nop_full) && \
-    !defined(AO_HAVE_XSIZE_fetch_and_add_full)
-#  define AO_XSIZE_fetch_and_add_full(addr, val) \
-       (AO_nop_full(), AO_XSIZE_fetch_and_add_acquire(addr, val))
-#endif
-
-#if !defined(AO_HAVE_XSIZE_fetch_and_add_release_write) && \
-    defined(AO_HAVE_XSIZE_fetch_and_add_write)
-#  define AO_XSIZE_fetch_and_add_release_write(addr, val) \
-       AO_XSIZE_fetch_and_add_write(addr, val)
-#  define AO_HAVE_XSIZE_fetch_and_add_release_write
-#endif
-#if !defined(AO_HAVE_XSIZE_fetch_and_add_release_write) && \
-    defined(AO_HAVE_XSIZE_fetch_and_add_release)
-#  define AO_XSIZE_fetch_and_add_release_write(addr, val) \
-       AO_XSIZE_fetch_and_add_release(addr, val)
-#  define AO_HAVE_XSIZE_fetch_and_add_release_write
-#endif
-#if !defined(AO_HAVE_XSIZE_fetch_and_add_acquire_read) && \
-    defined(AO_HAVE_XSIZE_fetch_and_add_read)
-#  define AO_XSIZE_fetch_and_add_acquire_read(addr, val) \
-       AO_XSIZE_fetch_and_add_read(addr, val)
-#  define AO_HAVE_XSIZE_fetch_and_add_acquire_read
-#endif
-#if !defined(AO_HAVE_XSIZE_fetch_and_add_acquire_read) && \
-    defined(AO_HAVE_XSIZE_fetch_and_add_acquire)
-#  define AO_XSIZE_fetch_and_add_acquire_read(addr, val) \
-       AO_XSIZE_fetch_and_add_acquire(addr, val)
-#  define AO_HAVE_XSIZE_fetch_and_add_acquire_read
+#if !defined(AO_HAVE_XSIZE_fetch_and_add) \
+    && defined(AO_HAVE_XSIZE_fetch_and_add_release)
+# define AO_XSIZE_fetch_and_add(addr, val) \
+                                AO_XSIZE_fetch_and_add_release(addr, val)
+# define AO_HAVE_XSIZE_fetch_and_add
+#endif
+#if !defined(AO_HAVE_XSIZE_fetch_and_add) \
+    && defined(AO_HAVE_XSIZE_fetch_and_add_acquire)
+# define AO_XSIZE_fetch_and_add(addr, val) \
+                                AO_XSIZE_fetch_and_add_acquire(addr, val)
+# define AO_HAVE_XSIZE_fetch_and_add
+#endif
+#if !defined(AO_HAVE_XSIZE_fetch_and_add) \
+    && defined(AO_HAVE_XSIZE_fetch_and_add_write)
+# define AO_XSIZE_fetch_and_add(addr, val) \
+                                AO_XSIZE_fetch_and_add_write(addr, val)
+# define AO_HAVE_XSIZE_fetch_and_add
+#endif
+#if !defined(AO_HAVE_XSIZE_fetch_and_add) \
+    && defined(AO_HAVE_XSIZE_fetch_and_add_read)
+# define AO_XSIZE_fetch_and_add(addr, val) \
+                                AO_XSIZE_fetch_and_add_read(addr, val)
+# define AO_HAVE_XSIZE_fetch_and_add
+#endif
+
+#if defined(AO_HAVE_XSIZE_fetch_and_add_acquire) \
+    && defined(AO_HAVE_nop_full) && !defined(AO_HAVE_XSIZE_fetch_and_add_full)
+# define AO_XSIZE_fetch_and_add_full(addr, val) \
+                (AO_nop_full(), AO_XSIZE_fetch_and_add_acquire(addr, val))
+# define AO_HAVE_XSIZE_fetch_and_add_full
+#endif
+
+#if !defined(AO_HAVE_XSIZE_fetch_and_add_release_write) \
+    && defined(AO_HAVE_XSIZE_fetch_and_add_write)
+# define AO_XSIZE_fetch_and_add_release_write(addr, val) \
+                                AO_XSIZE_fetch_and_add_write(addr, val)
+# define AO_HAVE_XSIZE_fetch_and_add_release_write
+#endif
+#if !defined(AO_HAVE_XSIZE_fetch_and_add_release_write) \
+    && defined(AO_HAVE_XSIZE_fetch_and_add_release)
+# define AO_XSIZE_fetch_and_add_release_write(addr, val) \
+                                AO_XSIZE_fetch_and_add_release(addr, val)
+# define AO_HAVE_XSIZE_fetch_and_add_release_write
+#endif
+
+#if !defined(AO_HAVE_XSIZE_fetch_and_add_acquire_read) \
+    && defined(AO_HAVE_XSIZE_fetch_and_add_read)
+# define AO_XSIZE_fetch_and_add_acquire_read(addr, val) \
+                                AO_XSIZE_fetch_and_add_read(addr, val)
+# define AO_HAVE_XSIZE_fetch_and_add_acquire_read
+#endif
+#if !defined(AO_HAVE_XSIZE_fetch_and_add_acquire_read) \
+    && defined(AO_HAVE_XSIZE_fetch_and_add_acquire)
+# define AO_XSIZE_fetch_and_add_acquire_read(addr, val) \
+                                AO_XSIZE_fetch_and_add_acquire(addr, val)
+# define AO_HAVE_XSIZE_fetch_and_add_acquire_read
 #endif
 
 #ifdef AO_NO_DD_ORDERING
-#  if defined(AO_HAVE_XSIZE_fetch_and_add_acquire_read)
-#    define AO_XSIZE_fetch_and_add_dd_acquire_read(addr, val) \
-       AO_XSIZE_fetch_and_add_acquire_read(addr, val)
-#    define AO_HAVE_XSIZE_fetch_and_add_dd_acquire_read
-#  endif
+# if defined(AO_HAVE_XSIZE_fetch_and_add_acquire_read)
+#   define AO_XSIZE_fetch_and_add_dd_acquire_read(addr, val) \
+                                AO_XSIZE_fetch_and_add_acquire_read(addr, val)
+#   define AO_HAVE_XSIZE_fetch_and_add_dd_acquire_read
+# endif
 #else
-#  if defined(AO_HAVE_XSIZE_fetch_and_add)
-#    define AO_XSIZE_fetch_and_add_dd_acquire_read(addr, val) \
-       AO_XSIZE_fetch_and_add(addr, val)
-#    define AO_HAVE_XSIZE_fetch_and_add_dd_acquire_read
-#  endif
-#endif
-  
-/* XSIZE_fetch_and_add1 */
+# if defined(AO_HAVE_XSIZE_fetch_and_add)
+#   define AO_XSIZE_fetch_and_add_dd_acquire_read(addr, val) \
+                                AO_XSIZE_fetch_and_add(addr, val)
+#   define AO_HAVE_XSIZE_fetch_and_add_dd_acquire_read
+# endif
+#endif /* !AO_NO_DD_ORDERING */
 
-#if defined(AO_HAVE_XSIZE_fetch_and_add_full) &&\
-    !defined(AO_HAVE_XSIZE_fetch_and_add1_full)
-#  define AO_XSIZE_fetch_and_add1_full(addr) \
-       AO_XSIZE_fetch_and_add_full(addr,1)
-#  define AO_HAVE_XSIZE_fetch_and_add1_full
-#endif
-#if defined(AO_HAVE_XSIZE_fetch_and_add_release) &&\
-    !defined(AO_HAVE_XSIZE_fetch_and_add1_release)
-#  define AO_XSIZE_fetch_and_add1_release(addr) \
-       AO_XSIZE_fetch_and_add_release(addr,1)
-#  define AO_HAVE_XSIZE_fetch_and_add1_release
-#endif
-#if defined(AO_HAVE_XSIZE_fetch_and_add_acquire) &&\
-    !defined(AO_HAVE_XSIZE_fetch_and_add1_acquire)
-#  define AO_XSIZE_fetch_and_add1_acquire(addr) \
-       AO_XSIZE_fetch_and_add_acquire(addr,1)
-#  define AO_HAVE_XSIZE_fetch_and_add1_acquire
-#endif
-#if defined(AO_HAVE_XSIZE_fetch_and_add_write) &&\
-    !defined(AO_HAVE_XSIZE_fetch_and_add1_write)
-#  define AO_XSIZE_fetch_and_add1_write(addr) \
-       AO_XSIZE_fetch_and_add_write(addr,1)
-#  define AO_HAVE_XSIZE_fetch_and_add1_write
-#endif
-#if defined(AO_HAVE_XSIZE_fetch_and_add_read) &&\
-    !defined(AO_HAVE_XSIZE_fetch_and_add1_read)
-#  define AO_XSIZE_fetch_and_add1_read(addr) \
-       AO_XSIZE_fetch_and_add_read(addr,1)
-#  define AO_HAVE_XSIZE_fetch_and_add1_read
-#endif
-#if defined(AO_HAVE_XSIZE_fetch_and_add_release_write) &&\
-    !defined(AO_HAVE_XSIZE_fetch_and_add1_release_write)
-#  define AO_XSIZE_fetch_and_add1_release_write(addr) \
-       AO_XSIZE_fetch_and_add_release_write(addr,1)
-#  define AO_HAVE_XSIZE_fetch_and_add1_release_write
-#endif
-#if defined(AO_HAVE_XSIZE_fetch_and_add_acquire_read) &&\
-    !defined(AO_HAVE_XSIZE_fetch_and_add1_acquire_read)
-#  define AO_XSIZE_fetch_and_add1_acquire_read(addr) \
-       AO_XSIZE_fetch_and_add_acquire_read(addr,1)
-#  define AO_HAVE_XSIZE_fetch_and_add1_acquire_read
-#endif
-#if defined(AO_HAVE_XSIZE_fetch_and_add) &&\
-    !defined(AO_HAVE_XSIZE_fetch_and_add1)
-#  define AO_XSIZE_fetch_and_add1(addr) \
-       AO_XSIZE_fetch_and_add(addr,1)
-#  define AO_HAVE_XSIZE_fetch_and_add1
+/* XSIZE_fetch_and_add1 */
+#if defined(AO_HAVE_XSIZE_fetch_and_add_full) \
+    && !defined(AO_HAVE_XSIZE_fetch_and_add1_full)
+# define AO_XSIZE_fetch_and_add1_full(addr) \
+                                AO_XSIZE_fetch_and_add_full(addr,1)
+# define AO_HAVE_XSIZE_fetch_and_add1_full
+#endif
+#if defined(AO_HAVE_XSIZE_fetch_and_add_release) \
+    && !defined(AO_HAVE_XSIZE_fetch_and_add1_release)
+# define AO_XSIZE_fetch_and_add1_release(addr) \
+                                AO_XSIZE_fetch_and_add_release(addr,1)
+# define AO_HAVE_XSIZE_fetch_and_add1_release
+#endif
+#if defined(AO_HAVE_XSIZE_fetch_and_add_acquire) \
+    && !defined(AO_HAVE_XSIZE_fetch_and_add1_acquire)
+# define AO_XSIZE_fetch_and_add1_acquire(addr) \
+                                AO_XSIZE_fetch_and_add_acquire(addr,1)
+# define AO_HAVE_XSIZE_fetch_and_add1_acquire
+#endif
+#if defined(AO_HAVE_XSIZE_fetch_and_add_write) \
+    && !defined(AO_HAVE_XSIZE_fetch_and_add1_write)
+# define AO_XSIZE_fetch_and_add1_write(addr) \
+                                AO_XSIZE_fetch_and_add_write(addr,1)
+# define AO_HAVE_XSIZE_fetch_and_add1_write
+#endif
+#if defined(AO_HAVE_XSIZE_fetch_and_add_read) \
+    && !defined(AO_HAVE_XSIZE_fetch_and_add1_read)
+# define AO_XSIZE_fetch_and_add1_read(addr) \
+                                AO_XSIZE_fetch_and_add_read(addr,1)
+# define AO_HAVE_XSIZE_fetch_and_add1_read
+#endif
+#if defined(AO_HAVE_XSIZE_fetch_and_add_release_write) \
+    && !defined(AO_HAVE_XSIZE_fetch_and_add1_release_write)
+# define AO_XSIZE_fetch_and_add1_release_write(addr) \
+                                AO_XSIZE_fetch_and_add_release_write(addr,1)
+# define AO_HAVE_XSIZE_fetch_and_add1_release_write
+#endif
+#if defined(AO_HAVE_XSIZE_fetch_and_add_acquire_read) \
+    && !defined(AO_HAVE_XSIZE_fetch_and_add1_acquire_read)
+# define AO_XSIZE_fetch_and_add1_acquire_read(addr) \
+                                AO_XSIZE_fetch_and_add_acquire_read(addr,1)
+# define AO_HAVE_XSIZE_fetch_and_add1_acquire_read
+#endif
+#if defined(AO_HAVE_XSIZE_fetch_and_add) \
+    && !defined(AO_HAVE_XSIZE_fetch_and_add1)
+# define AO_XSIZE_fetch_and_add1(addr) AO_XSIZE_fetch_and_add(addr,1)
+# define AO_HAVE_XSIZE_fetch_and_add1
 #endif
 
 #if defined(AO_HAVE_XSIZE_fetch_and_add1_full)
-#  if !defined(AO_HAVE_XSIZE_fetch_and_add1_release)
-#    define AO_XSIZE_fetch_and_add1_release(addr) \
-        AO_XSIZE_fetch_and_add1_full(addr)
-#    define AO_HAVE_XSIZE_fetch_and_add1_release
-#  endif
-#  if !defined(AO_HAVE_XSIZE_fetch_and_add1_acquire)
-#    define AO_XSIZE_fetch_and_add1_acquire(addr) \
-        AO_XSIZE_fetch_and_add1_full(addr)
-#    define AO_HAVE_XSIZE_fetch_and_add1_acquire
-#  endif
-#  if !defined(AO_HAVE_XSIZE_fetch_and_add1_write)
-#    define AO_XSIZE_fetch_and_add1_write(addr) \
-        AO_XSIZE_fetch_and_add1_full(addr)
-#    define AO_HAVE_XSIZE_fetch_and_add1_write
-#  endif
-#  if !defined(AO_HAVE_XSIZE_fetch_and_add1_read)
-#    define AO_XSIZE_fetch_and_add1_read(addr) \
-        AO_XSIZE_fetch_and_add1_full(addr)
-#    define AO_HAVE_XSIZE_fetch_and_add1_read
-#  endif
+# if !defined(AO_HAVE_XSIZE_fetch_and_add1_release)
+#   define AO_XSIZE_fetch_and_add1_release(addr) \
+                                AO_XSIZE_fetch_and_add1_full(addr)
+#   define AO_HAVE_XSIZE_fetch_and_add1_release
+# endif
+# if !defined(AO_HAVE_XSIZE_fetch_and_add1_acquire)
+#   define AO_XSIZE_fetch_and_add1_acquire(addr) \
+                                AO_XSIZE_fetch_and_add1_full(addr)
+#   define AO_HAVE_XSIZE_fetch_and_add1_acquire
+# endif
+# if !defined(AO_HAVE_XSIZE_fetch_and_add1_write)
+#   define AO_XSIZE_fetch_and_add1_write(addr) \
+                                AO_XSIZE_fetch_and_add1_full(addr)
+#   define AO_HAVE_XSIZE_fetch_and_add1_write
+# endif
+# if !defined(AO_HAVE_XSIZE_fetch_and_add1_read)
+#   define AO_XSIZE_fetch_and_add1_read(addr) \
+                                AO_XSIZE_fetch_and_add1_full(addr)
+#   define AO_HAVE_XSIZE_fetch_and_add1_read
+# endif
 #endif /* AO_HAVE_XSIZE_fetch_and_add1_full */
 
-#if !defined(AO_HAVE_XSIZE_fetch_and_add1) && \
-    defined(AO_HAVE_XSIZE_fetch_and_add1_release)
-#  define AO_XSIZE_fetch_and_add1(addr) \
-       AO_XSIZE_fetch_and_add1_release(addr)
-#  define AO_HAVE_XSIZE_fetch_and_add1
-#endif
-#if !defined(AO_HAVE_XSIZE_fetch_and_add1) && \
-    defined(AO_HAVE_XSIZE_fetch_and_add1_acquire)
-#  define AO_XSIZE_fetch_and_add1(addr) \
-       AO_XSIZE_fetch_and_add1_acquire(addr)
-#  define AO_HAVE_XSIZE_fetch_and_add1
-#endif
-#if !defined(AO_HAVE_XSIZE_fetch_and_add1) && \
-    defined(AO_HAVE_XSIZE_fetch_and_add1_write)
-#  define AO_XSIZE_fetch_and_add1(addr) \
-       AO_XSIZE_fetch_and_add1_write(addr)
-#  define AO_HAVE_XSIZE_fetch_and_add1
-#endif
-#if !defined(AO_HAVE_XSIZE_fetch_and_add1) && \
-    defined(AO_HAVE_XSIZE_fetch_and_add1_read)
-#  define AO_XSIZE_fetch_and_add1(addr) \
-       AO_XSIZE_fetch_and_add1_read(addr)
-#  define AO_HAVE_XSIZE_fetch_and_add1
-#endif
-
-#if defined(AO_HAVE_XSIZE_fetch_and_add1_acquire) &&\
-    defined(AO_HAVE_nop_full) && \
-    !defined(AO_HAVE_XSIZE_fetch_and_add1_full)
-#  define AO_XSIZE_fetch_and_add1_full(addr) \
-       (AO_nop_full(), AO_XSIZE_fetch_and_add1_acquire(addr))
-#  define AO_HAVE_XSIZE_fetch_and_add1_full
-#endif
-
-#if !defined(AO_HAVE_XSIZE_fetch_and_add1_release_write) && \
-    defined(AO_HAVE_XSIZE_fetch_and_add1_write)
-#  define AO_XSIZE_fetch_and_add1_release_write(addr) \
-       AO_XSIZE_fetch_and_add1_write(addr)
-#  define AO_HAVE_XSIZE_fetch_and_add1_release_write
-#endif
-#if !defined(AO_HAVE_XSIZE_fetch_and_add1_release_write) && \
-    defined(AO_HAVE_XSIZE_fetch_and_add1_release)
-#  define AO_XSIZE_fetch_and_add1_release_write(addr) \
-       AO_XSIZE_fetch_and_add1_release(addr)
-#  define AO_HAVE_XSIZE_fetch_and_add1_release_write
-#endif
-#if !defined(AO_HAVE_XSIZE_fetch_and_add1_acquire_read) && \
-    defined(AO_HAVE_XSIZE_fetch_and_add1_read)
-#  define AO_XSIZE_fetch_and_add1_acquire_read(addr) \
-       AO_XSIZE_fetch_and_add1_read(addr)
-#  define AO_HAVE_XSIZE_fetch_and_add1_acquire_read
-#endif
-#if !defined(AO_HAVE_XSIZE_fetch_and_add1_acquire_read) && \
-    defined(AO_HAVE_XSIZE_fetch_and_add1_acquire)
-#  define AO_XSIZE_fetch_and_add1_acquire_read(addr) \
-       AO_XSIZE_fetch_and_add1_acquire(addr)
-#  define AO_HAVE_XSIZE_fetch_and_add1_acquire_read
+#if !defined(AO_HAVE_XSIZE_fetch_and_add1) \
+    && defined(AO_HAVE_XSIZE_fetch_and_add1_release)
+# define AO_XSIZE_fetch_and_add1(addr) AO_XSIZE_fetch_and_add1_release(addr)
+# define AO_HAVE_XSIZE_fetch_and_add1
+#endif
+#if !defined(AO_HAVE_XSIZE_fetch_and_add1) \
+    && defined(AO_HAVE_XSIZE_fetch_and_add1_acquire)
+# define AO_XSIZE_fetch_and_add1(addr) AO_XSIZE_fetch_and_add1_acquire(addr)
+# define AO_HAVE_XSIZE_fetch_and_add1
+#endif
+#if !defined(AO_HAVE_XSIZE_fetch_and_add1) \
+    && defined(AO_HAVE_XSIZE_fetch_and_add1_write)
+# define AO_XSIZE_fetch_and_add1(addr) AO_XSIZE_fetch_and_add1_write(addr)
+# define AO_HAVE_XSIZE_fetch_and_add1
+#endif
+#if !defined(AO_HAVE_XSIZE_fetch_and_add1) \
+    && defined(AO_HAVE_XSIZE_fetch_and_add1_read)
+# define AO_XSIZE_fetch_and_add1(addr) AO_XSIZE_fetch_and_add1_read(addr)
+# define AO_HAVE_XSIZE_fetch_and_add1
+#endif
+
+#if defined(AO_HAVE_XSIZE_fetch_and_add1_acquire) \
+    && defined(AO_HAVE_nop_full) \
+    && !defined(AO_HAVE_XSIZE_fetch_and_add1_full)
+# define AO_XSIZE_fetch_and_add1_full(addr) \
+                        (AO_nop_full(), AO_XSIZE_fetch_and_add1_acquire(addr))
+# define AO_HAVE_XSIZE_fetch_and_add1_full
+#endif
+
+#if !defined(AO_HAVE_XSIZE_fetch_and_add1_release_write) \
+    && defined(AO_HAVE_XSIZE_fetch_and_add1_write)
+# define AO_XSIZE_fetch_and_add1_release_write(addr) \
+                                AO_XSIZE_fetch_and_add1_write(addr)
+# define AO_HAVE_XSIZE_fetch_and_add1_release_write
+#endif
+#if !defined(AO_HAVE_XSIZE_fetch_and_add1_release_write) \
+    && defined(AO_HAVE_XSIZE_fetch_and_add1_release)
+# define AO_XSIZE_fetch_and_add1_release_write(addr) \
+                                AO_XSIZE_fetch_and_add1_release(addr)
+# define AO_HAVE_XSIZE_fetch_and_add1_release_write
+#endif
+#if !defined(AO_HAVE_XSIZE_fetch_and_add1_acquire_read) \
+    && defined(AO_HAVE_XSIZE_fetch_and_add1_read)
+# define AO_XSIZE_fetch_and_add1_acquire_read(addr) \
+                                AO_XSIZE_fetch_and_add1_read(addr)
+# define AO_HAVE_XSIZE_fetch_and_add1_acquire_read
+#endif
+#if !defined(AO_HAVE_XSIZE_fetch_and_add1_acquire_read) \
+    && defined(AO_HAVE_XSIZE_fetch_and_add1_acquire)
+# define AO_XSIZE_fetch_and_add1_acquire_read(addr) \
+                                AO_XSIZE_fetch_and_add1_acquire(addr)
+# define AO_HAVE_XSIZE_fetch_and_add1_acquire_read
 #endif
 
 #ifdef AO_NO_DD_ORDERING
-#  if defined(AO_HAVE_XSIZE_fetch_and_add1_acquire_read)
-#    define AO_XSIZE_fetch_and_add1_dd_acquire_read(addr) \
-       AO_XSIZE_fetch_and_add1_acquire_read(addr)
-#    define AO_HAVE_XSIZE_fetch_and_add1_dd_acquire_read
-#  endif
+# if defined(AO_HAVE_XSIZE_fetch_and_add1_acquire_read)
+#   define AO_XSIZE_fetch_and_add1_dd_acquire_read(addr) \
+                                AO_XSIZE_fetch_and_add1_acquire_read(addr)
+#   define AO_HAVE_XSIZE_fetch_and_add1_dd_acquire_read
+# endif
 #else
-#  if defined(AO_HAVE_XSIZE_fetch_and_add1)
-#    define AO_XSIZE_fetch_and_add1_dd_acquire_read(addr) \
-       AO_XSIZE_fetch_and_add1(addr)
-#    define AO_HAVE_XSIZE_fetch_and_add1_dd_acquire_read
-#  endif
-#endif
+# if defined(AO_HAVE_XSIZE_fetch_and_add1)
+#   define AO_XSIZE_fetch_and_add1_dd_acquire_read(addr) \
+                                AO_XSIZE_fetch_and_add1(addr)
+#   define AO_HAVE_XSIZE_fetch_and_add1_dd_acquire_read
+# endif
+#endif /* !AO_NO_DD_ORDERING */
 
 /* XSIZE_fetch_and_sub1 */
-
-#if defined(AO_HAVE_XSIZE_fetch_and_add_full) &&\
-    !defined(AO_HAVE_XSIZE_fetch_and_sub1_full)
-#  define AO_XSIZE_fetch_and_sub1_full(addr) \
-       AO_XSIZE_fetch_and_add_full(addr,(unsigned XCTYPE)(-1))
-#  define AO_HAVE_XSIZE_fetch_and_sub1_full
-#endif
-#if defined(AO_HAVE_XSIZE_fetch_and_add_release) &&\
-    !defined(AO_HAVE_XSIZE_fetch_and_sub1_release)
-#  define AO_XSIZE_fetch_and_sub1_release(addr) \
-       AO_XSIZE_fetch_and_add_release(addr,(unsigned XCTYPE)(-1))
-#  define AO_HAVE_XSIZE_fetch_and_sub1_release
-#endif
-#if defined(AO_HAVE_XSIZE_fetch_and_add_acquire) &&\
-    !defined(AO_HAVE_XSIZE_fetch_and_sub1_acquire)
-#  define AO_XSIZE_fetch_and_sub1_acquire(addr) \
-       AO_XSIZE_fetch_and_add_acquire(addr,(unsigned XCTYPE)(-1))
-#  define AO_HAVE_XSIZE_fetch_and_sub1_acquire
-#endif
-#if defined(AO_HAVE_XSIZE_fetch_and_add_write) &&\
-    !defined(AO_HAVE_XSIZE_fetch_and_sub1_write)
-#  define AO_XSIZE_fetch_and_sub1_write(addr) \
-       AO_XSIZE_fetch_and_add_write(addr,(unsigned XCTYPE)(-1))
-#  define AO_HAVE_XSIZE_fetch_and_sub1_write
-#endif
-#if defined(AO_HAVE_XSIZE_fetch_and_add_read) &&\
-    !defined(AO_HAVE_XSIZE_fetch_and_sub1_read)
-#  define AO_XSIZE_fetch_and_sub1_read(addr) \
-       AO_XSIZE_fetch_and_add_read(addr,(unsigned XCTYPE)(-1))
-#  define AO_HAVE_XSIZE_fetch_and_sub1_read
-#endif
-#if defined(AO_HAVE_XSIZE_fetch_and_add_release_write) &&\
-    !defined(AO_HAVE_XSIZE_fetch_and_sub1_release_write)
-#  define AO_XSIZE_fetch_and_sub1_release_write(addr) \
-       AO_XSIZE_fetch_and_add_release_write(addr,(unsigned XCTYPE)(-1))
-#  define AO_HAVE_XSIZE_fetch_and_sub1_release_write
-#endif
-#if defined(AO_HAVE_XSIZE_fetch_and_add_acquire_read) &&\
-    !defined(AO_HAVE_XSIZE_fetch_and_sub1_acquire_read)
-#  define AO_XSIZE_fetch_and_sub1_acquire_read(addr) \
-       AO_XSIZE_fetch_and_add_acquire_read(addr,(unsigned XCTYPE)(-1))
-#  define AO_HAVE_XSIZE_fetch_and_sub1_acquire_read
-#endif
-#if defined(AO_HAVE_XSIZE_fetch_and_add) &&\
-    !defined(AO_HAVE_XSIZE_fetch_and_sub1)
-#  define AO_XSIZE_fetch_and_sub1(addr) \
-       AO_XSIZE_fetch_and_add(addr,(unsigned XCTYPE)(-1))
-#  define AO_HAVE_XSIZE_fetch_and_sub1
+#if defined(AO_HAVE_XSIZE_fetch_and_add_full) \
+    && !defined(AO_HAVE_XSIZE_fetch_and_sub1_full)
+# define AO_XSIZE_fetch_and_sub1_full(addr) \
+                AO_XSIZE_fetch_and_add_full(addr,(unsigned XCTYPE)(-1))
+# define AO_HAVE_XSIZE_fetch_and_sub1_full
+#endif
+#if defined(AO_HAVE_XSIZE_fetch_and_add_release) \
+    && !defined(AO_HAVE_XSIZE_fetch_and_sub1_release)
+# define AO_XSIZE_fetch_and_sub1_release(addr) \
+                AO_XSIZE_fetch_and_add_release(addr,(unsigned XCTYPE)(-1))
+# define AO_HAVE_XSIZE_fetch_and_sub1_release
+#endif
+#if defined(AO_HAVE_XSIZE_fetch_and_add_acquire) \
+    && !defined(AO_HAVE_XSIZE_fetch_and_sub1_acquire)
+# define AO_XSIZE_fetch_and_sub1_acquire(addr) \
+                AO_XSIZE_fetch_and_add_acquire(addr,(unsigned XCTYPE)(-1))
+# define AO_HAVE_XSIZE_fetch_and_sub1_acquire
+#endif
+#if defined(AO_HAVE_XSIZE_fetch_and_add_write) \
+    && !defined(AO_HAVE_XSIZE_fetch_and_sub1_write)
+# define AO_XSIZE_fetch_and_sub1_write(addr) \
+                AO_XSIZE_fetch_and_add_write(addr,(unsigned XCTYPE)(-1))
+# define AO_HAVE_XSIZE_fetch_and_sub1_write
+#endif
+#if defined(AO_HAVE_XSIZE_fetch_and_add_read) \
+    && !defined(AO_HAVE_XSIZE_fetch_and_sub1_read)
+# define AO_XSIZE_fetch_and_sub1_read(addr) \
+                AO_XSIZE_fetch_and_add_read(addr,(unsigned XCTYPE)(-1))
+# define AO_HAVE_XSIZE_fetch_and_sub1_read
+#endif
+#if defined(AO_HAVE_XSIZE_fetch_and_add_release_write) \
+    && !defined(AO_HAVE_XSIZE_fetch_and_sub1_release_write)
+# define AO_XSIZE_fetch_and_sub1_release_write(addr) \
+        AO_XSIZE_fetch_and_add_release_write(addr,(unsigned XCTYPE)(-1))
+# define AO_HAVE_XSIZE_fetch_and_sub1_release_write
+#endif
+#if defined(AO_HAVE_XSIZE_fetch_and_add_acquire_read) \
+    && !defined(AO_HAVE_XSIZE_fetch_and_sub1_acquire_read)
+# define AO_XSIZE_fetch_and_sub1_acquire_read(addr) \
+        AO_XSIZE_fetch_and_add_acquire_read(addr,(unsigned XCTYPE)(-1))
+# define AO_HAVE_XSIZE_fetch_and_sub1_acquire_read
+#endif
+#if defined(AO_HAVE_XSIZE_fetch_and_add) \
+    && !defined(AO_HAVE_XSIZE_fetch_and_sub1)
+# define AO_XSIZE_fetch_and_sub1(addr) \
+                AO_XSIZE_fetch_and_add(addr,(unsigned XCTYPE)(-1))
+# define AO_HAVE_XSIZE_fetch_and_sub1
 #endif
 
 #if defined(AO_HAVE_XSIZE_fetch_and_sub1_full)
-#  if !defined(AO_HAVE_XSIZE_fetch_and_sub1_release)
-#    define AO_XSIZE_fetch_and_sub1_release(addr) \
-        AO_XSIZE_fetch_and_sub1_full(addr)
-#    define AO_HAVE_XSIZE_fetch_and_sub1_release
-#  endif
-#  if !defined(AO_HAVE_XSIZE_fetch_and_sub1_acquire)
-#    define AO_XSIZE_fetch_and_sub1_acquire(addr) \
-        AO_XSIZE_fetch_and_sub1_full(addr)
-#    define AO_HAVE_XSIZE_fetch_and_sub1_acquire
-#  endif
-#  if !defined(AO_HAVE_XSIZE_fetch_and_sub1_write)
-#    define AO_XSIZE_fetch_and_sub1_write(addr) \
-        AO_XSIZE_fetch_and_sub1_full(addr)
-#    define AO_HAVE_XSIZE_fetch_and_sub1_write
-#  endif
-#  if !defined(AO_HAVE_XSIZE_fetch_and_sub1_read)
-#    define AO_XSIZE_fetch_and_sub1_read(addr) \
-        AO_XSIZE_fetch_and_sub1_full(addr)
-#    define AO_HAVE_XSIZE_fetch_and_sub1_read
-#  endif
+# if !defined(AO_HAVE_XSIZE_fetch_and_sub1_release)
+#   define AO_XSIZE_fetch_and_sub1_release(addr) \
+                                AO_XSIZE_fetch_and_sub1_full(addr)
+#   define AO_HAVE_XSIZE_fetch_and_sub1_release
+# endif
+# if !defined(AO_HAVE_XSIZE_fetch_and_sub1_acquire)
+#   define AO_XSIZE_fetch_and_sub1_acquire(addr) \
+                                AO_XSIZE_fetch_and_sub1_full(addr)
+#   define AO_HAVE_XSIZE_fetch_and_sub1_acquire
+# endif
+# if !defined(AO_HAVE_XSIZE_fetch_and_sub1_write)
+#   define AO_XSIZE_fetch_and_sub1_write(addr) \
+                                AO_XSIZE_fetch_and_sub1_full(addr)
+#   define AO_HAVE_XSIZE_fetch_and_sub1_write
+# endif
+# if !defined(AO_HAVE_XSIZE_fetch_and_sub1_read)
+#   define AO_XSIZE_fetch_and_sub1_read(addr) \
+                                AO_XSIZE_fetch_and_sub1_full(addr)
+#   define AO_HAVE_XSIZE_fetch_and_sub1_read
+# endif
 #endif /* AO_HAVE_XSIZE_fetch_and_sub1_full */
 
-#if !defined(AO_HAVE_XSIZE_fetch_and_sub1) && \
-    defined(AO_HAVE_XSIZE_fetch_and_sub1_release)
-#  define AO_XSIZE_fetch_and_sub1(addr) \
-       AO_XSIZE_fetch_and_sub1_release(addr)
-#  define AO_HAVE_XSIZE_fetch_and_sub1
-#endif
-#if !defined(AO_HAVE_XSIZE_fetch_and_sub1) && \
-    defined(AO_HAVE_XSIZE_fetch_and_sub1_acquire)
-#  define AO_XSIZE_fetch_and_sub1(addr) \
-       AO_XSIZE_fetch_and_sub1_acquire(addr)
-#  define AO_HAVE_XSIZE_fetch_and_sub1
-#endif
-#if !defined(AO_HAVE_XSIZE_fetch_and_sub1) && \
-    defined(AO_HAVE_XSIZE_fetch_and_sub1_write)
-#  define AO_XSIZE_fetch_and_sub1(addr) \
-       AO_XSIZE_fetch_and_sub1_write(addr)
-#  define AO_HAVE_XSIZE_fetch_and_sub1
-#endif
-#if !defined(AO_HAVE_XSIZE_fetch_and_sub1) && \
-    defined(AO_HAVE_XSIZE_fetch_and_sub1_read)
-#  define AO_XSIZE_fetch_and_sub1(addr) \
-       AO_XSIZE_fetch_and_sub1_read(addr)
-#  define AO_HAVE_XSIZE_fetch_and_sub1
-#endif
-
-#if defined(AO_HAVE_XSIZE_fetch_and_sub1_acquire) &&\
-    defined(AO_HAVE_nop_full) && \
-    !defined(AO_HAVE_XSIZE_fetch_and_sub1_full)
-#  define AO_XSIZE_fetch_and_sub1_full(addr) \
-       (AO_nop_full(), AO_XSIZE_fetch_and_sub1_acquire(addr))
-#  define AO_HAVE_XSIZE_fetch_and_sub1_full
-#endif
-
-#if !defined(AO_HAVE_XSIZE_fetch_and_sub1_release_write) && \
-    defined(AO_HAVE_XSIZE_fetch_and_sub1_write)
-#  define AO_XSIZE_fetch_and_sub1_release_write(addr) \
-       AO_XSIZE_fetch_and_sub1_write(addr)
-#  define AO_HAVE_XSIZE_fetch_and_sub1_release_write
-#endif
-#if !defined(AO_HAVE_XSIZE_fetch_and_sub1_release_write) && \
-    defined(AO_HAVE_XSIZE_fetch_and_sub1_release)
-#  define AO_XSIZE_fetch_and_sub1_release_write(addr) \
-       AO_XSIZE_fetch_and_sub1_release(addr)
-#  define AO_HAVE_XSIZE_fetch_and_sub1_release_write
-#endif
-#if !defined(AO_HAVE_XSIZE_fetch_and_sub1_acquire_read) && \
-    defined(AO_HAVE_XSIZE_fetch_and_sub1_read)
-#  define AO_XSIZE_fetch_and_sub1_acquire_read(addr) \
-       AO_XSIZE_fetch_and_sub1_read(addr)
-#  define AO_HAVE_XSIZE_fetch_and_sub1_acquire_read
-#endif
-#if !defined(AO_HAVE_XSIZE_fetch_and_sub1_acquire_read) && \
-    defined(AO_HAVE_XSIZE_fetch_and_sub1_acquire)
-#  define AO_XSIZE_fetch_and_sub1_acquire_read(addr) \
-       AO_XSIZE_fetch_and_sub1_acquire(addr)
-#  define AO_HAVE_XSIZE_fetch_and_sub1_acquire_read
+#if !defined(AO_HAVE_XSIZE_fetch_and_sub1) \
+    && defined(AO_HAVE_XSIZE_fetch_and_sub1_release)
+# define AO_XSIZE_fetch_and_sub1(addr) AO_XSIZE_fetch_and_sub1_release(addr)
+# define AO_HAVE_XSIZE_fetch_and_sub1
+#endif
+#if !defined(AO_HAVE_XSIZE_fetch_and_sub1) \
+    && defined(AO_HAVE_XSIZE_fetch_and_sub1_acquire)
+# define AO_XSIZE_fetch_and_sub1(addr) AO_XSIZE_fetch_and_sub1_acquire(addr)
+# define AO_HAVE_XSIZE_fetch_and_sub1
+#endif
+#if !defined(AO_HAVE_XSIZE_fetch_and_sub1) \
+    && defined(AO_HAVE_XSIZE_fetch_and_sub1_write)
+# define AO_XSIZE_fetch_and_sub1(addr) AO_XSIZE_fetch_and_sub1_write(addr)
+# define AO_HAVE_XSIZE_fetch_and_sub1
+#endif
+#if !defined(AO_HAVE_XSIZE_fetch_and_sub1) \
+    && defined(AO_HAVE_XSIZE_fetch_and_sub1_read)
+# define AO_XSIZE_fetch_and_sub1(addr) AO_XSIZE_fetch_and_sub1_read(addr)
+# define AO_HAVE_XSIZE_fetch_and_sub1
 #endif
 
-#ifdef AO_NO_DD_ORDERING
-#  if defined(AO_HAVE_XSIZE_fetch_and_sub1_acquire_read)
-#    define AO_XSIZE_fetch_and_sub1_dd_acquire_read(addr) \
-       AO_XSIZE_fetch_and_sub1_acquire_read(addr)
-#    define AO_HAVE_XSIZE_fetch_and_sub1_dd_acquire_read
-#  endif
-#else
-#  if defined(AO_HAVE_XSIZE_fetch_and_sub1)
-#    define AO_XSIZE_fetch_and_sub1_dd_acquire_read(addr) \
-       AO_XSIZE_fetch_and_sub1(addr)
-#    define AO_HAVE_XSIZE_fetch_and_sub1_dd_acquire_read
-#  endif
+#if defined(AO_HAVE_XSIZE_fetch_and_sub1_acquire) \
+    && defined(AO_HAVE_nop_full) \
+    && !defined(AO_HAVE_XSIZE_fetch_and_sub1_full)
+# define AO_XSIZE_fetch_and_sub1_full(addr) \
+                        (AO_nop_full(), AO_XSIZE_fetch_and_sub1_acquire(addr))
+# define AO_HAVE_XSIZE_fetch_and_sub1_full
 #endif
 
+#if !defined(AO_HAVE_XSIZE_fetch_and_sub1_release_write) \
+    && defined(AO_HAVE_XSIZE_fetch_and_sub1_write)
+# define AO_XSIZE_fetch_and_sub1_release_write(addr) \
+                                AO_XSIZE_fetch_and_sub1_write(addr)
+# define AO_HAVE_XSIZE_fetch_and_sub1_release_write
+#endif
+#if !defined(AO_HAVE_XSIZE_fetch_and_sub1_release_write) \
+    && defined(AO_HAVE_XSIZE_fetch_and_sub1_release)
+# define AO_XSIZE_fetch_and_sub1_release_write(addr) \
+                                AO_XSIZE_fetch_and_sub1_release(addr)
+# define AO_HAVE_XSIZE_fetch_and_sub1_release_write
+#endif
+#if !defined(AO_HAVE_XSIZE_fetch_and_sub1_acquire_read) \
+    && defined(AO_HAVE_XSIZE_fetch_and_sub1_read)
+# define AO_XSIZE_fetch_and_sub1_acquire_read(addr) \
+                                AO_XSIZE_fetch_and_sub1_read(addr)
+# define AO_HAVE_XSIZE_fetch_and_sub1_acquire_read
+#endif
+#if !defined(AO_HAVE_XSIZE_fetch_and_sub1_acquire_read) \
+    && defined(AO_HAVE_XSIZE_fetch_and_sub1_acquire)
+# define AO_XSIZE_fetch_and_sub1_acquire_read(addr) \
+                                AO_XSIZE_fetch_and_sub1_acquire(addr)
+# define AO_HAVE_XSIZE_fetch_and_sub1_acquire_read
+#endif
+
+#ifdef AO_NO_DD_ORDERING
+# if defined(AO_HAVE_XSIZE_fetch_and_sub1_acquire_read)
+#   define AO_XSIZE_fetch_and_sub1_dd_acquire_read(addr) \
+                                AO_XSIZE_fetch_and_sub1_acquire_read(addr)
+#   define AO_HAVE_XSIZE_fetch_and_sub1_dd_acquire_read
+# endif
+#else
+# if defined(AO_HAVE_XSIZE_fetch_and_sub1)
+#   define AO_XSIZE_fetch_and_sub1_dd_acquire_read(addr) \
+                                AO_XSIZE_fetch_and_sub1(addr)
+#   define AO_HAVE_XSIZE_fetch_and_sub1_dd_acquire_read
+# endif
+#endif /* !AO_NO_DD_ORDERING */