[llvm-branch-commits] [compiler-rt-branch] r196478 - [asan] port r196375 to 3.4

[Kostya Serebryany]

Author: kcc
Date: Thu Dec  5 01:36:09 2013
New Revision: 196478

URL: http://llvm.org/viewvc/llvm-project?rev=196478&view=rev
Log:
[asan] port r196375 to 3.4

Modified:
    compiler-rt/branches/release_34/lib/asan/tests/asan_test.cc
    compiler-rt/branches/release_34/lib/asan/tests/asan_test_utils.h

Modified: compiler-rt/branches/release_34/lib/asan/tests/asan_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_34/lib/asan/tests/asan_test.cc?rev=196478&r1=196477&r2=196478&view=diff
==============================================================================
--- compiler-rt/branches/release_34/lib/asan/tests/asan_test.cc (original)
+++ compiler-rt/branches/release_34/lib/asan/tests/asan_test.cc Thu Dec  5 01:36:09 2013
@@ -669,7 +669,8 @@ TEST(AddressSanitizer, ThreadStackReuseT
   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;

Modified: compiler-rt/branches/release_34/lib/asan/tests/asan_test_utils.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_34/lib/asan/tests/asan_test_utils.h?rev=196478&r1=196477&r2=196478&view=diff
==============================================================================
--- compiler-rt/branches/release_34/lib/asan/tests/asan_test_utils.h (original)
+++ compiler-rt/branches/release_34/lib/asan/tests/asan_test_utils.h Thu Dec  5 01:36:09 2013
@@ -41,10 +41,6 @@
 #include <unistd.h>
 #endif
 
-#if defined(__i386__) || defined(__x86_64__)
-#include <emmintrin.h>
-#endif
-
 #ifndef __APPLE__
 #include <malloc.h>
 #endif