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

	PR target/55445
	* raise-gcc.c (__SEH__): Additional check that
	SjLj isn't active.

From-SVN: r198205

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 3992484a9874685727b5821b5dd32778280193bb..0e2a7e97dfa2a3f36d3a419575811de74e02d3d3 100644 (file)
--- 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 42c5a5c4b45e23fffbd8cc9d4f12f018760727ce..a428642db1ae6518c1564dedbc88104726e9dfb1 100644 (file)
--- 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)