Author: theraven
Date: Wed Mar 19 08:10:59 2014
New Revision: 37753
URL: http://svn.gna.org/viewcvs/gnustep?rev=37753&view=rev
Log:
Correctly handle forced unwinding on ARM.
Parch by Mathias Bauer!
Modified:
libs/libobjc2/trunk/unwind-arm.h
Modified: libs/libobjc2/trunk/unwind-arm.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/libobjc2/trunk/unwind-arm.h?rev=37753&r1=37752&r2=37753&view=diff
==============================================================================
--- libs/libobjc2/trunk/unwind-arm.h (original)
+++ libs/libobjc2/trunk/unwind-arm.h Wed Mar 19 08:10:59 2014
@@ -21,10 +21,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;
@@ -171,7 +173,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:\
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
