diff options
| author | Hans Wennborg <hans@hanshq.net> | 2018-08-08 06:37:32 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2018-08-08 06:37:32 +0000 |
| commit | 4882faae3a8717bcceac370d8305e9c527dd2e5d (patch) | |
| tree | 9080568c213f275fae6b640aa301b6dc4c4798e1 | |
| parent | ad0f01329b13171b2e066dafe306df3237ff1151 (diff) | |
Merging r339170:
------------------------------------------------------------------------
r339170 | mstorsjo | 2018-08-07 22:02:40 +0200 (Tue, 07 Aug 2018) | 5 lines
[Headers] Expand _Unwind_Exception for SEH on MinGW/x86_64
This matches how GCC defines this struct.
Differential Revision: https://reviews.llvm.org/D50380
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_70@339220 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Headers/unwind.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/Headers/unwind.h b/lib/Headers/unwind.h index 345fa4d0c1..0e8317e5b9 100644 --- a/lib/Headers/unwind.h +++ b/lib/Headers/unwind.h @@ -154,8 +154,12 @@ struct _Unwind_Control_Block { struct _Unwind_Exception { _Unwind_Exception_Class exception_class; _Unwind_Exception_Cleanup_Fn exception_cleanup; +#if !defined (__USING_SJLJ_EXCEPTIONS__) && defined (__SEH__) + _Unwind_Word private_[6]; +#else _Unwind_Word private_1; _Unwind_Word private_2; +#endif /* The Itanium ABI requires that _Unwind_Exception objects are "double-word * aligned". GCC has interpreted this to mean "use the maximum useful * alignment for the target"; so do we. */ |