diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2018-07-04 10:20:19 +0300 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-23 19:40:34 +0000 |
| commit | d45b966b4612fe59ac3c53e0f7a3c480d29b2fbe (patch) | |
| tree | e12362298f3ce80a2f24b9200d2ec9342d4c7f22 /recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch | |
| parent | 8c7797ba5a2c2ba39a4389954b2ca72efc37e036 (diff) | |
| download | meta-qt5-d45b966b4612fe59ac3c53e0f7a3c480d29b2fbe.tar.gz | |
qtwebengine: update chromium musl patchset
Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch deleted file mode 100644 index d75e50eb..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | From 50da3cf54f9056fc1179f8a5d796d84ec7661f40 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 e919f094c37..414a21d32ad 100644 | ||
| 14 | --- a/chromium/base/allocator/allocator_shim.cc | ||
| 15 | +++ b/chromium/base/allocator/allocator_shim.cc | ||
| 16 | @@ -302,7 +302,7 @@ ALWAYS_INLINE void ShimFreeDefiniteSize(void* ptr, size_t size, 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 | |||
