summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2020-02-29 21:52:28 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2020-03-06 09:15:45 +0200
commitc29bdf41c4494e278a17a233048205bf212e040f (patch)
tree964f9c8278d02ce49cbd6cff4a47189f4eba47fb /recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
parent2380ffc4b549bf233927df66f9d981f4c417628c (diff)
downloadmeta-qt5-c29bdf41c4494e278a17a233048205bf212e040f.tar.gz
qt5: update submodules
Update to latest content in Qt 5.15 branch. Task-number: QTBUG-80823 Change-Id: I5230d9fea7ee8d0cb3227e77d62c93ae0cd921b3 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
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.patch12
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 2fdb0d82..bd16cee2 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 @@
1From 4b16ad982ff10945a37a7dd90735a5a1be3d6a8b Mon Sep 17 00:00:00 2001 1From 37648db3a564bc4bdcecfc2a38bc21d45875088e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:09:06 -0700 3Date: Fri, 7 Jul 2017 14:09:06 -0700
4Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux 4Subject: [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
12diff --git a/chromium/base/process/process_metrics_posix.cc b/chromium/base/process/process_metrics_posix.cc 12diff --git a/chromium/base/process/process_metrics_posix.cc b/chromium/base/process/process_metrics_posix.cc
13index 5763432aa4f..ff00b7307c0 100644 13index 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
33diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc 33diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc
34index 0077d8b0aec..c69f893f4e9 100644 34index 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 }