diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-02-29 21:52:28 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-06 09:15:45 +0200 |
commit | c29bdf41c4494e278a17a233048205bf212e040f (patch) | |
tree | 964f9c8278d02ce49cbd6cff4a47189f4eba47fb /recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch | |
parent | 2380ffc4b549bf233927df66f9d981f4c417628c (diff) | |
download | meta-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/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch | 10 |
1 files changed, 5 insertions, 5 deletions
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 @@ | |||
1 | From 59ab7f11b90bd2114ff8cc16d6502e0ad6bb6538 Mon Sep 17 00:00:00 2001 | 1 | From 2502151f355d0cc9d1c3681958df73c35010c145 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 15:09:02 -0700 | 3 | Date: Fri, 7 Jul 2017 15:09:02 -0700 |
4 | Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols | 4 | Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols |
@@ -10,15 +10,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
11 | 11 | ||
12 | diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc | 12 | diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc |
13 | index e6838ebda84..7296cc9ed81 100644 | 13 | index ef42d5ad67f..626e4c996a5 100644 |
14 | --- a/chromium/base/allocator/allocator_shim.cc | 14 | --- a/chromium/base/allocator/allocator_shim.cc |
15 | +++ b/chromium/base/allocator/allocator_shim.cc | 15 | +++ b/chromium/base/allocator/allocator_shim.cc |
16 | @@ -351,7 +351,7 @@ ALWAYS_INLINE void ShimAlignedFree(void* address, void* context) { | 16 | @@ -352,7 +352,7 @@ ALWAYS_INLINE void ShimAlignedFree(void* address, void* context) { |
17 | // In the case of tcmalloc we also want to plumb into the glibc hooks | 17 | // In the case of tcmalloc we also want to plumb into the glibc hooks |
18 | // to avoid that allocations made in glibc itself (e.g., strdup()) get | 18 | // to avoid that allocations made in glibc itself (e.g., strdup()) get |
19 | // accidentally performed on the glibc heap instead of the tcmalloc one. | 19 | // accidentally performed on the glibc heap instead of the tcmalloc one. |
20 | -#if defined(USE_TCMALLOC) | 20 | -#if BUILDFLAG(USE_TCMALLOC) |
21 | +#if defined(USE_TCMALLOC) && defined(__GLIBC__) | 21 | +#if BUILDFLAG(USE_TCMALLOC) && defined(__GLIBC__) |
22 | #include "base/allocator/allocator_shim_override_glibc_weak_symbols.h" | 22 | #include "base/allocator/allocator_shim_override_glibc_weak_symbols.h" |
23 | #endif | 23 | #endif |
24 | 24 | ||