diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2015-12-30 11:52:19 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2015-12-30 11:52:19 +0000 |
| commit | 5c909fa013fc285f010a95e8d387e0ef3412da9c (patch) | |
| tree | 1059d068ad281f4776ff44cd414574f99a460023 /lib/asan/tests/asan_asm_test.cc | |
| parent | f31bcc68c72371a2bf63aead9f3373a1ff2053b6 (diff) | |
| download | src-5c909fa013fc285f010a95e8d387e0ef3412da9c.tar.gz src-5c909fa013fc285f010a95e8d387e0ef3412da9c.zip | |
Vendor import of compiler-rt trunk r256633:vendor/compiler-rt/compiler-rt-trunk-r256633
Notes
Notes:
svn path=/vendor/compiler-rt/dist/; revision=292925
svn path=/vendor/compiler-rt/compiler-rt-trunk-r256633/; revision=292926; tag=vendor/compiler-rt/compiler-rt-trunk-r256633
Diffstat (limited to 'lib/asan/tests/asan_asm_test.cc')
| -rw-r--r-- | lib/asan/tests/asan_asm_test.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/asan/tests/asan_asm_test.cc b/lib/asan/tests/asan_asm_test.cc index 200de2c137a5..09af5c386079 100644 --- a/lib/asan/tests/asan_asm_test.cc +++ b/lib/asan/tests/asan_asm_test.cc @@ -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,8 @@ 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 { |