[Pkg-mono-svn-commits] [mono] 04/23: Remove unneeded ARM code from atomic.c. (cherry picked from commit bf0b8a1d1aa61d5123b2a812cc9c4665d2d97d93)
Jo Shields
directhex at alioth.debian.org
Wed Oct 23 22:14:29 UTC 2013
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 9058bfed0e55534de60320f549e6b2c3cd6296d7
Author: Alex Rønne Petersen <alexrp at xamarin.com>
Date: Tue Sep 24 17:20:13 2013 +0200
Remove unneeded ARM code from atomic.c.
(cherry picked from commit bf0b8a1d1aa61d5123b2a812cc9c4665d2d97d93)
---
mono/utils/atomic.c | 31 +------------------------------
1 file changed, 1 insertion(+), 30 deletions(-)
diff --git a/mono/utils/atomic.c b/mono/utils/atomic.c
index 585ffd6..c902c21 100755
--- a/mono/utils/atomic.c
+++ b/mono/utils/atomic.c
@@ -203,36 +203,7 @@ gint32 InterlockedExchangeAdd(volatile gint32 *dest, gint32 add)
#if defined (BROKEN_64BIT_ATOMICS_INTRINSIC)
-#if defined (TARGET_MACH) && defined (__arm__) && defined (HAVE_ARMV7)
-
-gint64 InterlockedCompareExchange64(volatile gint64 *dest, gint64 exch, gint64 comp) __attribute__ ((naked));
-
-gint64
-InterlockedCompareExchange64(volatile gint64 *dest, gint64 exch, gint64 comp)
-{
- __asm__ (
- "push {r4, r5, r6, r7}\n"
- "ldr r4, [sp, #16]\n"
- "dmb\n"
-"1:\n"
- "ldrexd r6, r7, [r0]\n"
- "cmp r7, r4\n"
- "bne 2f\n"
- "cmp r6, r3\n"
- "bne 2f\n"
- "strexd r5, r1, r2, [r0]\n"
- "cmp r5, #0\n"
- "bne 1b\n"
-"2:\n"
- "dmb\n"
- "mov r0, r6\n"
- "mov r1, r7\n"
- "pop {r4, r5, r6, r7}\n"
- "bx lr\n"
- );
-}
-
-#elif defined (TARGET_MACH) && (defined (__i386__) || defined (__x86_64__))
+#if defined (TARGET_OSX)
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
More information about the Pkg-mono-svn-commits
mailing list