diff options
| author | dim <dim@FreeBSD.org> | 2016-09-07 19:29:15 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2016-09-07 19:29:15 +0000 |
| commit | 39eb8b6d65976a8769e2d8e434b7f36ed9882fe6 (patch) | |
| tree | 818f9f3d3b65561557e2af8c9e1d959b48685af8 | |
| parent | 2d624862a74900689dfe1678642d9d5c45645f23 (diff) | |
| download | FreeBSD-src-39eb8b6d65976a8769e2d8e434b7f36ed9882fe6.zip FreeBSD-src-39eb8b6d65976a8769e2d8e434b7f36ed9882fe6.tar.gz | |
MFC r305396:
Add _US_ACTION_MASK to libcxxrt's arm-specific unwind header. This
value is used in newer versions of compiler-rt.
| -rw-r--r-- | contrib/libcxxrt/unwind-arm.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/libcxxrt/unwind-arm.h b/contrib/libcxxrt/unwind-arm.h index 23f2b79..4dc6398 100644 --- a/contrib/libcxxrt/unwind-arm.h +++ b/contrib/libcxxrt/unwind-arm.h @@ -28,7 +28,7 @@ { _URC_OK = 0, /* operation completed successfully */ _URC_FOREIGN_EXCEPTION_CAUGHT = 1, - _URC_END_OF_STACK = 5, + _URC_END_OF_STACK = 5, _URC_HANDLER_FOUND = 6, _URC_INSTALL_CONTEXT = 7, _URC_CONTINUE_UNWIND = 8, @@ -43,10 +43,12 @@ typedef uint32_t _Unwind_State; static const _Unwind_State _US_VIRTUAL_UNWIND_FRAME = 0; static const _Unwind_State _US_UNWIND_FRAME_STARTING = 1; static const _Unwind_State _US_UNWIND_FRAME_RESUME = 2; +static const _Unwind_State _US_ACTION_MASK = 3; #else // GCC fails at knowing what a constant expression is # define _US_VIRTUAL_UNWIND_FRAME 0 # define _US_UNWIND_FRAME_STARTING 1 -# define _US_UNWIND_FRAME_RESUME 2 +# define _US_UNWIND_FRAME_RESUME 2 +# define _US_ACTION_MASK 3 #endif typedef struct _Unwind_Context _Unwind_Context; |
