Index: build/sanitizers/sanitizer_options.cc |
diff --git a/build/sanitizers/sanitizer_options.cc b/build/sanitizers/sanitizer_options.cc |
index 33090fb94b792a69ac88d550ef396662ea898677..c0bb7f85fc33c30324e4daf22b6ac5a7d2ab0e07 100644 |
--- a/build/sanitizers/sanitizer_options.cc |
+++ b/build/sanitizers/sanitizer_options.cc |
@@ -36,8 +36,6 @@ void _sanitizer_options_link_helper() { } |
#if defined(ADDRESS_SANITIZER) |
// Default options for AddressSanitizer in various configurations: |
-// strict_memcmp=1 - disable the strict memcmp() checking |
-// (http://crbug.com/178677 and http://crbug.com/178404). |
// malloc_context_size=5 - limit the size of stack traces collected by ASan |
// for each malloc/free by 5 frames. These stack traces tend to accumulate |
// very fast in applications using JIT (v8 in Chrome's case), see |
@@ -74,21 +72,21 @@ void _sanitizer_options_link_helper() { } |
// tests on buildbots (which don't set GOOGLE_CHROME_BUILD) or non-official |
// Chromium builds. |
const char kAsanDefaultOptions[] = |
- "legacy_pthread_cond=1 malloc_context_size=5 strict_memcmp=0 " |
+ "legacy_pthread_cond=1 malloc_context_size=5 " |
"symbolize=false check_printf=1 use_sigaltstack=1 detect_leaks=0 " |
"strip_path_prefix=Release/../../ fast_unwind_on_fatal=1 " |
"detect_container_overflow=0 "; |
#else |
// Default AddressSanitizer options for buildbots and non-official builds. |
const char *kAsanDefaultOptions = |
- "strict_memcmp=0 symbolize=false check_printf=1 use_sigaltstack=1 " |
+ "symbolize=false check_printf=1 use_sigaltstack=1 " |
"detect_leaks=0 strip_path_prefix=Release/../../ fast_unwind_on_fatal=1 " |
"detect_stack_use_after_return=1 detect_container_overflow=0 "; |
#endif // GOOGLE_CHROME_BUILD |
#elif defined(OS_MACOSX) |
const char *kAsanDefaultOptions = |
- "strict_memcmp=0 replace_intrin=0 check_printf=1 use_sigaltstack=1 " |
+ "replace_intrin=0 check_printf=1 use_sigaltstack=1 " |
"strip_path_prefix=Release/../../ fast_unwind_on_fatal=1 " |
"detect_stack_use_after_return=1 detect_odr_violation=0 " |
"detect_container_overflow=0 "; |
@@ -112,6 +110,12 @@ SANITIZER_HOOK_ATTRIBUTE const char *__asan_default_options() { |
#endif |
return kAsanDefaultOptions; |
} |
+ |
+extern "C" char kASanDefaultSuppressions[]; |
+ |
+SANITIZER_HOOK_ATTRIBUTE const char *__asan_default_suppressions() { |
+ return kASanDefaultSuppressions; |
+} |
#endif // OS_LINUX || OS_MACOSX |
#endif // ADDRESS_SANITIZER |