diff options
Diffstat (limited to 'community/qt5-qtwebengine/qt-musl-mallinfo.patch')
| -rw-r--r-- | community/qt5-qtwebengine/qt-musl-mallinfo.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/community/qt5-qtwebengine/qt-musl-mallinfo.patch b/community/qt5-qtwebengine/qt-musl-mallinfo.patch index 15183707bff..c7b7f27f2b7 100644 --- a/community/qt5-qtwebengine/qt-musl-mallinfo.patch +++ b/community/qt5-qtwebengine/qt-musl-mallinfo.patch @@ -1,13 +1,13 @@ diff --git a/src/3rdparty/chromium/base/process/process_metrics_posix.cc b/src/3rdparty/chromium/base/process/process_metrics_posix.cc -index 044bd8d24..0f2526a3d 100644 +index 9d12c427b..9030de9f6 100644 --- a/src/3rdparty/chromium/base/process/process_metrics_posix.cc +++ b/src/3rdparty/chromium/base/process/process_metrics_posix.cc -@@ -110,14 +110,14 @@ size_t ProcessMetrics::GetMallocUsage() { +@@ -119,14 +119,14 @@ size_t ProcessMetrics::GetMallocUsage() { malloc_statistics_t stats = {0}; malloc_zone_statistics(nullptr, &stats); return stats.size_in_use; --#elif defined(OS_LINUX) || defined(OS_ANDROID) -+#elif (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_ANDROID) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#elif (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID) struct mallinfo minfo = mallinfo(); #if BUILDFLAG(USE_TCMALLOC) return minfo.uordblks; @@ -20,7 +20,7 @@ index 044bd8d24..0f2526a3d 100644 return 0; #endif diff --git a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc -index 7e42cfc20..5086b5c8a 100644 +index c327f4865..2717eca5a 100644 --- a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc +++ b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc @@ -132,7 +132,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, @@ -30,9 +30,9 @@ index 7e42cfc20..5086b5c8a 100644 -#else +#elif defined(__GLIBC__) struct mallinfo info = mallinfo(); - #if !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER) - // Sanitizers override mallinfo. -@@ -147,6 +147,8 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, + // In case of Android's jemalloc |arena| is 0 and the outer pages size is + // reported by |hblkhd|. In case of dlmalloc the total is given by +@@ -142,6 +142,8 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, // Total allocated space is given by |uordblks|. allocated_objects_size = info.uordblks; |