[PATCH] D53127: Fix missing defines in libc++abi when compiled against libgcc's arm unwind (follow-up of D42242)

Steffen Kuhn via Phabricator reviews at reviews.llvm.org
Sun Oct 14 23:20:17 PDT 2018


stefson updated this revision to Diff 169648.
stefson added a comment.

removed questionable hack from cxa_personality, this still needs a fix but it will be taken care of in another pullrequest.


Repository:
  rCXXA libc++abi

https://reviews.llvm.org/D53127

Files:
  src/cxa_exception.hpp


Index: src/cxa_exception.hpp
===================================================================
--- src/cxa_exception.hpp
+++ src/cxa_exception.hpp
@@ -28,6 +28,13 @@
 void     __setExceptionClass  (      _Unwind_Exception*, uint64_t);
 bool     __isOurExceptionClass(const _Unwind_Exception*);
 
+#if defined(__arm__) && defined(__ARM_EABI_UNWINDER__)
+// missing values from _Unwind_Reason_Code enum
+#define _URC_FATAL_PHASE2_ERROR ((_Unwind_Reason_Code)2)
+#define _URC_FATAL_PHASE1_ERROR ((_Unwind_Reason_Code)3)
+#define _URC_NORMAL_STOP ((_Unwind_Reason_Code)4)
+#endif
+
 struct _LIBCXXABI_HIDDEN __cxa_exception {
 #if defined(__LP64__) || defined(_LIBCXXABI_ARM_EHABI)
     // This is a new field to support C++ 0x exception_ptr.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D53127.169648.patch
Type: text/x-patch
Size: 741 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20181015/48a08f8c/attachment.bin>


More information about the libcxx-commits mailing list