From: Ivan Maidanski <ivmai@mail.ru>
Date: Tue, 20 Mar 2012 18:35:51 +0000 (+0400)
Subject: Select GC_REGISTER_MAIN_STATIC_DATA behavior in build script (Symbian)
X-Git-Tag: gc7_3alpha2~50^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5bd06f278131648f019f70452148f05ef702bb87;p=gc

Select GC_REGISTER_MAIN_STATIC_DATA behavior in build script (Symbian)

* build/s60v3/libgc.mmp (GC_DONT_REGISTER_MAIN_STATIC_DATA): Define
macro.
* misc.c (GC_REGISTER_MAIN_STATIC_DATA): Do not define specially for
SYMBIAN.
---

diff --git a/build/s60v3/libgc.mmp b/build/s60v3/libgc.mmp
index efff7b0f..4a91894f 100644
--- a/build/s60v3/libgc.mmp
+++ b/build/s60v3/libgc.mmp
@@ -18,6 +18,7 @@ CAPABILITY PowerMgmt ReadDeviceData ReadUserData WriteDeviceData WriteUserData S
 MACRO ALL_INTERIOR_POINTERS
 MACRO NO_EXECUTE_PERMISSION
 MACRO USE_MMAP
+MACRO GC_DONT_REGISTER_MAIN_STATIC_DATA
 MACRO GC_DLL
 MACRO GC_BUILD
 MACRO SYMBIAN
diff --git a/misc.c b/misc.c
index 8d9bce3e..c5e64eec 100644
--- a/misc.c
+++ b/misc.c
@@ -63,8 +63,6 @@
 # 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
-#elif defined(SYMBIAN)
-# define GC_REGISTER_MAIN_STATIC_DATA() FALSE
 #else
   /* Don't unnecessarily call GC_register_main_static_data() in case    */
   /* dyn_load.c isn't linked in.                                        */