diff options
| author | Kai Tietz <ktietz@redhat.com> | 2012-11-29 10:36:41 +0100 |
|---|---|---|
| committer | Kai Tietz <ktietz@gcc.gnu.org> | 2012-11-29 10:36:41 +0100 |
| commit | e5a81c8e46da8597c3f757b8666074947552f8cc (patch) | |
| tree | 5a6a2c903a77a359f7e83eade2e215cf7c3deafe /libgcc/unwind-c.c | |
| parent | 0abbfd21897f5c2f45d513d6d3212dae188e2bd7 (diff) | |
| download | gcc-e5a81c8e46da8597c3f757b8666074947552f8cc.zip gcc-e5a81c8e46da8597c3f757b8666074947552f8cc.tar.gz gcc-e5a81c8e46da8597c3f757b8666074947552f8cc.tar.bz2 | |
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
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 eb50ad8..60b4239 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) |