[libcxx-commits] [PATCH] D96378: [libc++abi] Fix forced_unwind tests failures on ARM/EHABI targets.

Vlad Vereschaka via Phabricator via libcxx-commits libcxx-commits at lists.llvm.org
Tue Feb 9 15:25:44 PST 2021


vvereschaka created this revision.
vvereschaka added a reviewer: MaskRay.
vvereschaka added a project: libc++abi.
Herald added a subscriber: kristof.beyls.
vvereschaka requested review of this revision.
Herald added a subscriber: libcxx-commits.
Herald added a reviewer: libc++abi.

Added `__cxxabi_config.h`/`cxxabi.h` includes to resolve _LIBCXXABI_ARM_EHABI and proper building the forces_unwindX.cpp tests for the ARM/EHABI targets.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D96378

Files:
  libcxxabi/test/forced_unwind1.pass.cpp
  libcxxabi/test/forced_unwind2.pass.cpp


Index: libcxxabi/test/forced_unwind2.pass.cpp
===================================================================
--- libcxxabi/test/forced_unwind2.pass.cpp
+++ libcxxabi/test/forced_unwind2.pass.cpp
@@ -16,9 +16,13 @@
 #include <string.h>
 #include <unwind.h>
 #include <tuple>
+#include <cxxabi.h>
+#include <__cxxabi_config.h>
 
 #if defined(_LIBCXXABI_ARM_EHABI)
-int main() {}
+int main() {
+  return 0;
+}
 #else
 template <typename T>
 struct Stop;
Index: libcxxabi/test/forced_unwind1.pass.cpp
===================================================================
--- libcxxabi/test/forced_unwind1.pass.cpp
+++ libcxxabi/test/forced_unwind1.pass.cpp
@@ -15,9 +15,13 @@
 #include <string.h>
 #include <unwind.h>
 #include <tuple>
+#include <cxxabi.h>
+#include <__cxxabi_config.h>
 
 #if defined(_LIBCXXABI_ARM_EHABI)
-int main() {}
+int main() {
+  return 0;
+}
 #else
 static int bits = 0;
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D96378.322522.patch
Type: text/x-patch
Size: 899 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20210209/741d430d/attachment.bin>


More information about the libcxx-commits mailing list