git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

exception.c: Add check for SjLj to SEH blocks. 

2013-07-04  Kai Tietz  <ktietz@redhat.com>

	* exception.c: Add check for SjLj to SEH blocks.

From-SVN: r200663
This commit is contained in:
Kai Tietz 2013-07-04 11:03:31 +02:00 committed by Kai Tietz
parent b727d9c4be
commit 3e67692874
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libobjc/ChangeLog
View File

@ -1,3 +1,7 @@
2013-07-04 Kai Tietz <ktietz@redhat.com>
* exception.c: Add check for SjLj to SEH blocks.
2013-02-03 Richard Sandiford <rdsandiford@googlemail.com> 2013-02-03 Richard Sandiford <rdsandiford@googlemail.com>
Update copyright years. Update copyright years.

8
libobjc/exception.c
View File

@ -202,7 +202,7 @@ get_ttype_entry (struct lsda_header_info *info, _Unwind_Word i)
#ifdef SJLJ_EXCEPTIONS #ifdef SJLJ_EXCEPTIONS
#define PERSONALITY_FUNCTION __gnu_objc_personality_sj0 #define PERSONALITY_FUNCTION __gnu_objc_personality_sj0
#define __builtin_eh_return_data_regno(x) x #define __builtin_eh_return_data_regno(x) x
#elif defined(__SEH__) #elif defined(__SEH__) && !defined (__USING_SJLJ_EXCEPTIONS__)
#define PERSONALITY_FUNCTION __gnu_objc_personality_imp #define PERSONALITY_FUNCTION __gnu_objc_personality_imp
#else #else
#define PERSONALITY_FUNCTION __gnu_objc_personality_v0 #define PERSONALITY_FUNCTION __gnu_objc_personality_v0
@ -227,7 +227,7 @@ PERSONALITY_FUNCTION (_Unwind_State state,
#define CONTINUE_UNWINDING return _URC_CONTINUE_UNWIND #define CONTINUE_UNWINDING return _URC_CONTINUE_UNWIND
#ifdef __SEH__ #if defined (__SEH__) && !defined (__USING_SJLJ_EXCEPTIONS__)
static static
#endif #endif
_Unwind_Reason_Code _Unwind_Reason_Code
@ -524,7 +524,7 @@ objc_exception_throw (id exception)
abort (); abort ();
} }
#ifdef __SEH__ #if defined (__SEH__) && !defined (__USING_SJLJ_EXCEPTIONS__)
EXCEPTION_DISPOSITION EXCEPTION_DISPOSITION
__gnu_objc_personality_seh0 (PEXCEPTION_RECORD ms_exc, void *this_frame, __gnu_objc_personality_seh0 (PEXCEPTION_RECORD ms_exc, void *this_frame,
PCONTEXT ms_orig_context, PCONTEXT ms_orig_context,
@ -533,4 +533,4 @@ __gnu_objc_personality_seh0 (PEXCEPTION_RECORD ms_exc, void *this_frame,
return _GCC_specific_handler (ms_exc, this_frame, ms_orig_context, return _GCC_specific_handler (ms_exc, this_frame, ms_orig_context,
ms_disp, __gnu_objc_personality_imp); ms_disp, __gnu_objc_personality_imp);
} }
#endif /* SEH */ #endif