Index: unwind-arm.h
===================================================================
--- unwind-arm.h	(revision 37628)
+++ unwind-arm.h	(working copy)
@@ -19,10 +19,12 @@
 static const _Unwind_State _US_VIRTUAL_UNWIND_FRAME  = 0;
 static const _Unwind_State _US_UNWIND_FRAME_STARTING = 1;
 static const _Unwind_State _US_UNWIND_FRAME_RESUME   = 2;
+static const _Unwind_State _US_FORCE_UNWIND = 8;
 #else // GCC fails at knowing what a constant expression is
 #	define _US_VIRTUAL_UNWIND_FRAME  0
 #	define _US_UNWIND_FRAME_STARTING 1
 #	define _US_UNWIND_FRAME_RESUME 2
+#   define _US_FORCE_UNWIND 8
 #endif
 
 typedef int _Unwind_Action;
@@ -169,7 +171,7 @@
 	int version = 1;\
 	uint64_t exceptionClass = exceptionObject->exception_class;\
 	int actions;\
-	switch (state)\
+	switch (state & ~_US_FORCE_UNWIND)\
 	{\
 		default: return _URC_FAILURE;\
 		case _US_VIRTUAL_UNWIND_FRAME:\