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 /libstdc++-v3 | |
| 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 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/config/abi/pre/gnu.ver | 1 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/eh_personality.cc | 20 |
3 files changed, 27 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f9dd6c740bf..1a6f19fdb30 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2012-07-19 Tristan Gingold <gingold@adacore.com> + Richard Henderson <rth@redhat.com> + + * libsupc++/eh_personality.cc (__gxx_personality_seh0): New function. + Adjust for SEH. + * config/abi/pre/gnu.ver: Add __gxx_personality_seh0. + 2012-07-18 Paolo Carlini <paolo.carlini@oracle.com> PR c++/51213 diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver index b99a8121680..cd0be4e051b 100644 --- a/libstdc++-v3/config/abi/pre/gnu.ver +++ b/libstdc++-v3/config/abi/pre/gnu.ver @@ -1357,6 +1357,7 @@ CXXABI_1.3 { __cxa_vec_new3; __gxx_personality_v0; __gxx_personality_sj0; + __gxx_personality_seh0; __dynamic_cast; # *_type_info classes, ctor and dtor diff --git a/libstdc++-v3/libsupc++/eh_personality.cc b/libstdc++-v3/libsupc++/eh_personality.cc index 729d688d7c8..72f596e0692 100644 --- a/libstdc++-v3/libsupc++/eh_personality.cc +++ b/libstdc++-v3/libsupc++/eh_personality.cc @@ -332,11 +332,18 @@ namespace __cxxabiv1 #ifdef _GLIBCXX_SJLJ_EXCEPTIONS #define PERSONALITY_FUNCTION __gxx_personality_sj0 #define __builtin_eh_return_data_regno(x) x +#elif defined(__SEH__) +#define PERSONALITY_FUNCTION __gxx_personality_imp #else #define PERSONALITY_FUNCTION __gxx_personality_v0 #endif -extern "C" _Unwind_Reason_Code +#ifdef __SEH__ +static +#else +extern "C" +#endif +_Unwind_Reason_Code #ifdef __ARM_EABI_UNWINDER__ PERSONALITY_FUNCTION (_Unwind_State state, struct _Unwind_Exception* ue_header, @@ -778,4 +785,15 @@ __cxa_call_unexpected (void *exc_obj_in) } #endif +#ifdef __SEH__ +extern "C" +EXCEPTION_DISPOSITION +__gxx_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, __gxx_personality_imp); +} +#endif /* SEH */ + } // namespace __cxxabiv1 |