From c29bdf41c4494e278a17a233048205bf212e040f Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Sat, 29 Feb 2020 21:52:28 +0200 Subject: qt5: update submodules Update to latest content in Qt 5.15 branch. Task-number: QTBUG-80823 Change-Id: I5230d9fea7ee8d0cb3227e77d62c93ae0cd921b3 Reviewed-by: Samuli Piippo --- ...-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch') diff --git a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch index 81d555f9..facc53d9 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch @@ -1,4 +1,4 @@ -From 59ab7f11b90bd2114ff8cc16d6502e0ad6bb6538 Mon Sep 17 00:00:00 2001 +From 2502151f355d0cc9d1c3681958df73c35010c145 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 15:09:02 -0700 Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols @@ -10,15 +10,15 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc -index e6838ebda84..7296cc9ed81 100644 +index ef42d5ad67f..626e4c996a5 100644 --- a/chromium/base/allocator/allocator_shim.cc +++ b/chromium/base/allocator/allocator_shim.cc -@@ -351,7 +351,7 @@ ALWAYS_INLINE void ShimAlignedFree(void* address, void* context) { +@@ -352,7 +352,7 @@ ALWAYS_INLINE void ShimAlignedFree(void* address, void* context) { // In the case of tcmalloc we also want to plumb into the glibc hooks // to avoid that allocations made in glibc itself (e.g., strdup()) get // accidentally performed on the glibc heap instead of the tcmalloc one. --#if defined(USE_TCMALLOC) -+#if defined(USE_TCMALLOC) && defined(__GLIBC__) +-#if BUILDFLAG(USE_TCMALLOC) ++#if BUILDFLAG(USE_TCMALLOC) && defined(__GLIBC__) #include "base/allocator/allocator_shim_override_glibc_weak_symbols.h" #endif -- cgit v1.2.3-54-g00ecf