Enable MONO_ARCH_HAS_MONO_CONTEXT on mingw.

diff --git a/mono/metadata/sgen-os-win32.c b/mono/metadata/sgen-os-win32.c
index a476c73d3b047c77733a1b84020b5ba523247b08..760e3eb3cf7e84bc33db01d858d52d8de745e099 100755 (executable)
--- a/mono/metadata/sgen-os-win32.c
+++ b/mono/metadata/sgen-os-win32.c
@@ -60,6 +60,17 @@ sgen_suspend_thread (SgenThreadInfo *info)
        info->stopped_ip = (gpointer)context.Eip;
        info->stack_start = (char*)context.Esp - REDZONE_SIZE;
 
+#ifdef USE_MONO_CTX
+       memset (&info->ctx, 0, sizeof (MonoContext));
+       info->ctx.edi = context.Edi;
+       info->ctx.esi = context.Esi;
+       info->ctx.ebx = context.Ebx;
+       info->ctx.edx = context.Edx;
+       info->ctx.ecx = context.Ecx;
+       info->ctx.eax = context.Eax;
+       info->ctx.ebp = context.Ebp;
+       info->ctx.esp = context.Esp;
+#else
        info->regs [0] = context.Edi;
        info->regs [1] = context.Esi;
        info->regs [2] = context.Ebx;
@@ -68,6 +79,7 @@ sgen_suspend_thread (SgenThreadInfo *info)
        info->regs [5] = context.Eax;
        info->regs [6] = context.Ebp;
        info->regs [7] = context.Esp;
+#endif
 
        /* Notify the JIT */
        if (mono_gc_get_gc_callbacks ()->thread_suspend_func)

diff --git a/mono/utils/mono-context.h b/mono/utils/mono-context.h
old mode 100644 (file)
new mode 100755 (executable)
index 43ceb84..e7d5ebd
--- a/mono/utils/mono-context.h
+++ b/mono/utils/mono-context.h
@@ -121,7 +121,7 @@ typedef struct {
        : "a" (&(ctx))  \
        : "memory")
 
-#if !defined(HOST_WIN32)
+#ifndef _MSC_VER
 #define MONO_ARCH_HAS_MONO_CONTEXT 1
 #endif