svn commit: r305559 - stable/11/contrib/libcxxrt

[Dimitry Andric]

Author: dim
Date: Wed Sep  7 19:29:15 2016
New Revision: 305559
URL: https://svnweb.freebsd.org/changeset/base/305559

Log:
  MFC r305396:
  
  Add _US_ACTION_MASK to libcxxrt's arm-specific unwind header.  This
  value is used in newer versions of compiler-rt.

Modified:
  stable/11/contrib/libcxxrt/unwind-arm.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/contrib/libcxxrt/unwind-arm.h
==============================================================================
--- stable/11/contrib/libcxxrt/unwind-arm.h	Wed Sep  7 19:25:08 2016	(r305558)
+++ stable/11/contrib/libcxxrt/unwind-arm.h	Wed Sep  7 19:29:15 2016	(r305559)
@@ -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;