diff options
Diffstat (limited to 'libobjc')
| -rw-r--r-- | libobjc/ChangeLog | 7 | ||||
| -rw-r--r-- | libobjc/exception.c | 15 |
2 files changed, 21 insertions, 1 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index 3946e654ca18..fe1d395c6f98 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,8 @@ +2012-07-19 Tristan Gingold <gingold@adacore.com> + Richard Henderson <rth@redhat.com> + + * exception.c (__gnu_objc_personality_seh0): New function. + 2012-05-16 H.J. Lu <hongjiu.lu@intel.com> * configure: Regenerated. @@ -38,7 +43,7 @@ fields other than the first two upon loading a class. 2011-10-09 Nicola Pero <nicola.pero@meta-innovation.com> - + * class.c (objc_lookup_class): Added back for compatibility with clang which seems to emit calls to it. diff --git a/libobjc/exception.c b/libobjc/exception.c index 04308ce13e7d..1f802a84a68a 100644 --- a/libobjc/exception.c +++ b/libobjc/exception.c @@ -202,6 +202,8 @@ get_ttype_entry (struct lsda_header_info *info, _Unwind_Word i) #ifdef SJLJ_EXCEPTIONS #define PERSONALITY_FUNCTION __gnu_objc_personality_sj0 #define __builtin_eh_return_data_regno(x) x +#elif defined(__SEH__) +#define PERSONALITY_FUNCTION __gnu_objc_personality_imp #else #define PERSONALITY_FUNCTION __gnu_objc_personality_v0 #endif @@ -225,6 +227,9 @@ PERSONALITY_FUNCTION (_Unwind_State state, #define CONTINUE_UNWINDING return _URC_CONTINUE_UNWIND +#ifdef __SEH__ +static +#endif _Unwind_Reason_Code PERSONALITY_FUNCTION (int version, _Unwind_Action actions, @@ -519,3 +524,13 @@ objc_exception_throw (id exception) abort (); } +#ifdef __SEH__ +EXCEPTION_DISPOSITION +__gnu_objc_personality_seh0 (PEXCEPTION_RECORD ms_exc, void *this_frame, + PCONTEXT ms_orig_context, + PDISPATCHER_CONTEXT ms_disp) +{ + return _GCC_specific_handler (ms_exc, this_frame, ms_orig_context, + ms_disp, __gnu_objc_personality_imp); +} +#endif /* SEH */ |