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 | 6b635bc08dd7c8313dba85f6d1877cbceef38f76 (patch) | |
| tree | be55fb353a3ea40e1bf1307f81b180719848cbe1 | |
| parent | 906ef8aa9f71080af17a3bc51385acae5f56275e (diff) | |
| download | compiler-rt-6b635bc08dd7c8313dba85f6d1877cbceef38f76.tar.gz | |
[asan] trying to fix the windows build
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@275644 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/sanitizer_common/sanitizer_platform_interceptors.h | 3 | ||||
| -rw-r--r-- | test/asan/TestCases/Linux/memmem_test.cc (renamed from test/asan/TestCases/memmem_test.cc) | 0 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h index 1c7e46e1d..a4afc0f12 100644 --- a/lib/sanitizer_common/sanitizer_platform_interceptors.h +++ b/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/test/asan/TestCases/memmem_test.cc b/test/asan/TestCases/Linux/memmem_test.cc index 54883004e..54883004e 100644 --- a/test/asan/TestCases/memmem_test.cc +++ b/test/asan/TestCases/Linux/memmem_test.cc |