X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=mono%2Futils%2Fgc_wrapper.h;h=591b6ef480282f33e01b3a00fd7e1271d6bb8991;hb=73206a18b6f677dd13129b6e7b23ed975132ff1b;hp=3d9d1ffd684dcc33bc39b37c1c63662364cd98a3;hpb=0957f1ab66b4d76e6b2cf7ec799c7175beb5f5b0;p=mono.git

diff --git a/mono/utils/gc_wrapper.h b/mono/utils/gc_wrapper.h
index 3d9d1ffd684..591b6ef4802 100644
--- a/mono/utils/gc_wrapper.h
+++ b/mono/utils/gc_wrapper.h
@@ -24,7 +24,11 @@
 #	if defined(HAVE_KW_THREAD) && defined(USE_INCLUDED_LIBGC) && !defined(__powerpc__)
         /* The local alloc stuff is in pthread_support.c, but solaris uses solaris_threads.c */
         /* It is also disabled on solaris/x86 by libgc/configure.in */
-#       if !defined(__sparc__) && !defined(__sun)
+        /* 
+		 * ARM has no definition for some atomic functions in gc_locks.h and
+		 * support is also disabled in libgc/configure.in.
+		 */
+#       if !defined(__sparc__) && !defined(__sun) && !defined(__arm__) && !defined(__mips__)
 #		    define GC_REDIRECT_TO_LOCAL
 #       endif
 #	endif
@@ -43,13 +47,13 @@
 #		error have boehm GC without headers, you probably need to install them by hand
 #	endif
 
-#if defined(PLATFORM_WIN32)
+#if defined(HOST_WIN32)
 #define CreateThread GC_CreateThread
 #endif
 
 #elif defined(HAVE_SGEN_GC)
 
-#if defined(PLATFORM_WIN32)
+#if defined(HOST_WIN32)
 #define CreateThread mono_gc_CreateThread
 #else
 /* pthread function wrappers */