atomic: Switch microblaze to builtin atomics

Switch microblaze to builtin atomics.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

diff --git a/sysdeps/microblaze/atomic-machine.h b/sysdeps/microblaze/atomic-machine.h
index 4f695c2c9f08af91f58518924370f40982a30d5a..f67d5095fc85990168559a4ba72a08134b0a06d1 100644 (file)
--- a/sysdeps/microblaze/atomic-machine.h
+++ b/sysdeps/microblaze/atomic-machine.h
@@ -19,234 +19,7 @@
 #include <sysdep.h>
 
 #define __HAVE_64B_ATOMICS 0
-#define USE_ATOMIC_COMPILER_BUILTINS 0
+#define USE_ATOMIC_COMPILER_BUILTINS 1
 
 /* XXX Is this actually correct?  */
 #define ATOMIC_EXCHANGE_USES_CAS 1
-
-
-/* Microblaze does not have byte and halfword forms of load and reserve and
-   store conditional. So for microblaze we stub out the 8- and 16-bit forms.  */
-#define __arch_compare_and_exchange_bool_8_acq(mem, newval, oldval)            \
-  (abort (), 0)
-
-#define __arch_compare_and_exchange_bool_16_acq(mem, newval, oldval)           \
-  (abort (), 0)
-
-#define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval)            \
-  ({                                                                           \
-      __typeof (*(mem)) __tmp;                                                 \
-      __typeof (mem)  __memp = (mem);                                          \
-      int test;                                                                \
-      __asm __volatile (                                                       \
-                "   addc    r0, r0, r0;"                                       \
-                "1: lwx     %0, %3, r0;"                                       \
-                "   addic   %1, r0, 0;"                                        \
-                "   bnei    %1, 1b;"                                           \
-                "   cmp     %1, %0, %4;"                                       \
-                "   bnei    %1, 2f;"                                           \
-                "   swx     %5, %3, r0;"                                       \
-                "   addic   %1, r0, 0;"                                        \
-                "   bnei    %1, 1b;"                                           \
-                "2:"                                                           \
-                    : "=&r" (__tmp),                                           \
-                    "=&r" (test),                                              \
-                    "=m" (*__memp)                                             \
-                    : "r" (__memp),                                            \
-                    "r" (oldval),                                              \
-                    "r" (newval)                                               \
-                    : "cc", "memory");                                         \
-      __tmp;                                                                   \
-  })
-
-#define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval)            \
-  (abort (), (__typeof (*mem)) 0)
-
-#define atomic_compare_and_exchange_val_acq(mem, newval, oldval)               \
-  ({                                                                           \
-    __typeof (*(mem)) __result;                                                \
-    if (sizeof (*mem) == 4)                                                    \
-      __result = __arch_compare_and_exchange_val_32_acq (mem, newval, oldval); \
-    else if (sizeof (*mem) == 8)                                               \
-      __result = __arch_compare_and_exchange_val_64_acq (mem, newval, oldval); \
-    else                                                                       \
-       abort ();                                                               \
-    __result;                                                                  \
-  })
-
-#define atomic_compare_and_exchange_val_rel(mem, newval, oldval)               \
-  ({                                                                           \
-    __typeof (*(mem)) __result;                                                \
-    if (sizeof (*mem) == 4)                                                    \
-      __result = __arch_compare_and_exchange_val_32_acq (mem, newval, oldval); \
-    else if (sizeof (*mem) == 8)                                               \
-      __result = __arch_compare_and_exchange_val_64_acq (mem, newval, oldval); \
-    else                                                                       \
-       abort ();                                                               \
-    __result;                                                                  \
-  })
-
-#define __arch_atomic_exchange_32_acq(mem, value)                              \
-  ({                                                                           \
-      __typeof (*(mem)) __tmp;                                                 \
-      __typeof (mem)  __memp = (mem);                                          \
-      int test;                                                                \
-      __asm __volatile (                                                       \
-                "   addc    r0, r0, r0;"                                       \
-                "1: lwx     %0, %4, r0;"                                       \
-                "   addic   %1, r0, 0;"                                        \
-                "   bnei    %1, 1b;"                                           \
-                "   swx     %3, %4, r0;"                                       \
-                "   addic   %1, r0, 0;"                                        \
-                "   bnei    %1, 1b;"                                           \
-                    : "=&r" (__tmp),                                           \
-                    "=&r" (test),                                              \
-                    "=m" (*__memp)                                             \
-                    : "r" (value),                                             \
-                    "r" (__memp)                                               \
-                    : "cc", "memory");                                         \
-      __tmp;                                                                   \
-  })
-
-#define __arch_atomic_exchange_64_acq(mem, newval)                             \
-  (abort (), (__typeof (*mem)) 0)
-
-#define atomic_exchange_acq(mem, value)                                        \
-  ({                                                                           \
-    __typeof (*(mem)) __result;                                                \
-    if (sizeof (*mem) == 4)                                                    \
-      __result = __arch_atomic_exchange_32_acq (mem, value);                   \
-    else if (sizeof (*mem) == 8)                                               \
-      __result = __arch_atomic_exchange_64_acq (mem, value);                   \
-    else                                                                       \
-       abort ();                                                               \
-    __result;                                                                  \
-  })
-
-#define atomic_exchange_rel(mem, value)                                        \
-  ({                                                                           \
-    __typeof (*(mem)) __result;                                                \
-    if (sizeof (*mem) == 4)                                                    \
-      __result = __arch_atomic_exchange_32_acq (mem, value);                   \
-    else if (sizeof (*mem) == 8)                                               \
-      __result = __arch_atomic_exchange_64_acq (mem, value);                   \
-    else                                                                       \
-       abort ();                                                               \
-    __result;                                                                  \
-  })
-
-#define __arch_atomic_exchange_and_add_32(mem, value)                          \
-  ({                                                                           \
-    __typeof (*(mem)) __tmp;                                                   \
-      __typeof (mem)  __memp = (mem);                                          \
-    int test;                                                                  \
-    __asm __volatile (                                                         \
-                "   addc    r0, r0, r0;"                                       \
-                "1: lwx     %0, %4, r0;"                                       \
-                "   addic   %1, r0, 0;"                                        \
-                "   bnei    %1, 1b;"                                           \
-                "   add     %1, %3, %0;"                                       \
-                "   swx     %1, %4, r0;"                                       \
-                "   addic   %1, r0, 0;"                                        \
-                "   bnei    %1, 1b;"                                           \
-                    : "=&r" (__tmp),                                           \
-                    "=&r" (test),                                              \
-                    "=m" (*__memp)                                             \
-                    : "r" (value),                                             \
-                    "r" (__memp)                                               \
-                    : "cc", "memory");                                         \
-    __tmp;                                                                     \
-  })
-
-#define __arch_atomic_exchange_and_add_64(mem, value)                          \
-  (abort (), (__typeof (*mem)) 0)
-
-#define atomic_exchange_and_add(mem, value)                                    \
-  ({                                                                           \
-    __typeof (*(mem)) __result;                                                \
-    if (sizeof (*mem) == 4)                                                    \
-      __result = __arch_atomic_exchange_and_add_32 (mem, value);               \
-    else if (sizeof (*mem) == 8)                                               \
-      __result = __arch_atomic_exchange_and_add_64 (mem, value);               \
-    else                                                                       \
-       abort ();                                                               \
-    __result;                                                                  \
-  })
-
-#define __arch_atomic_increment_val_32(mem)                                    \
-  ({                                                                           \
-    __typeof (*(mem)) __val;                                                   \
-    int test;                                                                  \
-    __asm __volatile (                                                         \
-                "   addc    r0, r0, r0;"                                       \
-                "1: lwx     %0, %3, r0;"                                       \
-                "   addic   %1, r0, 0;"                                        \
-                "   bnei    %1, 1b;"                                           \
-                "   addi    %0, %0, 1;"                                        \
-                "   swx     %0, %3, r0;"                                       \
-                "   addic   %1, r0, 0;"                                        \
-                "   bnei    %1, 1b;"                                           \
-                    : "=&r" (__val),                                           \
-                    "=&r" (test),                                              \
-                    "=m" (*mem)                                                \
-                    : "r" (mem),                                               \
-                    "m" (*mem)                                                 \
-                    : "cc", "memory");                                         \
-    __val;                                                                     \
-  })
-
-#define __arch_atomic_increment_val_64(mem)                                    \
-  (abort (), (__typeof (*mem)) 0)
-
-#define atomic_increment_val(mem)                                              \
-  ({                                                                           \
-    __typeof (*(mem)) __result;                                                \
-    if (sizeof (*(mem)) == 4)                                                  \
-      __result = __arch_atomic_increment_val_32 (mem);                         \
-    else if (sizeof (*(mem)) == 8)                                             \
-      __result = __arch_atomic_increment_val_64 (mem);                         \
-    else                                                                       \
-       abort ();                                                               \
-    __result;                                                                  \
-  })
-
-#define atomic_increment(mem) ({ atomic_increment_val (mem); (void) 0; })
-
-#define __arch_atomic_decrement_val_32(mem)                                    \
-  ({                                                                           \
-    __typeof (*(mem)) __val;                                                   \
-    int test;                                                                  \
-    __asm __volatile (                                                         \
-                "   addc    r0, r0, r0;"                                       \
-                "1: lwx     %0, %3, r0;"                                       \
-                "   addic   %1, r0, 0;"                                        \
-                "   bnei    %1, 1b;"                                           \
-                "   rsubi   %0, %0, 1;"                                        \
-                "   swx     %0, %3, r0;"                                       \
-                "   addic   %1, r0, 0;"                                        \
-                "   bnei    %1, 1b;"                                           \
-                    : "=&r" (__val),                                           \
-                    "=&r" (test),                                              \
-                    "=m" (*mem)                                                \
-                    : "r" (mem),                                               \
-                    "m" (*mem)                                                 \
-                    : "cc", "memory");                                         \
-    __val;                                                                     \
-  })
-
-#define __arch_atomic_decrement_val_64(mem)                                    \
-  (abort (), (__typeof (*mem)) 0)
-
-#define atomic_decrement_val(mem)                                              \
-  ({                                                                           \
-    __typeof (*(mem)) __result;                                                \
-    if (sizeof (*(mem)) == 4)                                                  \
-      __result = __arch_atomic_decrement_val_32 (mem);                         \
-    else if (sizeof (*(mem)) == 8)                                             \
-      __result = __arch_atomic_decrement_val_64 (mem);                         \
-    else                                                                       \
-       abort ();                                                               \
-    __result;                                                                  \
-  })
-
-#define atomic_decrement(mem) ({ atomic_decrement_val (mem); (void) 0; })