svn commit: r305396 - head/contrib/libcxxrt

Dimitry Andric dim at FreeBSD.org
Sun Sep 4 21:48:59 UTC 2016


Author: dim
Date: Sun Sep  4 21:48:58 2016
New Revision: 305396
URL: https://svnweb.freebsd.org/changeset/base/305396

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

Modified:
  head/contrib/libcxxrt/unwind-arm.h

Modified: head/contrib/libcxxrt/unwind-arm.h
==============================================================================
--- head/contrib/libcxxrt/unwind-arm.h	Sun Sep  4 20:55:27 2016	(r305395)
+++ head/contrib/libcxxrt/unwind-arm.h	Sun Sep  4 21:48:58 2016	(r305396)
@@ -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;


More information about the svn-src-head mailing list