summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Adjust-default-pthread-stack-size.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2020-01-15 10:19:24 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2020-01-15 10:20:17 +0200
commitf29e5bf1d15372a21e3e79a23afbc2be9fbaa004 (patch)
treeb2256fc1ebc713c8d51897eb46116b35d28551e9 /recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Adjust-default-pthread-stack-size.patch
parent07393133a7c0c27c71a24da5ec09834281fd0f13 (diff)
parentf6ebff397a53e9c2a23f67d1fc74b5fed11df4f9 (diff)
downloadmeta-qt5-f29e5bf1d15372a21e3e79a23afbc2be9fbaa004.tar.gz
Merge remote-tracking branch 'qt/5.14' into 5.15
* qt/5.14: f6ebff39 Merge remote-tracking branch 'qt/upstream/master' into 5.14 1b8e5570 qtbase: Use pcre packages by default fd7ac089 qt5: use PACKAGECONFIG to disable tests and examples 1a7c8fa4 qtlocation: use geoclue 2 ddbf8dd0 qtbase: use offscreen platform plugin for tools 4f701ea1 qtbase: add openssl PACKAGECONFIG for native nativesdk 56b2c13d qtbase-native: disable vulkan support 6b34fd17 maliit-framework-qt5: fix test installations aa50163c qtenginio: remove obsolete module 32edd746 ogl-runtime: update to v2.5.0 release f7dcc706 qtquick3d: add recipe b814111e qtwebengine: refresh the patches and upload them to meta-qt5 forks on github for maintenance 1fde17e1 qtbase: refresh the patches and upload them to meta-qt5 forks on github for maintenance ca649e3f qt5: Update to Qt 5.14.0 ede15adc qtbase: Fix patch fuzz detected with devtool e8221c2c qtbase: Backport the patch from upstream gerrit ca2f53f9 qt5-creator: Update musl patch to link qmldesigner with -lexecinfo 6e7cc682 qtwebengine: Move CharAllocator definition to header 33a86256 qt5-creator: Add missing dep on libz.so 3d47a569 qt5-creator: Make clang-format patch work with multiple clang versions d8f0db7f qtwebengine: Include cstddef for size_t definition b6bd407e qmllive: Fix build with multilib settings 69e1fd33 quazip: Fix multilib builds a4db065b qtwebkit: Fix linking errors on clang/mips/ppc f756a065 ogl-runtime: Only compile for supported architectures 710d995b qttools: Add option to disable qdoc a02e01ca qttools: Use CONFIG+=disable_external_rpath 0d88f448 packagegroup-qt5-toolchain-target: Make machine specific 2a2055fa recipes: Disable clang dependent recipes for riscv64/32 Conflicts: recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch Change-Id: Ie1c25965f512eccade0a7518b3a2d23c6dc6b3c1
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Adjust-default-pthread-stack-size.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Adjust-default-pthread-stack-size.patch47
1 files changed, 47 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Adjust-default-pthread-stack-size.patch
new file mode 100644
index 00000000..62b9531b
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Adjust-default-pthread-stack-size.patch
@@ -0,0 +1,47 @@
1From 50d5b6fa29696c873830af7632b51cb4836c2210 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 16:41:23 -0700
4Subject: [PATCH] chromium: musl: Adjust default pthread stack size
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8 chromium/base/threading/platform_thread_linux.cc | 3 ++-
9 .../third_party/blink/renderer/platform/wtf/stack_util.cc | 4 ++--
10 2 files changed, 4 insertions(+), 3 deletions(-)
11
12diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc
13index 095c49b8dc0..d1479b54d48 100644
14--- a/chromium/base/threading/platform_thread_linux.cc
15+++ b/chromium/base/threading/platform_thread_linux.cc
16@@ -186,7 +186,8 @@ void TerminateOnThread() {}
17
18 size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
19 #if !defined(THREAD_SANITIZER)
20- return 0;
21+ // use 8mb like glibc to avoid running out of space
22+ return (1 << 23);
23 #else
24 // ThreadSanitizer bloats the stack heavily. Evidence has been that the
25 // default stack size isn't enough for some browser tests.
26diff --git a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
27index b2421649ff3..a31b96e90e6 100644
28--- a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
29+++ b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
30@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
31 // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
32 // correctly for the main thread.
33
34-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
35+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
36 defined(OS_FUCHSIA)
37 // pthread_getattr_np() can fail if the thread is not invoked by
38 // pthread_create() (e.g., the main thread of blink_unittests).
39@@ -97,7 +97,7 @@ return Threading::ThreadStackSize();
40 }
41
42 void* GetStackStart() {
43-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
44+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
45 defined(OS_FUCHSIA)
46 pthread_attr_t attr;
47 int error;