diff options
| author | Kostya Serebryany <kcc@google.com> | 2016-07-15 23:13:03 +0000 |
|---|---|---|
| committer | Kostya Serebryany <kcc@google.com> | 2016-07-15 23:13:03 +0000 |
| commit | 4953a01461a2363ee94165fde470c929539e9376 (patch) | |
| tree | 3b1da8931bf9b941c3ae1780b687f19f96bd6b71 | |
| parent | 670900bb9e9bc798aad9da4150c64841cc59834e (diff) | |
| download | bcm5719-llvm-4953a01461a2363ee94165fde470c929539e9376.tar.gz bcm5719-llvm-4953a01461a2363ee94165fde470c929539e9376.zip | |
[asan] trying to fix the windows build
llvm-svn: 275644
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h | 3 | ||||
| -rw-r--r-- | compiler-rt/test/asan/TestCases/Linux/memmem_test.cc (renamed from compiler-rt/test/asan/TestCases/memmem_test.cc) | 0 |
2 files changed, 2 insertions, 1 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h index 1c7e46e1d85..a4afc0f12bd 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h @@ -83,7 +83,8 @@ #define SANITIZER_INTERCEPT_MEMMOVE 1 #define SANITIZER_INTERCEPT_MEMCPY 1 #define SANITIZER_INTERCEPT_MEMCMP 1 -#define SANITIZER_INTERCEPT_MEMMEM 1 +// FIXME: enable memmem on Windows. +#define SANITIZER_INTERCEPT_MEMMEM SI_NOT_WINDOWS // The function memchr() contains a jump in the first 6 bytes // that is problematic to intercept correctly on Win64. // Disable memchr() interception for Win64. diff --git a/compiler-rt/test/asan/TestCases/memmem_test.cc b/compiler-rt/test/asan/TestCases/Linux/memmem_test.cc index 54883004e0a..54883004e0a 100644 --- a/compiler-rt/test/asan/TestCases/memmem_test.cc +++ b/compiler-rt/test/asan/TestCases/Linux/memmem_test.cc |
