summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtwebengine')
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch32
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch24
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch40
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch12
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch16
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Adjust-default-pthread-stack-size.patch10
7 files changed, 60 insertions, 76 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
index 169ed078..7bda76a2 100644
--- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
@@ -13,13 +13,26 @@ for the qmakes's host architecture.
13Upstream-Status: Inappropriate [OE specific] 13Upstream-Status: Inappropriate [OE specific]
14Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> 14Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
15--- 15---
16 src/buildtools/config/linux.pri | 2 +-
16 src/buildtools/configure_host.pro | 14 +++++++------- 17 src/buildtools/configure_host.pro | 14 +++++++-------
17 src/buildtools/gn.pro | 4 ++-- 18 src/buildtools/gn.pro | 4 ++--
18 src/core/config/linux.pri | 2 +-
19 3 files changed, 10 insertions(+), 10 deletions(-) 19 3 files changed, 10 insertions(+), 10 deletions(-)
20 20
21diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri
22index 998aedc..b04db36 100644
23--- a/src/buildtools/config/linux.pri
24+++ b/src/buildtools/config/linux.pri
25@@ -124,7 +124,7 @@ contains(QT_ARCH, "mips") {
26
27 host_build {
28 gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"
29- GN_HOST_CPU = $$gnArch($$QT_ARCH)
30+ GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch)
31 gn_args += host_cpu=\"$$GN_HOST_CPU\"
32 # Don't bother trying to use system libraries in this case
33 gn_args += use_glib=false
21diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro 34diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
22index dd0d3e32..6312c867 100644 35index dd0d3e3..6312c86 100644
23--- a/src/buildtools/configure_host.pro 36--- a/src/buildtools/configure_host.pro
24+++ b/src/buildtools/configure_host.pro 37+++ b/src/buildtools/configure_host.pro
25@@ -4,7 +4,7 @@ TEMPLATE = aux 38@@ -4,7 +4,7 @@ TEMPLATE = aux
@@ -58,7 +71,7 @@ index dd0d3e32..6312c867 100644
58 " nm = \"$$which(nm)\" " \ 71 " nm = \"$$which(nm)\" " \
59 " toolchain_args = { " \ 72 " toolchain_args = { " \
60diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro 73diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro
61index b6bf9cfc..ae419b1a 100644 74index 033202e..a8ca656 100644
62--- a/src/buildtools/gn.pro 75--- a/src/buildtools/gn.pro
63+++ b/src/buildtools/gn.pro 76+++ b/src/buildtools/gn.pro
64@@ -19,8 +19,8 @@ build_pass|!debug_and_release { 77@@ -19,8 +19,8 @@ build_pass|!debug_and_release {
@@ -72,16 +85,3 @@ index b6bf9cfc..ae419b1a 100644
72 85
73 msvc:!clang_cl: gn_gen_args += --use-lto 86 msvc:!clang_cl: gn_gen_args += --use-lto
74 87
75diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
76index f45c418f..df8ac00b 100644
77--- a/src/core/config/linux.pri
78+++ b/src/core/config/linux.pri
79@@ -123,7 +123,7 @@ contains(QT_ARCH, "mips") {
80
81 host_build {
82 gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"
83- GN_HOST_CPU = $$gnArch($$QT_ARCH)
84+ GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch)
85 gn_args += host_cpu=\"$$GN_HOST_CPU\"
86 # Don't bother trying to use system libraries in this case
87 gn_args += use_glib=false
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
index 1c975aed..ed7f78f6 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
@@ -13,22 +13,13 @@ of flagging this silent ignoring via [1]
13Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/linux-syscall-support/+/1390160] 13Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/linux-syscall-support/+/1390160]
14Signed-off-by: Khem Raj <raj.khem@gmail.com> 14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15--- 15---
16 chromium/third_party/lss/linux_syscall_support.h | 10 +++++----- 16 chromium/third_party/lss/linux_syscall_support.h | 6 +++---
17 1 file changed, 5 insertions(+), 5 deletions(-) 17 1 file changed, 3 insertions(+), 3 deletions(-)
18 18
19diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h 19diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h
20index 5d9c2e8582f..e19e51dd304 100644 20index 9276f56..622cc1f 100644
21--- a/chromium/third_party/lss/linux_syscall_support.h 21--- a/chromium/third_party/lss/linux_syscall_support.h
22+++ b/chromium/third_party/lss/linux_syscall_support.h 22+++ b/chromium/third_party/lss/linux_syscall_support.h
23@@ -1964,7 +1964,7 @@ struct kernel_statfs {
24 __asm__ volatile(LSS_ENTRYPOINT \
25 : "=a" (__res) \
26 : "0" (__NR_##name) \
27- : "esp", "memory"); \
28+ : "memory"); \
29 LSS_RETURN(type,__res); \
30 }
31 #undef _syscall1
32@@ -2012,7 +2012,7 @@ struct kernel_statfs { 23@@ -2012,7 +2012,7 @@ struct kernel_statfs {
33 : "i" (__NR_##name), "ri" ((long)(arg1)), \ 24 : "i" (__NR_##name), "ri" ((long)(arg1)), \
34 "c" ((long)(arg2)), "d" ((long)(arg3)), \ 25 "c" ((long)(arg2)), "d" ((long)(arg3)), \
@@ -56,12 +47,3 @@ index 5d9c2e8582f..e19e51dd304 100644
56 LSS_RETURN(int, __res); 47 LSS_RETURN(int, __res);
57 } 48 }
58 49
59@@ -2405,7 +2405,7 @@ struct kernel_statfs {
60 "d"(LSS_SYSCALL_ARG(parent_tidptr)),
61 "r"(LSS_SYSCALL_ARG(newtls)),
62 "r"(LSS_SYSCALL_ARG(child_tidptr))
63- : "rsp", "memory", "r8", "r10", "r11", "rcx");
64+ : "memory", "r8", "r10", "r11", "rcx");
65 }
66 LSS_RETURN(int, __res);
67 }
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
index 4730a6bd..278a9b0c 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
@@ -13,21 +13,7 @@ diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/com
13index 17f486447fe..06c93e5b3cf 100644 13index 17f486447fe..06c93e5b3cf 100644
14--- a/chromium/build/config/compiler/BUILD.gn 14--- a/chromium/build/config/compiler/BUILD.gn
15+++ b/chromium/build/config/compiler/BUILD.gn 15+++ b/chromium/build/config/compiler/BUILD.gn
16@@ -570,13 +570,6 @@ config("compiler") { 16@@ -773,8 +773,6 @@ config("compiler_cpu_abi") {
17 }
18 }
19
20- # Tells the compiler not to use absolute paths when passing the default
21- # paths to the tools it invokes. We don't want this because we don't
22- # really need it and it can mess up the goma cache entries.
23- if (is_clang && !is_nacl) {
24- cflags += [ "-no-canonical-prefixes" ]
25- }
26-
27 # C11/C++11 compiler flags setup.
28 # ---------------------------
29 if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") {
30@@ -815,8 +808,6 @@ config("compiler_cpu_abi") {
31 } 17 }
32 } else if (current_cpu == "arm") { 18 } else if (current_cpu == "arm") {
33 if (is_clang && !is_android && !is_nacl) { 19 if (is_clang && !is_android && !is_nacl) {
@@ -36,7 +22,7 @@ index 17f486447fe..06c93e5b3cf 100644
36 } 22 }
37 if (!is_nacl) { 23 if (!is_nacl) {
38 cflags += [ 24 cflags += [
39@@ -829,8 +820,6 @@ config("compiler_cpu_abi") { 25@@ -787,8 +785,6 @@ config("compiler_cpu_abi") {
40 } 26 }
41 } else if (current_cpu == "arm64") { 27 } else if (current_cpu == "arm64") {
42 if (is_clang && !is_android && !is_nacl && !is_fuchsia) { 28 if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
@@ -45,7 +31,7 @@ index 17f486447fe..06c93e5b3cf 100644
45 } 31 }
46 } else if (current_cpu == "mipsel" && !is_nacl) { 32 } else if (current_cpu == "mipsel" && !is_nacl) {
47 ldflags += [ "-Wl,--hash-style=sysv" ] 33 ldflags += [ "-Wl,--hash-style=sysv" ]
48@@ -839,9 +828,6 @@ config("compiler_cpu_abi") { 34@@ -797,9 +793,6 @@ config("compiler_cpu_abi") {
49 if (is_android) { 35 if (is_android) {
50 cflags += [ "--target=mipsel-linux-android" ] 36 cflags += [ "--target=mipsel-linux-android" ]
51 ldflags += [ "--target=mipsel-linux-android" ] 37 ldflags += [ "--target=mipsel-linux-android" ]
@@ -55,7 +41,7 @@ index 17f486447fe..06c93e5b3cf 100644
55 } 41 }
56 } else { 42 } else {
57 cflags += [ "-EL" ] 43 cflags += [ "-EL" ]
58@@ -920,10 +906,7 @@ config("compiler_cpu_abi") { 44@@ -878,10 +871,7 @@ config("compiler_cpu_abi") {
59 } else if (current_cpu == "mips" && !is_nacl) { 45 } else if (current_cpu == "mips" && !is_nacl) {
60 ldflags += [ "-Wl,--hash-style=sysv" ] 46 ldflags += [ "-Wl,--hash-style=sysv" ]
61 if (custom_toolchain == "") { 47 if (custom_toolchain == "") {
@@ -67,7 +53,7 @@ index 17f486447fe..06c93e5b3cf 100644
67 cflags += [ "-EB" ] 53 cflags += [ "-EB" ]
68 ldflags += [ "-EB" ] 54 ldflags += [ "-EB" ]
69 } 55 }
70@@ -970,9 +953,6 @@ config("compiler_cpu_abi") { 56@@ -928,9 +918,6 @@ config("compiler_cpu_abi") {
71 if (is_android) { 57 if (is_android) {
72 cflags += [ "--target=mips64el-linux-android" ] 58 cflags += [ "--target=mips64el-linux-android" ]
73 ldflags += [ "--target=mips64el-linux-android" ] 59 ldflags += [ "--target=mips64el-linux-android" ]
@@ -77,7 +63,7 @@ index 17f486447fe..06c93e5b3cf 100644
77 } 63 }
78 } else { 64 } else {
79 cflags += [ 65 cflags += [
80@@ -1029,10 +1009,7 @@ config("compiler_cpu_abi") { 66@@ -987,10 +974,7 @@ config("compiler_cpu_abi") {
81 } else if (current_cpu == "mips64") { 67 } else if (current_cpu == "mips64") {
82 ldflags += [ "-Wl,--hash-style=sysv" ] 68 ldflags += [ "-Wl,--hash-style=sysv" ]
83 if (custom_toolchain == "") { 69 if (custom_toolchain == "") {
@@ -89,3 +75,17 @@ index 17f486447fe..06c93e5b3cf 100644
89 cflags += [ 75 cflags += [
90 "-EB", 76 "-EB",
91 "-mabi=64", 77 "-mabi=64",
78@@ -1169,13 +1153,6 @@ config("compiler_deterministic") {
79 }
80 }
81 }
82-
83- # Tells the compiler not to use absolute paths when passing the default
84- # paths to the tools it invokes. We don't want this because we don't
85- # really need it and it can mess up the goma cache entries.
86- if (is_clang && !is_nacl) {
87- cflags += [ "-no-canonical-prefixes" ]
88- }
89 }
90
91 config("clang_revision") {
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
index 6ad1febf..bb628fd2 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
@@ -15,15 +15,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
15 1 file changed, 4 insertions(+), 1 deletion(-) 15 1 file changed, 4 insertions(+), 1 deletion(-)
16 16
17diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn 17diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn
18index 458f428b7ce..18b4f23f769 100644 18index 29dda54..6870dbb 100644
19--- a/chromium/third_party/zlib/BUILD.gn 19--- a/chromium/third_party/zlib/BUILD.gn
20+++ b/chromium/third_party/zlib/BUILD.gn 20+++ b/chromium/third_party/zlib/BUILD.gn
21@@ -74,8 +74,11 @@ if (use_arm_neon_optimizations) { 21@@ -78,8 +78,11 @@ if (use_arm_neon_optimizations) {
22 # implement the CRC32* instructions. These are optional in ARMv8.0." 22 # Disabled for iPhone, as described in DDI0487C_a_armv8_arm:
23 # - Fuchsia just added a syscall for feature detection. 23 # "All implementations of the ARMv8.1 architecture are required to
24 # TODO(cavalcantii): crbug.com/810125. 24 # implement the CRC32* instructions. These are optional in ARMv8.0."
25+ defines = [] 25+ defines = []
26 if (is_clang && (!is_ios && !is_fuchsia)) { 26 if (!is_ios) {
27- defines = [ "CRC32_ARMV8_CRC32" ] 27- defines = [ "CRC32_ARMV8_CRC32" ]
28+ if (current_cpu == "arm64") { 28+ if (current_cpu == "arm64") {
29+ defines += [ "CRC32_ARMV8_CRC32" ] 29+ defines += [ "CRC32_ARMV8_CRC32" ]
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
index 4e976b42..12128d3c 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
@@ -20,7 +20,7 @@ diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/com
20index 06c93e5b3cf..8ba0f8a3109 100644 20index 06c93e5b3cf..8ba0f8a3109 100644
21--- a/chromium/build/config/compiler/BUILD.gn 21--- a/chromium/build/config/compiler/BUILD.gn
22+++ b/chromium/build/config/compiler/BUILD.gn 22+++ b/chromium/build/config/compiler/BUILD.gn
23@@ -809,15 +809,6 @@ config("compiler_cpu_abi") { 23@@ -774,15 +774,6 @@ config("compiler_cpu_abi") {
24 } else if (current_cpu == "arm") { 24 } else if (current_cpu == "arm") {
25 if (is_clang && !is_android && !is_nacl) { 25 if (is_clang && !is_android && !is_nacl) {
26 } 26 }
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch
index 7f6e4bdf..4dafd779 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch
@@ -24,18 +24,19 @@ moment.
24 24
25Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> 25Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
26--- 26---
27 .../skia/src/opts/SkRasterPipeline_opts.h | 15 ++------------- 27 .../third_party/skia/src/opts/SkRasterPipeline_opts.h | 17 ++---------------
28 1 file changed, 2 insertions(+), 13 deletions(-) 28 1 file changed, 2 insertions(+), 15 deletions(-)
29 29
30diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h 30diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
31index de14e65b94e..b8be7852086 100644 31index b59506d..b8f22c9 100644
32--- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h 32--- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
33+++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h 33+++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
34@@ -729,12 +729,7 @@ SI F approx_powf(F x, F y) { 34@@ -972,13 +972,7 @@ SI F approx_powf(F x, F y) {
35 } 35 }
36 36
37 SI F from_half(U16 h) { 37 SI F from_half(U16 h) {
38-#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. 38-#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
39- && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
39- __fp16 fp16; 40- __fp16 fp16;
40- memcpy(&fp16, &h, sizeof(U16)); 41- memcpy(&fp16, &h, sizeof(U16));
41- return float(fp16); 42- return float(fp16);
@@ -45,11 +46,12 @@ index de14e65b94e..b8be7852086 100644
45 return _mm256_cvtph_ps(h); 46 return _mm256_cvtph_ps(h);
46 47
47 #else 48 #else
48@@ -751,13 +746,7 @@ SI F from_half(U16 h) { 49@@ -995,14 +989,7 @@ SI F from_half(U16 h) {
49 } 50 }
50 51
51 SI U16 to_half(F f) { 52 SI U16 to_half(F f) {
52-#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. 53-#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
54- && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
53- __fp16 fp16 = __fp16(f); 55- __fp16 fp16 = __fp16(f);
54- U16 u16; 56- U16 u16;
55- memcpy(&u16, &fp16, sizeof(U16)); 57- memcpy(&u16, &fp16, sizeof(U16));
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Adjust-default-pthread-stack-size.patch
index 80ea3ae1..790bf140 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Adjust-default-pthread-stack-size.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Adjust-default-pthread-stack-size.patch
@@ -10,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10 2 files changed, 4 insertions(+), 3 deletions(-) 10 2 files changed, 4 insertions(+), 3 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 277a7e9338d..2a6e060fa32 100644 13index 095c49b8dc0..d1479b54d48 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@@ -186,7 +186,8 @@ void TerminateOnThread() {}
@@ -24,10 +24,10 @@ index 277a7e9338d..2a6e060fa32 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 248f93968a6..4bc5ac692af 100644 27index b2421649ff3..a31b96e90e6 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@@ -30,7 +30,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
@@ -35,8 +35,8 @@ index 248f93968a6..4bc5ac692af 100644
35+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ 35+#if 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 webkit_unit_tests). 38 // pthread_create() (e.g., the main thread of blink_unittests).
39@@ -98,7 +98,7 @@ size_t GetUnderestimatedStackSize() { 39@@ -97,7 +97,7 @@ return Threading::ThreadStackSize();
40 } 40 }
41 41
42 void* GetStackStart() { 42 void* GetStackStart() {
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-21 09:09:13 +0000