From 61cd9ee8b63bdd34fd3b5ebd58f2de3fce507a61 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Fri, 12 Jul 2013 00:03:02 +0200 Subject: [PATCH] Replace more __ARM_ARCH_... checks with HAVE_ARMV. --- mono/utils/atomic.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/mono/utils/atomic.h b/mono/utils/atomic.h index 9b18f9bf62d..a03103891c9 100644 --- a/mono/utils/atomic.h +++ b/mono/utils/atomic.h @@ -21,6 +21,7 @@ #endif +#include "config.h" #include #if defined(__WIN32__) || defined(_WIN32) @@ -653,7 +654,7 @@ static inline gint32 InterlockedExchangeAdd(volatile gint32 *dest, gint32 add) static inline gint32 InterlockedCompareExchange(volatile gint32 *dest, gint32 exch, gint32 comp) { -#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7S__) +#if defined(HAVE_ARMV6) gint32 ret, tmp; __asm__ __volatile__ ( "1:\n" NACL_ALIGN() @@ -704,7 +705,7 @@ static inline gint32 InterlockedCompareExchange(volatile gint32 *dest, gint32 ex static inline gpointer InterlockedCompareExchangePointer(volatile gpointer *dest, gpointer exch, gpointer comp) { -#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7S__) +#if defined(HAVE_ARMV6) gpointer ret, tmp; __asm__ __volatile__ ( "dmb\n" @@ -756,7 +757,7 @@ static inline gpointer InterlockedCompareExchangePointer(volatile gpointer *dest static inline gint32 InterlockedIncrement(volatile gint32 *dest) { -#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7S__) +#if defined(HAVE_ARMV6) gint32 ret, flag; __asm__ __volatile__ ( "dmb\n" @@ -802,7 +803,7 @@ static inline gint32 InterlockedIncrement(volatile gint32 *dest) static inline gint32 InterlockedDecrement(volatile gint32 *dest) { -#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7S__) +#if defined(HAVE_ARMV6) gint32 ret, flag; __asm__ __volatile__ ( "dmb\n" @@ -848,7 +849,7 @@ static inline gint32 InterlockedDecrement(volatile gint32 *dest) static inline gint32 InterlockedExchange(volatile gint32 *dest, gint32 exch) { -#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7S__) +#if defined(HAVE_ARMV6) gint32 ret, flag; __asm__ __volatile__ ( "dmb\n" @@ -881,7 +882,7 @@ static inline gint32 InterlockedExchange(volatile gint32 *dest, gint32 exch) static inline gpointer InterlockedExchangePointer(volatile gpointer *dest, gpointer exch) { -#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7S__) +#if defined(HAVE_ARMV6) gpointer ret, flag; __asm__ __volatile__ ( "dmb\n" @@ -914,7 +915,7 @@ static inline gpointer InterlockedExchangePointer(volatile gpointer *dest, gpoin static inline gint32 InterlockedExchangeAdd(volatile gint32 *dest, gint32 add) { -#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7S__) +#if defined(HAVE_ARMV6) gint32 ret, tmp, flag; __asm__ __volatile__ ( "dmb\n" -- 2.25.1