diff options
| author | ktietz <ktietz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-07-04 09:03:31 +0000 |
|---|---|---|
| committer | ktietz <ktietz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-07-04 09:03:31 +0000 |
| commit | 36d0274d5609af7d80abbff157bacf9bb5979045 (patch) | |
| tree | ac8dd899a58cfb447e5315bf55392d1486125a42 | |
| parent | 3eff38f3b36451d1032e00cde5d3512d9441c210 (diff) | |
| download | gcc-36d0274d5609af7d80abbff157bacf9bb5979045.tar.gz | |
2013-07-04 Kai Tietz <ktietz@redhat.com>
* exception.c: Add check for SjLj to SEH blocks.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@200663 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libobjc/ChangeLog | 4 | ||||
| -rw-r--r-- | libobjc/exception.c | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index 0c2512200f0..d26fd1d1261 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -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> Update copyright years. diff --git a/libobjc/exception.c b/libobjc/exception.c index 4b05611fedc..505086fedec 100644 --- a/libobjc/exception.c +++ b/libobjc/exception.c @@ -202,7 +202,7 @@ 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__) +#elif defined(__SEH__) && !defined (__USING_SJLJ_EXCEPTIONS__) #define PERSONALITY_FUNCTION __gnu_objc_personality_imp #else #define PERSONALITY_FUNCTION __gnu_objc_personality_v0 @@ -227,7 +227,7 @@ PERSONALITY_FUNCTION (_Unwind_State state, #define CONTINUE_UNWINDING return _URC_CONTINUE_UNWIND -#ifdef __SEH__ +#if defined (__SEH__) && !defined (__USING_SJLJ_EXCEPTIONS__) static #endif _Unwind_Reason_Code @@ -524,7 +524,7 @@ objc_exception_throw (id exception) abort (); } -#ifdef __SEH__ +#if defined (__SEH__) && !defined (__USING_SJLJ_EXCEPTIONS__) EXCEPTION_DISPOSITION __gnu_objc_personality_seh0 (PEXCEPTION_RECORD ms_exc, void *this_frame, 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, ms_disp, __gnu_objc_personality_imp); } -#endif /* SEH */ +#endif |