[Pkg-mono-svn-commits] [SCM] mono branch, upstream-2.8/debian/patches/arm_thumb2_nullreferenceexception_sigill, updated. upstream/2.8-2-g543a387

[Jo Shields]

The following commit has been merged in the upstream-2.8/debian/patches/arm_thumb2_nullreferenceexception_sigill branch:
commit 543a387b81d87c3b17feb992ff7ed1556df78bd9
Author: Zoltan Varga <vargaz at gmail.com>
Date:   Fri Nov 19 17:19:04 2010 +0100

    Fix the previous arm EH change.

diff --git a/mono/mini/exceptions-arm.c b/mono/mini/exceptions-arm.c
index e7f7276..9fef38f 100644
--- a/mono/mini/exceptions-arm.c
+++ b/mono/mini/exceptions-arm.c
@@ -510,7 +510,7 @@ mono_arch_handle_exception (void *ctx, gpointer obj, gboolean test_only)
 
 	UCONTEXT_REG_PC (sigctx) = (gsize)handle_signal_exception;
 #ifdef UCONTEXT_REG_CPSR
-	if ((gsize)UCONTEXT_REG_PC (sigctx) | 1)
+	if ((gsize)UCONTEXT_REG_PC (sigctx) & 1)
 		/* Transition to thumb */
 		UCONTEXT_REG_CPSR (sigctx) |= (1 << 5);
 #endif

-- 
mono