<div dir="ltr"><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Apr 27, 2015 at 4:49 PM, Evgeniy Stepanov <span dir="ltr"><<a href="mailto:eugeni.stepanov@gmail.com" target="_blank">eugeni.stepanov@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: eugenis<br>
Date: Mon Apr 27 18:49:39 2015<br>
New Revision: 235944<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=235944&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=235944&view=rev</a><br>
Log:<br>
[asan] Fix ASan build on Android/AArch64.<br>
<br>
The build for aarch64 is not enabled in cmake/config-ix.cmake yet.<br>
<br>
Modified:<br>
    compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt<br>
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h<br>
<br>
Modified: compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt?rev=235944&r1=235943&r2=235944&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt?rev=235944&r1=235943&r2=235944&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt (original)<br>
+++ compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt Mon Apr 27 18:49:39 2015<br>
@@ -119,7 +119,7 @@ append_have_file_definition(tirpc/rpc/xd<br>
 set(SANITIZER_CFLAGS ${SANITIZER_COMMON_CFLAGS})<br>
 append_no_rtti_flag(SANITIZER_CFLAGS)<br>
<br>
-append_list_if(SANITIZER_LIMIT_FRAME_SIZE -Wframe-larger-than=512<br>
+append_list_if(SANITIZER_LIMIT_FRAME_SIZE -Wframe-larger-than=570<br></blockquote><div><br></div><div>^^</div><div>Maybe, we can improve the problematic function?</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
                SANITIZER_CFLAGS)<br>
 append_list_if(COMPILER_RT_HAS_WGLOBAL_CONSTRUCTORS_FLAG -Wglobal-constructors<br>
                SANITIZER_CFLAGS)<br>
<br>
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h?rev=235944&r1=235943&r2=235944&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h?rev=235944&r1=235943&r2=235944&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h (original)<br>
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h Mon Apr 27 18:49:39 2015<br>
@@ -321,7 +321,7 @@ namespace __sanitizer {<br>
     long pw_change;<br>
     char *pw_class;<br>
 #endif<br>
-#if !SANITIZER_ANDROID<br>
+#if !(SANITIZER_ANDROID && (SANITIZER_WORDSIZE == 32))<br>
     char *pw_gecos;<br>
 #endif<br>
     char *pw_dir;<br>
@@ -383,7 +383,7 @@ namespace __sanitizer {<br>
   };<br>
 #endif<br>
<br>
-#if SANITIZER_ANDROID || SANITIZER_MAC || SANITIZER_FREEBSD<br>
+#if SANITIZER_MAC || SANITIZER_FREEBSD<br>
   struct __sanitizer_msghdr {<br>
     void *msg_name;<br>
     unsigned msg_namelen;<br>
@@ -520,6 +520,27 @@ namespace __sanitizer {<br>
 #endif<br>
<br>
   // Linux system headers define the 'sa_handler' and 'sa_sigaction' macros.<br>
+#if SANITIZER_ANDROID && (SANITIZER_WORDSIZE == 64)<br>
+  struct __sanitizer_sigaction {<br>
+    unsigned sa_flags;<br>
+    union {<br>
+      void (*sigaction)(int sig, void *siginfo, void *uctx);<br>
+      void (*handler)(int sig);<br>
+    };<br>
+    __sanitizer_sigset_t sa_mask;<br>
+    void (*sa_restorer)();<br>
+  };<br>
+#elif SANITIZER_ANDROID && (SANITIZER_WORDSIZE == 32)<br>
+  struct __sanitizer_sigaction {<br>
+    union {<br>
+      void (*sigaction)(int sig, void *siginfo, void *uctx);<br>
+      void (*handler)(int sig);<br>
+    };<br>
+    __sanitizer_sigset_t sa_mask;<br>
+    uptr sa_flags;<br>
+    void (*sa_restorer)();<br>
+  };<br>
+#else // !SANITIZER_ANDROID<br>
   struct __sanitizer_sigaction {<br>
 #if defined(__mips__) && !SANITIZER_FREEBSD<br>
     unsigned int sa_flags;<br>
@@ -544,6 +565,7 @@ namespace __sanitizer {<br>
     int sa_resv[1];<br>
 #endif<br>
   };<br>
+#endif // !SANITIZER_ANDROID<br>
<br>
 #if SANITIZER_FREEBSD<br>
   typedef __sanitizer_sigset_t __sanitizer_kernel_sigset_t;<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature"><div dir="ltr">Alexey Samsonov<br><a href="mailto:vonosmas@gmail.com" target="_blank">vonosmas@gmail.com</a></div></div>
</div></div>