commit 19584059da9cef30ea5b7bdd5915ba5b45d58878
author Ryan Prichard <rprichard@google.com> Mon Jan 06 15:16:12 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 06 15:16:12 2025 -0800
tree 6dcfbde155bc3ccbfcfc1b585926c9ef0c34fe0b
parent 0809f01913a44d8507be8cc926850ea7ae470c6f
parent a968b612d5a5907d6f18b6741cd368025a75e66d

Merge "testbinary_is_stack_mte: declare main without extern "C"" into main

tests/libs/testbinary_is_stack_mte.cpp

diff --git a/tests/libs/testbinary_is_stack_mte.cpp b/tests/libs/testbinary_is_stack_mte.cpp
index 0cdc466..3b6c79c 100644
--- a/tests/libs/testbinary_is_stack_mte.cpp
+++ b/tests/libs/testbinary_is_stack_mte.cpp
@@ -35,7 +35,7 @@
 
 #if defined(__BIONIC__) && defined(__aarch64__)
 
-extern "C" int main(int, char**) {
+int main(int, char**) {
   void* mte_tls_ptr = mte_tls();
   *reinterpret_cast<uintptr_t*>(mte_tls_ptr) = 1;
   int ret = is_stack_mte_on() && mte_tls_ptr != nullptr ? 0 : 1;
@@ -45,7 +45,7 @@
 
 #else
 
-extern "C" int main(int, char**) {
+int main(int, char**) {
   printf("RAN\n");
   return 1;
 }

tests/libs/testbinary_is_stack_mte_after_dlopen.cpp

diff --git a/tests/libs/testbinary_is_stack_mte_after_dlopen.cpp b/tests/libs/testbinary_is_stack_mte_after_dlopen.cpp
index 35af8f4..93b6670 100644
--- a/tests/libs/testbinary_is_stack_mte_after_dlopen.cpp
+++ b/tests/libs/testbinary_is_stack_mte_after_dlopen.cpp
@@ -84,7 +84,7 @@
   // Useless, but should defeat TCO.
   return new_low + fault_new_stack_page(low, f);
 }
-extern "C" int main(int argc, char** argv) {
+int main(int argc, char** argv) {
   if (argc < 2) {
     return 1;
   }
@@ -150,7 +150,7 @@
 }
 
 #else
-extern "C" int main(int, char**) {
+int main(int, char**) {
   return 1;
 }
 #endif