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-seh.c | |
| parent | f67e2d48d4c6681dec397577a6a663e596881ab7 (diff) | |
| download | ppe42-gcc-a92cf445a6200e38e2aaf18d5181df017905cd46.tar.gz ppe42-gcc-a92cf445a6200e38e2aaf18d5181df017905cd46.zip | |
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-seh.c')
| -rw-r--r-- | libgcc/unwind-seh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libgcc/unwind-seh.c b/libgcc/unwind-seh.c index 24e4280fde7..608fe6f1ba3 100644 --- a/libgcc/unwind-seh.c +++ b/libgcc/unwind-seh.c @@ -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__) */ |
