[compiler-rt] r246866 - [asan] Disable asm instrumentation tests on android/x86.

[Evgeniy Stepanov via llvm-commits]

Author: eugenis
Date: Fri Sep  4 15:26:58 2015
New Revision: 246866

URL: http://llvm.org/viewvc/llvm-project?rev=246866&view=rev
Log:
[asan] Disable asm instrumentation tests on android/x86.

https://github.com/google/sanitizers/issues/353

Modified:
    compiler-rt/trunk/lib/asan/tests/asan_asm_test.cc

Modified: compiler-rt/trunk/lib/asan/tests/asan_asm_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/asan_asm_test.cc?rev=246866&r1=246865&r2=246866&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/tests/asan_asm_test.cc (original)
+++ compiler-rt/trunk/lib/asan/tests/asan_asm_test.cc Fri Sep  4 15:26:58 2015
@@ -14,7 +14,10 @@
 
 #if defined(__linux__)
 
-#if defined(__x86_64__) || (defined(__i386__) && defined(__SSE2__))
+// Assembly instrumentation is broken on x86 Android (x86 + PIC + shared runtime
+// library). See https://github.com/google/sanitizers/issues/353
+#if defined(__x86_64__) ||                                                     \
+    (defined(__i386__) && defined(__SSE2__) && !defined(__ANDROID__))
 
 #include <emmintrin.h>
 
@@ -70,7 +73,7 @@ DECLARE_ASM_REP_MOVS(U8, "movsq");
 
 #endif // defined(__x86_64__)
 
-#if defined(__i386__) && defined(__SSE2__)
+#if defined(__i386__) && defined(__SSE2__) && !defined(__ANDROID__)
 
 namespace {
 
@@ -108,7 +111,7 @@ template<> Type asm_read<Type>(Type *ptr
 
 #endif  // defined(__i386__) && defined(__SSE2__)
 
-#if defined(__x86_64__) || (defined(__i386__) && defined(__SSE2__))
+#if defined(__x86_64__) || (defined(__i386__) && defined(__SSE2__) && !defined(__ANDROID__))
 
 namespace {