[PATCH] Fix StopTheWorld includes on Android.

Alexey Samsonov samsonov at google.com
Wed Apr 3 00:09:58 PDT 2013


  Commited as r178625 with mentioned fixes.


================
Comment at: lib/sanitizer_common/sanitizer_stoptheworld_linux.cc:371
@@ -360,1 +370,3 @@
+    *sp = regs.ARM_sp;
+#elif __WORDSIZE == 32
     *sp = regs.esp;
----------------
SANITIZER_WORDSIZE

================
Comment at: lib/sanitizer_common/sanitizer_stoptheworld_linux.cc:374
@@ -361,3 +373,3 @@
 #else
     *sp = regs.rsp;
 #endif
----------------
no identation is needed here

================
Comment at: lib/sanitizer_common/sanitizer_stoptheworld_linux.cc:369
@@ -358,2 +368,3 @@
   }
-#if __WORDSIZE == 32
+#if defined __arm__
+    *sp = regs.ARM_sp;
----------------
we usually use "#if defined(xxx)" style

================
Comment at: lib/sanitizer_common/sanitizer_stoptheworld_linux.cc:28
@@ +27,3 @@
+#if defined SANITIZER_ANDROID && defined __arm__
+#include <linux/user.h>
+#else
----------------
s/#include/# include
Added comments back


http://llvm-reviews.chandlerc.com/D612

BRANCH
  stw-regs-android-fix

ARCANIST PROJECT
  compiler-rt



More information about the llvm-commits mailing list