2009-06-16 Geoff Norton <gnorton@novell.com>

        * include/private/gcconfig.h:  Disable static scanning on this platform
        * misc.c: Enable platform-specific disabling of static scanning

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

3 files changed, 8 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index af9f7242..5e4e2844 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-16  Geoff Norton  <gnorton@novell.com>
+
+	* include/private/gcconfig.h:  Disable static scanning on this platform
+	* misc.c: Enable platform-specific disabling of static scanning
+
 2009-06-06  Zoltan Varga  <vargaz@gmail.com>
 
 	* CMakeLists.txt: Fix handling of powerpc and the selection of 
diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h
index 66137857..d46e686a 100644
--- a/include/private/gcconfig.h
+++ b/include/private/gcconfig.h
@@ -334,6 +334,7 @@
 #    define ARM
 #    define mach_type_known
 #    define DARWIN_DONT_PARSE_STACK
+#    define GC_DONT_REGISTER_MAIN_STATIC_DATA
 #   endif
 # endif
 # if defined(NeXT) && defined(mc68000)
diff --git a/misc.c b/misc.c
index ee4348b2..4744faa4 100644
--- a/misc.c
+++ b/misc.c
@@ -81,6 +81,8 @@
 /* dyn_load.c isn't linked in.						*/
 #ifdef DYNAMIC_LOADING
 # define GC_REGISTER_MAIN_STATIC_DATA() GC_register_main_static_data()
+#elif defined(GC_DONT_REGISTER_MAIN_STATIC_DATA)
+# define GC_REGISTER_MAIN_STATIC_DATA() FALSE
 #else
 # define GC_REGISTER_MAIN_STATIC_DATA() TRUE
 #endif