summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-10 17:21:04 +0000
committerglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-10 17:21:04 +0000
commitc63508c4119b6eff9177dd9a013ba421474d1ce8 (patch)
treed98ca0fc7768d0ca953145a81b6fb888bc318357 /base
parent3ce4302f6afc99ef489080bdda995b106ca45461 (diff)
downloadchromium_src-c63508c4119b6eff9177dd9a013ba421474d1ce8.zip
chromium_src-c63508c4119b6eff9177dd9a013ba421474d1ce8.tar.gz
chromium_src-c63508c4119b6eff9177dd9a013ba421474d1ce8.tar.bz2
Do not wrap memory allocation routines when building Chromium with compiler-based ThreadSanitizer.
Review URL: https://chromiumcodereview.appspot.com/10700127 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145897 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/process_util_linux.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/process_util_linux.cc b/base/process_util_linux.cc
index 124b8ec..34e7d7c 100644
--- a/base/process_util_linux.cc
+++ b/base/process_util_linux.cc
@@ -686,7 +686,7 @@ void OnNoMemory() {
extern "C" {
#if !defined(USE_TCMALLOC) && !defined(ADDRESS_SANITIZER) && \
- !defined(OS_ANDROID)
+ !defined(OS_ANDROID) && !defined(THREAD_SANITIZER)
extern "C" {
void* __libc_malloc(size_t size);