diff options
Diffstat (limited to 'community/chromium/no-mallinfo.patch')
| -rw-r--r-- | community/chromium/no-mallinfo.patch | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/community/chromium/no-mallinfo.patch b/community/chromium/no-mallinfo.patch index 0045bd4bd0..9f859b8808 100644 --- a/community/chromium/no-mallinfo.patch +++ b/community/chromium/no-mallinfo.patch @@ -1,16 +1,14 @@ ---- base/trace_event/malloc_dump_provider.cc.orig +--- base/trace_event/malloc_dump_provider.cc +++ base/trace_event/malloc_dump_provider.cc -@@ -243,7 +243,7 @@ - allocated_objects_count = main_heap_info.block_count; +@@ -132,7 +132,7 @@ + } #elif defined(OS_FUCHSIA) // TODO(fuchsia): Port, see https://crbug.com/706592. -#else +#elif defined(__GLIBC__) struct mallinfo info = mallinfo(); - DCHECK_GE(info.arena + info.hblkhd, info.uordblks); - -diff --git a/base/process/process_metrics_posix.cc b/base/process/process_metrics_posix.cc -index 0eb5c1f..8af7799 100644 + #if !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER) + // Sanitizers override mallinfo. --- base/process/process_metrics_posix.cc +++ base/process/process_metrics_posix.cc @@ -110,17 +110,16 @@ |