diff options
| author | Kostya Serebryany <kcc@google.com> | 2013-12-05 07:36:09 +0000 |
|---|---|---|
| committer | Kostya Serebryany <kcc@google.com> | 2013-12-05 07:36:09 +0000 |
| commit | b37127085cbcc79f5f859bfab8e7204201c18287 (patch) | |
| tree | b39561e0601daaf05c6eafcbba9e78f8700ba8a0 | |
| parent | 8950403ed5c8f26d2604d2494f074c13c4263429 (diff) | |
| download | compiler-rt-b37127085cbcc79f5f859bfab8e7204201c18287.tar.gz | |
[asan] port r196375 to 3.4
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/branches/release_34@196478 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/asan/tests/asan_test.cc | 3 | ||||
| -rw-r--r-- | lib/asan/tests/asan_test_utils.h | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/lib/asan/tests/asan_test.cc b/lib/asan/tests/asan_test.cc index 38a550294..6539ae8af 100644 --- a/lib/asan/tests/asan_test.cc +++ b/lib/asan/tests/asan_test.cc @@ -669,7 +669,8 @@ TEST(AddressSanitizer, ThreadStackReuseTest) { PTHREAD_JOIN(t, 0); } -#if defined(__i386__) || defined(__x86_64__) +#if defined(__i686__) || defined(__x86_64__) +#include <emmintrin.h> TEST(AddressSanitizer, Store128Test) { char *a = Ident((char*)malloc(Ident(12))); char *p = a; diff --git a/lib/asan/tests/asan_test_utils.h b/lib/asan/tests/asan_test_utils.h index 403773180..b6bf6b820 100644 --- a/lib/asan/tests/asan_test_utils.h +++ b/lib/asan/tests/asan_test_utils.h @@ -41,10 +41,6 @@ #include <unistd.h> #endif -#if defined(__i386__) || defined(__x86_64__) -#include <emmintrin.h> -#endif - #ifndef __APPLE__ #include <malloc.h> #endif |