From a0347f09d200a470831df567e9df2091149909e3 Mon Sep 17 00:00:00 2001 From: Geoff Norton Date: Wed, 17 Jun 2009 01:13:07 +0000 Subject: [PATCH] 2009-06-16 Geoff Norton * 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 --- ChangeLog | 5 +++++ include/private/gcconfig.h | 1 + misc.c | 2 ++ 3 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index af9f7242..5e4e2844 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-06-16 Geoff Norton + + * include/private/gcconfig.h: Disable static scanning on this platform + * misc.c: Enable platform-specific disabling of static scanning + 2009-06-06 Zoltan Varga * 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 -- 2.40.0