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

[Vlad Vereschaka via Phabricator via libcxx-commits]

vvereschaka updated this revision to Diff 323065.
vvereschaka added a comment.

Updated `main()` -> `main(int, char**)` for the tests.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D96378/new/

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,12 @@
 #include <string.h>
 #include <unwind.h>
 #include <tuple>
+#include <__cxxabi_config.h>
 
 #if defined(_LIBCXXABI_ARM_EHABI)
-int main() {}
+int main(int, char**) {
+  return 0;
+}
 #else
 template <typename T>
 struct Stop;
@@ -50,7 +53,7 @@
 
 static void terminate() { exit(0); }
 
-int main() {
+int main(int, char**) {
   std::set_terminate(terminate);
   try {
     test();
Index: libcxxabi/test/forced_unwind1.pass.cpp
===================================================================
--- libcxxabi/test/forced_unwind1.pass.cpp
+++ libcxxabi/test/forced_unwind1.pass.cpp
@@ -15,9 +15,12 @@
 #include <string.h>
 #include <unwind.h>
 #include <tuple>
+#include <__cxxabi_config.h>
 
 #if defined(_LIBCXXABI_ARM_EHABI)
-int main() {}
+int main(int, char**) {
+  return 0;
+}
 #else
 static int bits = 0;
 
@@ -74,7 +77,7 @@
   }
 }
 
-int main() {
+int main(int, char**) {
   test();
   return bits != 15;
 }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D96378.323065.patch
Type: text/x-patch
Size: 1137 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20210211/9b235d02/attachment-0001.bin>