Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / libgc / darwin_stop_world.c

diff --git a/libgc/darwin_stop_world.c b/libgc/darwin_stop_world.c
index 8272d556accda20033b2a1a0bcc259b5b29497b2..9904a3e1d0f17cb8e63f0f0aafaf9e1919f37fd2 100644 (file)
--- a/libgc/darwin_stop_world.c
+++ b/libgc/darwin_stop_world.c
@@ -2,17 +2,9 @@
 
 # if defined(GC_DARWIN_THREADS)
 
-#if __APPLE__
-#include "TargetConditionals.h"
-#endif
-
 #include <AvailabilityMacros.h>
 #include "mono/utils/mono-compiler.h"
 
-#ifdef MONO_DEBUGGER_SUPPORTED
-#include "include/libgc-mono-debugger.h"
-#endif
-
 /* From "Inside Mac OS X - Mach-O Runtime Architecture" published by Apple
    Page 49:
    "The space beneath the stack pointer, where a new stack frame would normally
@@ -119,7 +111,7 @@ void GC_push_all_stacks() {
        if(r != KERN_SUCCESS) continue;
        
 #if defined(I386)
-#if TARGET_IPHONE_SIMULATOR == 1 || (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5)
+#if defined (TARGET_IOS) || (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5)
 
        lo = state.__esp;
 
@@ -395,7 +387,7 @@ void GC_push_all_stacks() {
                             (natural_t *)&info, &outCount);
        if(r != KERN_SUCCESS) continue;
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+#if defined (TARGET_IOS) || (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5)
        lo = (void*)info.__esp;
        hi = (ptr_t)FindTopOfStack(info.__esp);
 
@@ -588,6 +580,7 @@ void GC_stop_world()
     
     if (GC_notify_event)
         GC_notify_event (GC_EVENT_PRE_STOP_WORLD);
+       GC_process_togglerefs ();
 
 #   if DEBUG_THREADS
       GC_printf1("Stopping the world from 0x%lx\n", mach_thread_self());
@@ -740,17 +733,4 @@ void GC_darwin_register_mach_handler_thread(mach_port_t thread) {
   GC_use_mach_handler_thread = 1;
 }
 
-#ifdef MONO_DEBUGGER_SUPPORTED
-GCThreadFunctions *gc_thread_vtable = NULL;
-
-void *
-GC_mono_debugger_get_stack_ptr (void)
-{
-       GC_thread me;
-
-       me = GC_lookup_thread (pthread_self ());
-       return &me->stop_info.stack_ptr;
-}
-#endif
-
 #endif