diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-14 15:06:28 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-15 10:10:47 +0300 |
commit | 63dec9bbd826a4afafa7177aaa3439467f25d80a (patch) | |
tree | afcff4f6d8c72cb4a51f1e27cda2a65aeb55d712 /recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Adjust-default-pthread-stack-size.patch | |
parent | 79791026ff20539180027de0d796f8acd55bc7bf (diff) | |
parent | 53500ade778bac6e1733db43fc41c290d7b9d16b (diff) | |
download | meta-qt5-63dec9bbd826a4afafa7177aaa3439467f25d80a.tar.gz |
Merge remote-tracking branch 'origin/upstream/master' into 5.13
* origin/upstream/master:
qtdeclarative: Use qmlcachegen provided by OE instead of system one.
qtbase-native: Always use qt provided doubleconversion library.
qttools: Enable clang support when using clang
qt5-creator: update to v4.9.2
maliit-framework-qt5: Fix build when ptest is enabled
qtwebengine: Fix build on aarch64
qtwebengine: refresh the patches to apply
qtremoteobjects: Use OE_PATH_EXTERNAL_HOST_BINS to enable cmake to find repc
qt5: Upgrade to Qt 5.13.0
Allow enabling gui for native and nativesdk
qt5everywheredemo: update HOMEPAGE
qtconnectivity,qtsystems: Account for bluez4 from oe-core
gdb_%.bbappend: Avoid PAK archive (application/x-pak)
Change-Id: I24e0b7b95920df3722f84a1f3a2e74546dc74810
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Adjust-default-pthread-stack-size.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Adjust-default-pthread-stack-size.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Adjust-default-pthread-stack-size.patch new file mode 100644 index 00000000..e1754c1a --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Adjust-default-pthread-stack-size.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From 9f526ef03263867d7fb305d5fc91f95e2c9564ea Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 7 Jul 2017 16:41:23 -0700 | ||
4 | Subject: [PATCH] chromium: musl: Adjust default pthread stack size | ||
5 | |||
6 | Signed-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 | |||
12 | diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc | ||
13 | index 277a7e9338d..2a6e060fa32 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. | ||
26 | diff --git a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc | ||
27 | index 248f93968a6..4bc5ac692af 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 | @@ -30,7 +30,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 webkit_unit_tests). | ||
39 | @@ -98,7 +98,7 @@ size_t GetUnderestimatedStackSize() { | ||
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; | ||