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/0015-chromium-musl-linux-glibc-make-the-distinction.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/0015-chromium-musl-linux-glibc-make-the-distinction.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch index 2fdc4944..c5667e9d 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 04a11fa6f38987091b6b65244950d3d83579c9a8 Mon Sep 17 00:00:00 2001 | 1 | From b6ef8cafefad7082fd681ff8386835d7bebdb38c 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 14:54:38 -0700 | 3 | Date: Fri, 7 Jul 2017 14:54:38 -0700 |
4 | Subject: [PATCH] chromium: musl: linux != glibc, make the distinction | 4 | Subject: [PATCH] chromium: musl: linux != glibc, make the distinction |
@@ -9,15 +9,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | 9 | 1 file changed, 1 insertion(+), 1 deletion(-) |
10 | 10 | ||
11 | diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc | 11 | diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc |
12 | index 5fb86467dde..9864858eb67 100644 | 12 | index 5ea77ef2d27..85343a13905 100644 |
13 | --- a/chromium/base/allocator/allocator_check.cc | 13 | --- a/chromium/base/allocator/allocator_check.cc |
14 | +++ b/chromium/base/allocator/allocator_check.cc | 14 | +++ b/chromium/base/allocator/allocator_check.cc |
15 | @@ -27,7 +27,7 @@ bool IsAllocatorInitialized() { | 15 | @@ -27,7 +27,7 @@ bool IsAllocatorInitialized() { |
16 | // Set by allocator_shim_override_ucrt_symbols_win.h when the | 16 | // Set by allocator_shim_override_ucrt_symbols_win.h when the |
17 | // shimmed _set_new_mode() is called. | 17 | // shimmed _set_new_mode() is called. |
18 | return g_is_win_shim_layer_initialized; | 18 | return g_is_win_shim_layer_initialized; |
19 | -#elif defined(OS_LINUX) && defined(USE_TCMALLOC) && \ | 19 | -#elif defined(OS_LINUX) && BUILDFLAG(USE_TCMALLOC) && \ |
20 | +#elif defined(__GLIBC__) && defined(USE_TCMALLOC) && \ | 20 | +#elif defined(__GLIBC__) && BUILDFLAG(USE_TCMALLOC) && \ |
21 | !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) | 21 | !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) |
22 | // From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h. | 22 | // From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h. |
23 | // TODO(primiano): replace with an include once base can depend on allocator. | 23 | // TODO(primiano): replace with an include once base can depend on allocator. |