diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2020-03-13 12:12:45 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-03-18 18:03:49 +0100 |
commit | 9a645b029a7752a83af78c8b69c4c472a3a40a12 (patch) | |
tree | f0dd11ad9e0482b180994010311edcbaf66f3f1b /recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch | |
parent | 6cce9817bdead734ccd76148bcec06f5db2e87cf (diff) | |
download | meta-qt5-9a645b029a7752a83af78c8b69c4c472a3a40a12.tar.gz |
qtwebengine: update patches for latest 5.15 revision
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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 b55396d4..9fc0b9fa 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 03e4bb54c5f92d94d6e13b2d09a46890b8373673 Mon Sep 17 00:00:00 2001 | 1 | From 74f7bd4fec4df85e52dea61e13ca931303fc402d 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 | ||