2009-06-20 Zoltan Varga <vargaz@gmail.com>

	* atomic.h: Fix ilp32 support on ppc.

svn path=/trunk/mono/; revision=136549

diff --git a/mono/io-layer/ChangeLog b/mono/io-layer/ChangeLog
index 51ed0eafcc0b3b6443887b0cf3cfe51d874ce45c..6ea577a127e2daed52b2d58896081796220178bd 100644 (file)
--- a/mono/io-layer/ChangeLog
+++ b/mono/io-layer/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-20  Zoltan Varga  <vargaz@gmail.com>
+
+       * atomic.h: Fix ilp32 support on ppc.
+
 2009-05-28  Mark Probst  <mark.probst@gmail.com>
 
        * collection.c (_wapi_collection_init): If pthread_create() fails,

diff --git a/mono/io-layer/atomic.h b/mono/io-layer/atomic.h
index c9ead6aeadf21b0faf08aeb49bb0e3f3b37f58b2..2fd0e5e131e40e2a9e62df6e106bc55064382a20 100644 (file)
--- a/mono/io-layer/atomic.h
+++ b/mono/io-layer/atomic.h
@@ -629,7 +629,7 @@ static inline gint32 InterlockedExchange(register volatile gint32 *dest, registe
 #define InterlockedExchangePointer(dest,exch) (void*)InterlockedExchange((volatile gint32 *)(dest), (gint32)(exch))
 #else
 
-#ifdef __mono_ppc64__
+#if defined(__mono_ppc64__) && !defined(__mono_ilp32__)
 #define LDREGX "ldarx"
 #define STREGCXD "stdcx."
 #define CMPREG "cmpd"