diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-16 09:15:31 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-16 10:35:31 +0300 |
commit | b9313110bd4ec9a30a037f2edd78b02bf57ed6eb (patch) | |
tree | eaf467a73585a6a4971d87324897bc21d771c5ab /recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Adjust-default-pthread-stack-size.patch | |
parent | 0fb09cabc2499f52113630dacbea7524402e7793 (diff) | |
parent | f6bae656fa1b8e7ec28ecac5bf0ac70d63abd1b5 (diff) | |
download | meta-qt5-b9313110bd4ec9a30a037f2edd78b02bf57ed6eb.tar.gz |
Merge remote-tracking branch 'origin/5.13' into dev
* origin/5.13: (22 commits)
qt5-creator: fix bad merge
qtbase: use offscreen platform plugin for tools
coin: update poky and openembedded revisions
qtwebengine: allow build for musl libc
qt5: update submodules
qt5: update to Qt 5.12.5
Add CI build instructions
qt5-creator: fix build with musl
ogl-runtime: fix build on musl libc
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
...
Change-Id: I59c8da38833c99e3f8f24f09d04a48c9df79bbf5
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..96eedc5f --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Adjust-default-pthread-stack-size.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From 22793b4cab2ceaf7301136fa2df06947c9cb424c 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 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. | ||
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 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; | ||