diff options
| author | Kai Tietz <ktietz@redhat.com> | 2012-11-29 09:39:49 +0000 |
|---|---|---|
| committer | Kai Tietz <ktietz@redhat.com> | 2012-11-29 09:39:49 +0000 |
| commit | 5045a616ce2334104b618b8df4d56bafd74bc498 (patch) | |
| tree | e51b4d36f468c0a9308ce172f0128103e9812e68 /libstdc++-v3/libsupc++ | |
| parent | fd99e884a6b8e55caf1509cfcd6fc481ee5bec46 (diff) | |
PR target/55445
* libsupc++/eh_personaltity.cc (__SEH__): Additional check
for not being SjLj.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@193929 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/libsupc++')
| -rw-r--r-- | libstdc++-v3/libsupc++/eh_personality.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libstdc++-v3/libsupc++/eh_personality.cc b/libstdc++-v3/libsupc++/eh_personality.cc index 2963c0c584a..c339a3e4301 100644 --- a/libstdc++-v3/libsupc++/eh_personality.cc +++ b/libstdc++-v3/libsupc++/eh_personality.cc @@ -332,13 +332,13 @@ namespace __cxxabiv1 #ifdef _GLIBCXX_SJLJ_EXCEPTIONS #define PERSONALITY_FUNCTION __gxx_personality_sj0 #define __builtin_eh_return_data_regno(x) x -#elif defined(__SEH__) +#elif defined(__SEH__) && !defined (_GLIBCXX_SJLJ_EXCEPTIONS) #define PERSONALITY_FUNCTION __gxx_personality_imp #else #define PERSONALITY_FUNCTION __gxx_personality_v0 #endif -#ifdef __SEH__ +#if defined (__SEH__) && !defined (_GLIBCXX_SJLJ_EXCEPTIONS) static #else extern "C" @@ -785,7 +785,7 @@ __cxa_call_unexpected (void *exc_obj_in) } #endif -#ifdef __SEH__ +#if defined (__SEH__) && !defined (_GLIBCXX_SJLJ_EXCEPTIONS) extern "C" EXCEPTION_DISPOSITION __gxx_personality_seh0 (PEXCEPTION_RECORD ms_exc, void *this_frame, |