diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch index ee2cdf29..55bf4359 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 650ffdd77fb2d0ecce142617ec95eefb894e0ada Mon Sep 17 00:00:00 2001 | 1 | From 83839a5abef1ea5edf947ce7343a6b19c131f789 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 14:09:06 -0700 | 3 | Date: Fri, 7 Jul 2017 14:09:06 -0700 |
4 | Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux | 4 | Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux |
@@ -10,17 +10,17 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
10 | 2 files changed, 4 insertions(+), 2 deletions(-) | 10 | 2 files changed, 4 insertions(+), 2 deletions(-) |
11 | 11 | ||
12 | diff --git a/chromium/base/process/process_metrics_posix.cc b/chromium/base/process/process_metrics_posix.cc | 12 | diff --git a/chromium/base/process/process_metrics_posix.cc b/chromium/base/process/process_metrics_posix.cc |
13 | index 5763432aa4f..ff00b7307c0 100644 | 13 | index 044bd8d244f..cec43e1d59b 100644 |
14 | --- a/chromium/base/process/process_metrics_posix.cc | 14 | --- a/chromium/base/process/process_metrics_posix.cc |
15 | +++ b/chromium/base/process/process_metrics_posix.cc | 15 | +++ b/chromium/base/process/process_metrics_posix.cc |
16 | @@ -109,14 +109,14 @@ size_t ProcessMetrics::GetMallocUsage() { | 16 | @@ -110,14 +110,14 @@ size_t ProcessMetrics::GetMallocUsage() { |
17 | malloc_statistics_t stats = {0}; | 17 | malloc_statistics_t stats = {0}; |
18 | malloc_zone_statistics(nullptr, &stats); | 18 | malloc_zone_statistics(nullptr, &stats); |
19 | return stats.size_in_use; | 19 | return stats.size_in_use; |
20 | -#elif defined(OS_LINUX) || defined(OS_ANDROID) | 20 | -#elif defined(OS_LINUX) || defined(OS_ANDROID) |
21 | +#elif defined(__GLIBC__) || defined(OS_ANDROID) | 21 | +#elif defined(__GLIBC__) || defined(OS_ANDROID) |
22 | struct mallinfo minfo = mallinfo(); | 22 | struct mallinfo minfo = mallinfo(); |
23 | #if defined(USE_TCMALLOC) | 23 | #if BUILDFLAG(USE_TCMALLOC) |
24 | return minfo.uordblks; | 24 | return minfo.uordblks; |
25 | #else | 25 | #else |
26 | return minfo.hblkhd + minfo.arena; | 26 | return minfo.hblkhd + minfo.arena; |
@@ -31,7 +31,7 @@ index 5763432aa4f..ff00b7307c0 100644 | |||
31 | return 0; | 31 | return 0; |
32 | #endif | 32 | #endif |
33 | diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc | 33 | diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc |
34 | index 0077d8b0aec..c69f893f4e9 100644 | 34 | index 7e42cfc20bb..4e24fc711ad 100644 |
35 | --- a/chromium/base/trace_event/malloc_dump_provider.cc | 35 | --- a/chromium/base/trace_event/malloc_dump_provider.cc |
36 | +++ b/chromium/base/trace_event/malloc_dump_provider.cc | 36 | +++ b/chromium/base/trace_event/malloc_dump_provider.cc |
37 | @@ -77,6 +77,7 @@ MallocDumpProvider::~MallocDumpProvider() = default; | 37 | @@ -77,6 +77,7 @@ MallocDumpProvider::~MallocDumpProvider() = default; |
@@ -42,7 +42,7 @@ index 0077d8b0aec..c69f893f4e9 100644 | |||
42 | { | 42 | { |
43 | base::AutoLock auto_lock(emit_metrics_on_memory_dump_lock_); | 43 | base::AutoLock auto_lock(emit_metrics_on_memory_dump_lock_); |
44 | if (!emit_metrics_on_memory_dump_) | 44 | if (!emit_metrics_on_memory_dump_) |
45 | @@ -172,6 +173,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, | 45 | @@ -175,6 +176,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, |
46 | MemoryAllocatorDump::kUnitsBytes, | 46 | MemoryAllocatorDump::kUnitsBytes, |
47 | resident_size - allocated_objects_size); | 47 | resident_size - allocated_objects_size); |
48 | } | 48 | } |