diff options
| -rw-r--r-- | gcc/ada/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ada/raise-gcc.c | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 3992484..0e2a7e9 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2013-04-23 Kai Tietz <ktietz@redhat.com> + + PR target/55445 + * raise-gcc.c (__SEH__): Additional check that + SjLj isn't active. + 2013-04-23 Eric Botcazou <ebotcazou@adacore.com> Pascal Obry <obry@adacore.com> diff --git a/gcc/ada/raise-gcc.c b/gcc/ada/raise-gcc.c index 42c5a5c..a428642 100644 --- a/gcc/ada/raise-gcc.c +++ b/gcc/ada/raise-gcc.c @@ -1019,7 +1019,7 @@ extern void __gnat_notify_unhandled_exception (struct Exception_Occurrence *); #ifdef __USING_SJLJ_EXCEPTIONS__ #define PERSONALITY_FUNCTION __gnat_personality_sj0 -#elif defined(__SEH__) +#elif defined (__SEH__) #define PERSONALITY_FUNCTION __gnat_personality_imp #else #define PERSONALITY_FUNCTION __gnat_personality_v0 @@ -1056,7 +1056,7 @@ typedef int version_arg_t; typedef _Unwind_Action phases_arg_t; #endif -#ifdef __SEH__ +#if defined (__SEH__) && !defined (__USING_SJLJ_EXCEPTIONS__) static #endif _Unwind_Reason_Code @@ -1222,7 +1222,7 @@ __gnat_Unwind_ForcedUnwind (_Unwind_Exception *e, #endif } -#ifdef __SEH__ +#if defined (__SEH__) && !defined (__USING_SJLJ_EXCEPTIONS__) #define STATUS_USER_DEFINED (1U << 29) |