re PR target/55445 (Always defined __SEH__ when build from trunk)

PR target/55445
        * libsupc++/eh_personaltity.cc (__SEH__): Additional check
        for not being SjLj.

From-SVN: r193929
This commit is contained in:
Kai Tietz 2012-11-29 10:39:49 +01:00 committed by Kai Tietz
parent e5a81c8e46
commit 02f9e21a26
2 changed files with 9 additions and 3 deletions

View File

@ -1,3 +1,9 @@
2012-11-29 Kai Tietz <ktietz@redhat.com>
PR target/55445
* libsupc++/eh_personaltity.cc (__SEH__): Additional check
for not being SjLj.
2012-11-28 Andrew Pinski <apinski@cavium.com>
PR bootstrap/54279

View File

@ -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,