git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

PR target/55445
        * unwind-c.c (__SEH__): Make sure SjLj isn't active.
        * unwind-generic.h: Likewise.
        * unwind-seh.c: Likewise.

From-SVN: r193928
This commit is contained in:
Kai Tietz 2012-11-29 10:36:41 +01:00 committed by Kai Tietz
parent 0abbfd2189
commit e5a81c8e46
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libgcc/ChangeLog
View File

@ -1,3 +1,10 @@
2012-11-29 Kai Tietz <ktietz@redhat.com>
PR target/55445
* unwind-c.c (__SEH__): Make sure SjLj isn't active.
* unwind-generic.h: Likewise.
* unwind-seh.c: Likewise.
2012-11-28 Richard Henderson <rth@redhat.com>
PR libgcc/48076

4
libgcc/unwind-c.c
View File

@ -109,7 +109,7 @@ PERSONALITY_FUNCTION (_Unwind_State state,
struct _Unwind_Exception * ue_header,
struct _Unwind_Context * context)
#else
#ifdef __SEH__
#if defined (__SEH__) && !defined (__USING_SJLJ_EXCEPTIONS__)
static
#endif
_Unwind_Reason_Code
@ -233,7 +233,7 @@ PERSONALITY_FUNCTION (int version,
return _URC_INSTALL_CONTEXT;
}
#ifdef __SEH__
#if defined (__SEH__) && !defined (__USING_SJLJ_EXCEPTIONS__)
EXCEPTION_DISPOSITION
__gcc_personality_seh0 (PEXCEPTION_RECORD ms_exc, void *this_frame,
PCONTEXT ms_orig_context, PDISPATCHER_CONTEXT ms_disp)

4
libgcc/unwind-generic.h
View File

@ -28,7 +28,7 @@
#ifndef _UNWIND_H
#define _UNWIND_H
#ifdef __SEH__
#if defined (__SEH__) && !defined (__USING_SJLJ_EXCEPTIONS__)
/* Only for _GCC_specific_handler. */
#include <windows.h>
#endif
@ -275,7 +275,7 @@ extern void * _Unwind_FindEnclosingFunction (void *pc);
# error "What type shall we use for _sleb128_t?"
#endif
#ifdef __SEH__
#if defined (__SEH__) && !defined (__USING_SJLJ_EXCEPTIONS__)
/* Handles the mapping from SEH to GCC interfaces. */
EXCEPTION_DISPOSITION _GCC_specific_handler (PEXCEPTION_RECORD, void *,
PCONTEXT, PDISPATCHER_CONTEXT,

4
libgcc/unwind-seh.c
View File

@ -28,7 +28,7 @@
#include "tm.h"
#include "unwind.h"
#ifdef __SEH__
#if defined (__SEH__) && !defined (__USING_SJLJ_EXCEPTIONS__)
/* At the moment everything is written for x64, but in theory this could
also be used for i386, arm, mips and other extant embedded Windows. */
@ -480,4 +480,4 @@ _Unwind_Backtrace(_Unwind_Trace_Fn trace ATTRIBUTE_UNUSED,
return _URC_END_OF_STACK;
#endif
}
#endif /* __SEH__ */
#endif /* __SEH__ && !defined (__USING_SJLJ_EXCEPTIONS__) */