diff options
| author | ktietz <ktietz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-11-29 09:36:41 +0000 |
|---|---|---|
| committer | ktietz <ktietz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-11-29 09:36:41 +0000 |
| commit | a92cf445a6200e38e2aaf18d5181df017905cd46 (patch) | |
| tree | 5a6a2c903a77a359f7e83eade2e215cf7c3deafe /libgcc/unwind-c.c | |
| parent | f67e2d48d4c6681dec397577a6a663e596881ab7 (diff) | |
| download | gcc-a92cf445a6200e38e2aaf18d5181df017905cd46.tar.gz | |
PR target/55445
* unwind-c.c (__SEH__): Make sure SjLj isn't active.
* unwind-generic.h: Likewise.
* unwind-seh.c: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@193928 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgcc/unwind-c.c')
| -rw-r--r-- | libgcc/unwind-c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libgcc/unwind-c.c b/libgcc/unwind-c.c index eb50ad82a17..60b4239024a 100644 --- a/libgcc/unwind-c.c +++ b/libgcc/unwind-c.c @@ -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) |