Patchwork [libstdc++] : Fix PR target/55445 Always defined __SEH__ when build from trunk

login
register
mail settings
Submitter Kai Tietz
Date Nov. 25, 2012, 3:41 p.m.
Message ID <CAEwic4ZWF14Jigg1BPzFd6QmQZgBR8bwMu2ezxJRUVV4OKDkdw@mail.gmail.com>
Download mbox | patch
Permalink /patch/201551/
State New
Headers show

Comments

Kai Tietz - Nov. 25, 2012, 3:41 p.m.
Hi,

this patch fixes used exception-mechanism for SEH-enabled targets,
which are requesting for SjLj-exception-mechanism.
See also patch for libgcc.

ChangeLog

2012-11-25  Kai Tietz

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

Tested for multilib i686-w64-mingw32, and x86_64-w64-mingw32 targets.
Ok for apply?

Regards,
Kai
Kai Tietz - Nov. 28, 2012, 6:02 p.m.
Ping

2012/11/25 Kai Tietz <ktietz70@googlemail.com>:
> Hi,
>
> this patch fixes used exception-mechanism for SEH-enabled targets,
> which are requesting for SjLj-exception-mechanism.
> See also patch for libgcc.
>
> ChangeLog
>
> 2012-11-25  Kai Tietz
>
>         PR target/55445
>         * libsupc++/eh_personaltity.cc (__SEH__): Additional check
>         for not being SjLj.
>
> Tested for multilib i686-w64-mingw32, and x86_64-w64-mingw32 targets.
> Ok for apply?
>
> Regards,
> Kai
>
> Index: eh_personality.cc
> ===================================================================
> --- eh_personality.cc   (Revision 193669)
> +++ eh_personality.cc   (Arbeitskopie)
> @@ -332,13 +332,13 @@
>  #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 @@
>  }
>  #endif
>
> -#ifdef __SEH__
> +#if defined (__SEH__) && !defined (_GLIBCXX_SJLJ_EXCEPTIONS)
>  extern "C"
>  EXCEPTION_DISPOSITION
>  __gxx_personality_seh0 (PEXCEPTION_RECORD ms_exc, void *this_frame,
Paolo Carlini - Nov. 28, 2012, 6:53 p.m.
On 11/28/2012 07:02 PM, Kai Tietz wrote:
> Ping
>
> 2012/11/25 Kai Tietz <ktietz70@googlemail.com>:
>> Hi,
>>
>> this patch fixes used exception-mechanism for SEH-enabled targets,
>> which are requesting for SjLj-exception-mechanism.
>> See also patch for libgcc.
>>
>> ChangeLog
>>
>> 2012-11-25  Kai Tietz
>>
>>          PR target/55445
>>          * libsupc++/eh_personaltity.cc (__SEH__): Additional check
>>          for not being SjLj.
>>
>> Tested for multilib i686-w64-mingw32, and x86_64-w64-mingw32 targets.
>> Ok for apply?
These libstdc++ bits are of course also Ok.

Thanks,
Paolo.

Patch

Index: eh_personality.cc
===================================================================
--- eh_personality.cc	(Revision 193669)
+++ eh_personality.cc	(Arbeitskopie)
@@ -332,13 +332,13 @@ 
 #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 @@ 
 }
 #endif

-#ifdef __SEH__
+#if defined (__SEH__) && !defined (_GLIBCXX_SJLJ_EXCEPTIONS)
 extern "C"
 EXCEPTION_DISPOSITION
 __gxx_personality_seh0 (PEXCEPTION_RECORD ms_exc, void *this_frame,