[Pkg-mono-svn-commits] [mono] 03/23: Use host preprocessor identifiers in atomic.c, not target.

[Jo Shields]

This is an automated email from the git hooks/post-receive script.

directhex pushed a commit to branch master-experimental-patches/atomics_support_on_fringe_32bit_platforms
in repository mono.

commit b3a340d07a3149208f8c2b0e35c16028dffdc3de
Author: Alex Rønne Petersen <alexrp at xamarin.com>
Date:   Tue Sep 24 17:16:17 2013 +0200

    Use host preprocessor identifiers in atomic.c, not target.
    
    Here we care about the system we run on, not the kind of
    system that Mono is built to compile for.
    (cherry picked from commit a33ce0c39fe7aa04292eb2fa2d0c89da7ba02c6e)
---
 mono/utils/atomic.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mono/utils/atomic.c b/mono/utils/atomic.c
index a7071e2..585ffd6 100755
--- a/mono/utils/atomic.c
+++ b/mono/utils/atomic.c
@@ -203,7 +203,7 @@ gint32 InterlockedExchangeAdd(volatile gint32 *dest, gint32 add)
 
 #if defined (BROKEN_64BIT_ATOMICS_INTRINSIC)
 
-#if defined (TARGET_MACH) && defined (TARGET_ARM) && defined (HAVE_ARMV7)
+#if defined (TARGET_MACH) && defined (__arm__) && defined (HAVE_ARMV7)
 
 gint64 InterlockedCompareExchange64(volatile gint64 *dest, gint64 exch, gint64 comp)  __attribute__ ((naked));
 
@@ -232,7 +232,7 @@ InterlockedCompareExchange64(volatile gint64 *dest, gint64 exch, gint64 comp)
 	);
 }
 
-#elif defined (TARGET_MACH) && (defined (TARGET_X86) || defined (TARGET_AMD64))
+#elif defined (TARGET_MACH) && (defined (__i386__) || defined (__x86_64__))
 
 gint64
 InterlockedCompareExchange64(volatile gint64 *dest, gint64 exch, gint64 comp)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mono/packages/mono.git