summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2021-01-27 13:30:03 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2021-01-27 13:30:03 +0100
commit7520e38d187cba6685848e12b3203f805c8f31a3 (patch)
treefb069516be7b663283d76009ca7ce5daa4f27771 /recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
parentb6f9fee5a31f62e36562ffb4055a525a5920b1c0 (diff)
downloadmeta-qt5-7520e38d187cba6685848e12b3203f805c8f31a3.tar.gz
qtwebengine: refresh the patches
* update to match https://github.com/meta-qt5/qtwebengine/commits/b5.15-glibc 5.15-glibc.meta-qt5.9 https://github.com/meta-qt5/qtwebengine/commits/b5.15 5.15.meta-qt5.9 https://github.com/meta-qt5/qtwebengine-chromium/commits/83-based-glibc 83-based-glibc.meta-qt5.1 https://github.com/meta-qt5/qtwebengine-chromium/commits/83-based 83-based.meta-qt5.1 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch52
1 files changed, 52 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
new file mode 100644
index 00000000..ef45ed08
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
@@ -0,0 +1,52 @@
1From 73d501e0503fc5a9a2229933f976c713b6e7f28a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:09:06 -0700
4Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8 chromium/base/process/process_metrics_posix.cc | 4 ++--
9 chromium/base/trace_event/malloc_dump_provider.cc | 2 ++
10 2 files changed, 4 insertions(+), 2 deletions(-)
11
12diff --git a/chromium/base/process/process_metrics_posix.cc b/chromium/base/process/process_metrics_posix.cc
13index 044bd8d244f..cec43e1d59b 100644
14--- a/chromium/base/process/process_metrics_posix.cc
15+++ b/chromium/base/process/process_metrics_posix.cc
16@@ -110,14 +110,14 @@ size_t ProcessMetrics::GetMallocUsage() {
17 malloc_statistics_t stats = {0};
18 malloc_zone_statistics(nullptr, &stats);
19 return stats.size_in_use;
20-#elif defined(OS_LINUX) || defined(OS_ANDROID)
21+#elif defined(__GLIBC__) || defined(OS_ANDROID)
22 struct mallinfo minfo = mallinfo();
23 #if BUILDFLAG(USE_TCMALLOC)
24 return minfo.uordblks;
25 #else
26 return minfo.hblkhd + minfo.arena;
27 #endif
28-#elif defined(OS_FUCHSIA)
29+#else
30 // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
31 return 0;
32 #endif
33diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc
34index 1bf34c9d9ea..00e46d30b3a 100644
35--- a/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;
38 // the current process.
39 bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
40 ProcessMemoryDump* pmd) {
41+#if defined(__GLIBC__)
42 {
43 base::AutoLock auto_lock(emit_metrics_on_memory_dump_lock_);
44 if (!emit_metrics_on_memory_dump_)
45@@ -170,6 +171,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
46 MemoryAllocatorDump::kUnitsBytes,
47 resident_size - allocated_objects_size);
48 }
49+#endif // __GLIBC__
50 return true;
51 }
52