diff options
author | Khem Raj <raj.khem@gmail.com> | 2018-12-23 16:58:04 -0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-24 07:18:56 +0000 |
commit | f69fc4063ccbc3774df6f73fa59f9558eede8128 (patch) | |
tree | 47dbb273d3a4a315e102c3d76f9838172aa9283b /recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Adjust-default-pthread-stack-size.patch | |
parent | 7cc177d116ad98d0c922f98aa7f02c2cc655c0ec (diff) | |
download | meta-qt5-f69fc4063ccbc3774df6f73fa59f9558eede8128.tar.gz |
qtwebengine: Fix build with musl/gcc9
Provide couple of patches to fix build with x86_64/musl and a new
bug found lss via gcc9
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Adjust-default-pthread-stack-size.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Adjust-default-pthread-stack-size.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Adjust-default-pthread-stack-size.patch new file mode 100644 index 00000000..a3b34b22 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Adjust-default-pthread-stack-size.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From 7f95397de67e00390fd90ed6b2f70dcfde8d7285 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 190acedf7c5..343e1a8c61d 100644 | ||
14 | --- a/chromium/base/threading/platform_thread_linux.cc | ||
15 | +++ b/chromium/base/threading/platform_thread_linux.cc | ||
16 | @@ -173,7 +173,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 10f1c0df11f..8e86a2eb1e9 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 | @@ -28,7 +28,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 | @@ -96,7 +96,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; | ||