Index: compiler-rt/trunk/lib/asan/asan_win_dll_thunk.cc
===================================================================
--- compiler-rt/trunk/lib/asan/asan_win_dll_thunk.cc
+++ compiler-rt/trunk/lib/asan/asan_win_dll_thunk.cc
@@ -21,6 +21,7 @@
 #ifdef ASAN_DLL_THUNK
 #include "asan_init_version.h"
 #include "interception/interception.h"
+#include "sanitizer_common/sanitizer_platform_interceptors.h"
 
 // ---------- Function interception helper functions and macros ----------- {{{1
 extern "C" {
@@ -390,7 +391,9 @@
 
 INTERCEPT_LIBRARY_FUNCTION(frexp);
 INTERCEPT_LIBRARY_FUNCTION(longjmp);
+#if SANITIZER_INTERCEPT_MEMCHR
 INTERCEPT_LIBRARY_FUNCTION(memchr);
+#endif
 INTERCEPT_LIBRARY_FUNCTION(memcmp);
 INTERCEPT_LIBRARY_FUNCTION(memcpy);
 INTERCEPT_LIBRARY_FUNCTION(memmove);
Index: compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_interceptors.h
===================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_interceptors.h
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_interceptors.h
@@ -83,10 +83,9 @@
 #define SANITIZER_INTERCEPT_MEMMOVE 1
 #define SANITIZER_INTERCEPT_MEMCPY 1
 #define SANITIZER_INTERCEPT_MEMCMP 1
-// TODO(wwchrome): Re-enable intercepting memchr() when ready.
 // The function memchr() contains a jump in the first 6 bytes
 // that is problematic to intercept correctly on Win64.
-// Disable memchr() interception for Win64 temporarily.
+// Disable memchr() interception for Win64.
 #if SANITIZER_WINDOWS64
 #define SANITIZER_INTERCEPT_MEMCHR 0
 #else