summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch
diff options
context:
space:
mode:
authorJani Suonpera <jani.suonpera@qt.io>2020-11-03 12:43:11 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2020-11-17 07:09:19 +0200
commit72459ce0639eb3ce408558a7abede945e1f8ddc9 (patch)
tree775d465f8db9fab5c4202be3d4a17f9cead61ee2 /recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch
parent6557244eca22a8722cf0fde2f3cc62f45cb72651 (diff)
downloadmeta-qt5-72459ce0639eb3ce408558a7abede945e1f8ddc9.tar.gz
Submodule update for 5.15v5.15.2
Modify patches for removing "Fuzz detected". Remove patches which already merged to upstream branch. Add depends jpeg-native and freetype-native. Task-number: QTBUG-86641 Change-Id: I40c6fed9b47d6a7749069554ea080db3e017f724 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch
index b0833018..53ecedd4 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch
@@ -1,19 +1,19 @@
1From dd7561980e6669aebae6c1fab1c4653139b6740f Mon Sep 17 00:00:00 2001 1From 31b50a484935d1a610da74fa5a06489f8309fd6d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 16:41:23 -0700 3Date: Fri, 7 Jul 2017 16:41:23 -0700
4Subject: [PATCH] chromium: musl: Adjust default pthread stack size 4Subject: [PATCH] chromium: musl: Adjust default pthread stack size
5 5
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7--- 7---
8 chromium/base/threading/platform_thread_linux.cc | 3 ++- 8 chromium/base/threading/platform_thread_linux.cc | 3 ++-
9 .../third_party/blink/renderer/platform/wtf/stack_util.cc | 4 ++-- 9 chromium/third_party/blink/renderer/platform/wtf/stack_util.cc | 2 +-
10 2 files changed, 4 insertions(+), 3 deletions(-) 10 2 files changed, 3 insertions(+), 2 deletions(-)
11 11
12diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc 12diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc
13index 095c49b8dc0..d1479b54d48 100644 13index 74a01ad5af5..dab5773d73b 100644
14--- a/chromium/base/threading/platform_thread_linux.cc 14--- a/chromium/base/threading/platform_thread_linux.cc
15+++ b/chromium/base/threading/platform_thread_linux.cc 15+++ b/chromium/base/threading/platform_thread_linux.cc
16@@ -186,7 +186,8 @@ void TerminateOnThread() {} 16@@ -377,7 +377,8 @@ void TerminateOnThread() {}
17 17
18 size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) { 18 size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
19 #if !defined(THREAD_SANITIZER) 19 #if !defined(THREAD_SANITIZER)
@@ -24,15 +24,15 @@ index 095c49b8dc0..d1479b54d48 100644
24 // ThreadSanitizer bloats the stack heavily. Evidence has been that the 24 // ThreadSanitizer bloats the stack heavily. Evidence has been that the
25 // default stack size isn't enough for some browser tests. 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 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 27index ab1dff4167e..b0763b0bd9a 100644
28--- a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc 28--- a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
29+++ b/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() { 30@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
31 // FIXME: On Mac OSX and Linux, this method cannot estimate stack size 31 // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
32 // correctly for the main thread. 32 // correctly for the main thread.
33 33
34-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ 34-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
35+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ 35+#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
36 defined(OS_FUCHSIA) 36 defined(OS_FUCHSIA)
37 // pthread_getattr_np() can fail if the thread is not invoked by 37 // pthread_getattr_np() can fail if the thread is not invoked by
38 // pthread_create() (e.g., the main thread of blink_unittests). 38 // pthread_create() (e.g., the main thread of blink_unittests).