2010-05-13 Zoltan Varga <vargaz@gmail.com>

	(mono_arch_handle_exception): Fix the cross-compile case.

svn path=/trunk/mono/; revision=157293

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 3a1ee3c390580f3ff519128f2b3b42efbb50a9db..cde052f962cb2920b8a9b85d711aae486a0c50e7 100755 (executable)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-13  Zoltan Varga  <vargaz@gmail.com>
+
+       (mono_arch_handle_exception): Fix the cross-compile case.
+
 2010-05-13  Zoltan Varga  <vargaz@gmail.com>
 
        * exceptions-arm.c (mono_arch_handle_exception): Resume from the signal handler

diff --git a/mono/mini/exceptions-arm.c b/mono/mini/exceptions-arm.c
index 6c0bda6bc0dc649790c9a9f7b83778e9caec1cc5..12a14f33218c9e119160b256a9ed7d8e22d73213 100644 (file)
--- a/mono/mini/exceptions-arm.c
+++ b/mono/mini/exceptions-arm.c
@@ -512,7 +512,9 @@ handle_signal_exception (gpointer obj, gboolean test_only)
 gboolean
 mono_arch_handle_exception (void *ctx, gpointer obj, gboolean test_only)
 {
-#if defined(MONO_ARCH_USE_SIGACTION)
+#if defined(MONO_CROSS_COMPILE)
+       g_assert_not_reached ();
+#elif defined(MONO_ARCH_USE_SIGACTION)
        my_ucontext *sigctx = ctx;
        /*
         * Handling the exception in the signal handler is problematic, since the original