[null_gc] Get null GC building again.

[mono.git] / mono / metadata / null-gc.c

diff --git a/mono/metadata/null-gc.c b/mono/metadata/null-gc.c
index 8d662c0ce5f03f935442e0f0a000075f596ffbe9..d791744dd05833825c1315545e09a9b756e7cc07 100644 (file)
--- a/mono/metadata/null-gc.c
+++ b/mono/metadata/null-gc.c
@@ -13,15 +13,22 @@
 #include <mono/metadata/mono-gc.h>
 #include <mono/metadata/gc-internals.h>
 #include <mono/metadata/runtime.h>
+#include <mono/metadata/w32handle.h>
 #include <mono/utils/atomic.h>
 #include <mono/utils/mono-threads.h>
 #include <mono/utils/mono-counters.h>
+#include <mono/metadata/null-gc-handles.h>
 
 #ifdef HAVE_NULL_GC
 
+static gboolean gc_inited = FALSE;
+
 void
 mono_gc_base_init (void)
 {
+       if (gc_inited)
+               return;
+
        mono_counters_init ();
 
 #ifndef HOST_WIN32
@@ -32,6 +39,10 @@ mono_gc_base_init (void)
        mono_thread_info_init (sizeof (MonoThreadInfo));
 
        mono_thread_info_attach ();
+
+       null_gc_handles_init ();
+
+       gc_inited = TRUE;
 }
 
 void
@@ -109,24 +120,6 @@ mono_gc_deregister_root (char* addr)
 {
 }
 
-void
-mono_gc_weak_link_add (void **link_addr, MonoObject *obj, gboolean track)
-{
-       *link_addr = obj;
-}
-
-void
-mono_gc_weak_link_remove (void **link_addr, gboolean track)
-{
-       *link_addr = NULL;
-}
-
-MonoObject*
-mono_gc_weak_link_get (void **link_addr)
-{
-       return *link_addr;
-}
-
 void*
 mono_gc_make_descr_for_string (gsize *bitmap, int numbits)
 {
@@ -292,12 +285,14 @@ mono_gc_is_critical_method (MonoMethod *method)
 gpointer
 mono_gc_thread_attach (MonoThreadInfo* info)
 {
+       info->handle_stack = mono_handle_stack_alloc ();
        return info;
 }
 
 void
 mono_gc_thread_detach_with_lock (MonoThreadInfo *p)
 {
+       mono_handle_stack_free (p->handle_stack);
 }
 
 gboolean
@@ -342,27 +337,6 @@ mono_gc_get_gc_name (void)
        return "null";
 }
 
-void
-mono_gc_add_weak_track_handle (MonoObject *obj, guint32 gchandle)
-{
-}
-
-void
-mono_gc_change_weak_track_handle (MonoObject *old_obj, MonoObject *obj, guint32 gchandle)
-{
-}
-
-void
-mono_gc_remove_weak_track_handle (guint32 gchandle)
-{
-}
-
-GSList*
-mono_gc_remove_weak_track_object (MonoDomain *domain, MonoObject *obj)
-{
-       return NULL;
-}
-
 void
 mono_gc_clear_domain (MonoDomain *domain)
 {
@@ -566,6 +540,19 @@ mono_gc_is_null (void)
 {
        return TRUE;
 }
+
+int
+mono_gc_invoke_finalizers (void)
+{
+       return 0;
+}
+
+MonoBoolean
+mono_gc_pending_finalizers (void)
+{
+       return FALSE;
+}
+
 #else
 
 MONO_EMPTY_SOURCE_FILE (null_gc);