| Index: base/process_util_linux.cc
|
| diff --git a/base/process_util_linux.cc b/base/process_util_linux.cc
|
| index 2c2824fd77db68da521883918bc88b580e99caa2..898c1720696d3263aa0bd422bd536415df61e748 100644
|
| --- a/base/process_util_linux.cc
|
| +++ b/base/process_util_linux.cc
|
| @@ -745,10 +745,11 @@ void OnNoMemory() {
|
|
|
| } // namespace
|
|
|
| -#if !defined(OS_ANDROID) && !defined(USE_TCMALLOC) && \
|
| - !defined(ADDRESS_SANITIZER) && !defined(MEMORY_SANITIZER) && \
|
| +#if !defined(ADDRESS_SANITIZER) && !defined(MEMORY_SANITIZER) && \
|
| !defined(THREAD_SANITIZER)
|
|
|
| +#if defined(LIBC_GLIBC) && !defined(USE_TCMALLOC)
|
| +
|
| extern "C" {
|
| void* __libc_malloc(size_t size);
|
| void* __libc_realloc(void* ptr, size_t size);
|
| @@ -826,7 +827,14 @@ int posix_memalign(void** ptr, size_t alignment, size_t size) {
|
| }
|
|
|
| } // extern C
|
| -#endif // ANDROID, TCMALLOC, *_SANITIZER
|
| +
|
| +#else
|
| +
|
| +// TODO(mostynb@opera.com): dlsym dance
|
| +
|
| +#endif // LIBC_GLIBC && !USE_TCMALLOC
|
| +
|
| +#endif // !*_SANITIZER
|
|
|
| void EnableTerminationOnHeapCorruption() {
|
| // On Linux, there nothing to do AFAIK.
|
|
|