diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2019-10-31 11:40:30 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-10-31 15:26:55 +0000 |
| commit | 81156172a83da2210e9af290f95f45fd194c84a2 (patch) | |
| tree | 1026e1a48d6ac51358cec65c1a8552eb1d5c77a7 /recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch | |
| parent | 267e64612558cd562a63925e07e3e87e976a8a44 (diff) | |
| download | meta-qt5-81156172a83da2210e9af290f95f45fd194c84a2.tar.gz | |
qt5: Upgrade to Qt 5.13.2
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch new file mode 100644 index 00000000..ec54908b --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch | |||
| @@ -0,0 +1,24 @@ | |||
| 1 | From 02c6554c372709fd8573d66e4f128ffe0d74f237 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Fri, 7 Jul 2017 15:09:02 -0700 | ||
| 4 | Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols | ||
| 5 | for musl | ||
| 6 | |||
| 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 8 | --- | ||
| 9 | chromium/base/allocator/allocator_shim.cc | 2 +- | ||
| 10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 11 | |||
| 12 | diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc | ||
| 13 | index 1233ae2a8aa..6f1b3e87224 100644 | ||
| 14 | --- a/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) { | ||
| 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 | ||
| 19 | // accidentally performed on the glibc heap instead of the tcmalloc one. | ||
| 20 | -#if defined(USE_TCMALLOC) | ||
| 21 | +#if defined(USE_TCMALLOC) && defined(__GLIBC__) | ||
| 22 | #include "base/allocator/allocator_shim_override_glibc_weak_symbols.h" | ||
| 23 | #endif | ||
| 24 | |||
