[Pkg-mono-svn-commits] [mono] 21/23: Add an extension point in atomic.c. (cherry picked from commit 55d338134d006f070bb533484337e4c9e485be86)

[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 3c16fd282b6f364f83833cacc66a443ef8462fc6
Author: Alex Rønne Petersen <alexrp at xamarin.com>
Date:   Fri Oct 18 02:29:02 2013 +0200

    Add an extension point in atomic.c.
    (cherry picked from commit 55d338134d006f070bb533484337e4c9e485be86)
---
 mono/utils/atomic.c |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/mono/utils/atomic.c b/mono/utils/atomic.c
index 0a7be18..4d59ea3 100755
--- a/mono/utils/atomic.c
+++ b/mono/utils/atomic.c
@@ -421,7 +421,7 @@ void InterlockedWrite64(volatile gint64 *dst, gint64 val)
 
 #endif
 
-#if defined (BROKEN_64BIT_ATOMICS_INTRINSIC)
+#if defined (NEED_64BIT_CMPXCHG_FALLBACK)
 
 #if defined (TARGET_OSX)
 
@@ -431,13 +431,13 @@ InterlockedCompareExchange64(volatile gint64 *dest, gint64 exch, gint64 comp)
 	return __sync_val_compare_and_swap (dest, comp, exch);
 }
 
-#else
-
-#endif
+#elif defined (HAVE_64BIT_CMPXCHG_FALLBACK)
 
+#ifdef ENABLE_EXTENSION_MODULE
+#include "../../../mono-extensions/mono/utils/atomic.c"
 #endif
 
-#if defined (NEED_64BIT_CMPXCHG_FALLBACK)
+#else
 
 gint64
 InterlockedCompareExchange64(volatile gint64 *dest, gint64 exch, gint64 comp)
@@ -455,3 +455,5 @@ InterlockedCompareExchange64(volatile gint64 *dest, gint64 exch, gint64 comp)
 }
 
 #endif
+
+#endif

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