diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch index f1cc205b..652b89ec 100644 --- a/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch +++ b/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch | |||
@@ -1,16 +1,16 @@ | |||
1 | From 72a77c994434ecb708b2790ba9efaf1decc02503 Mon Sep 17 00:00:00 2001 | 1 | From d42b48975e92cfc4510030315ad8093bece4b7c5 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 16:41:23 -0700 | 3 | Date: Fri, 7 Jul 2017 16:41:23 -0700 |
4 | Subject: [PATCH] chromium: musl: Adjust default pthread stack size | 4 | Subject: [PATCH] chromium: musl: Adjust default pthread stack size |
5 | 5 | ||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 6 | Signed-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 | chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp | 4 ++-- | 9 | chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp | 4 ++-- |
10 | 2 files changed, 4 insertions(+), 3 deletions(-) | 10 | 2 files changed, 4 insertions(+), 3 deletions(-) |
11 | 11 | ||
12 | diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc | 12 | diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc |
13 | index 92fbda5ee1..c41579d4ed 100644 | 13 | index 8d411ed..4b56cf3 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 | @@ -175,7 +175,8 @@ void TerminateOnThread() {} | 16 | @@ -175,7 +175,8 @@ void TerminateOnThread() {} |
@@ -23,25 +23,25 @@ index 92fbda5ee1..c41579d4ed 100644 | |||
23 | #else | 23 | #else |
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. |
26 | diff --git a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp | 26 | diff --git a/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp b/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp |
27 | index 1d164f510a..3358deb256 100644 | 27 | index 13c3f90..07308e0 100644 |
28 | --- a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp | 28 | --- a/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp |
29 | +++ b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp | 29 | +++ b/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp |
30 | @@ -68,7 +68,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() { | 30 | @@ -28,7 +28,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__) || OS(ANDROID) || OS(FREEBSD) | 34 | -#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ |
35 | +#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) | 35 | +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ |
36 | defined(OS_FUCHSIA) | ||
36 | // 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 |
37 | // pthread_create() (e.g., the main thread of webkit_unit_tests). | 38 | // pthread_create() (e.g., the main thread of webkit_unit_tests). |
38 | // If so, a conservative size estimate is returned. | 39 | @@ -96,7 +96,7 @@ size_t GetUnderestimatedStackSize() { |
39 | @@ -135,7 +135,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() { | ||
40 | } | 40 | } |
41 | 41 | ||
42 | void* StackFrameDepth::getStackStart() { | 42 | void* GetStackStart() { |
43 | -#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) | 43 | -#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ |
44 | +#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) | 44 | +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ |
45 | defined(OS_FUCHSIA) | ||
45 | pthread_attr_t attr; | 46 | pthread_attr_t attr; |
46 | int error; | 47 | int error; |
47 | #if OS(FREEBSD) | ||