diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2018-07-04 10:20:19 +0300 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-23 19:40:34 +0000 |
| commit | d45b966b4612fe59ac3c53e0f7a3c480d29b2fbe (patch) | |
| tree | e12362298f3ce80a2f24b9200d2ec9342d4c7f22 /recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch | |
| parent | 8c7797ba5a2c2ba39a4389954b2ca72efc37e036 (diff) | |
| download | meta-qt5-d45b966b4612fe59ac3c53e0f7a3c480d29b2fbe.tar.gz | |
qtwebengine: update chromium musl patchset
Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch new file mode 100644 index 00000000..90e24aa4 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch | |||
| @@ -0,0 +1,47 @@ | |||
| 1 | From 2da25a561f24b3a759c1c26e98b252e47aea19c9 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; | ||
