diff options
| author | gingold <gingold@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-07-19 07:29:24 +0000 |
|---|---|---|
| committer | gingold <gingold@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-07-19 07:29:24 +0000 |
| commit | 8ad0b5306ddfc738d6e450528ee9beb281212ea0 (patch) | |
| tree | 01e5d9fd06f28730cf73b04831f6df6e60c2cfca /libobjc | |
| parent | 7df951489618b262d1669a606fda43ea5f5b4585 (diff) | |
| download | gcc-8ad0b5306ddfc738d6e450528ee9beb281212ea0.tar.gz | |
libstdc++-v3/
* libsupc++/eh_personality.cc (__gxx_personality_seh0): New function.
Adjust for SEH.
* config/abi/pre/gnu.ver: Add __gxx_personality_seh0.
libobjc/
* exception.c (__gnu_objc_personality_seh0): New function.
libjava/
* libgcj.ver: Add __gcj_personality_seh0.
* exception.cc (__gcj_personality_seh0): New function.
Adjust for SEH.
libgcc/
* unwind-seh.c: New file.
* unwind-generic.h: Include windows.h for SEH.
(_Unwind_Exception): Use 6 private fields for SEH.
(_GCC_specific_handler): Declare.
* unwind-c.c (__gcc_personality_seh0): New function.
Adjust for SEH.
* config/i386/libgcc-cygming.ver: New file.
* config/i386/t-seh-eh: New file.
* config.host (x86_64-*-mingw*): Default to seh.
gcc/
* opts.c (finish_options): Handle UI_SEH.
* expr.c (build_personality_function): Handle UI_SEH.
* dwarf2out.c (dwarf2out_begin_prologue): Handle UI_SEH.
* coretypes.h (unwind_info_type): Add UI_SEH.
* config/i386/winnt.c (i386_pe_seh_emit_except_personality):
New function.
(i386_pe_seh_init_sections): Likewise.
* config/i386/cygming.h (TARGET_ASM_EMIT_EXCEPT_PERSONALITY): Define.
(TARGET_ASM_INIT_SECTIONS): Define.
* common/config/i386/i386-common.c (TARGET_EXCEPT_UNWIND_INFO): Define.
(i386_except_unwind_info): New function.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@189644 138bc75d-0d04-0410-961f-82ee72b054a4
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 3946e654ca1..fe1d395c6f9 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 04308ce13e7..1f802a84a68 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 */ |