From ca649e3f6f03c5351a090852ff93a23e7382c86a Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 8 Jan 2020 14:10:13 +0200 Subject: qt5: Update to Qt 5.14.0 Signed-off-by: Samuli Piippo --- .../0001-Force-host-toolchain-configuration.patch | 32 ++++++++--------- .../0002-chromium-stack-pointer-clobber.patch | 24 ++----------- .../0003-chromium-fix-build-with-clang.patch | 40 +++++++++++----------- ...0004-chromium-Exclude-CRC32-for-32bit-arm.patch | 12 +++---- ...-not-try-to-set-the-guessed-values-for-ma.patch | 2 +- .../0006-chromium-aarch64-skia-build-fix.patch | 16 +++++---- ...um-musl-Adjust-default-pthread-stack-size.patch | 10 +++--- 7 files changed, 60 insertions(+), 76 deletions(-) (limited to 'recipes-qt/qt5/qtwebengine') 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. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Samuli Piippo --- + src/buildtools/config/linux.pri | 2 +- src/buildtools/configure_host.pro | 14 +++++++------- src/buildtools/gn.pro | 4 ++-- - src/core/config/linux.pri | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) +diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri +index 998aedc..b04db36 100644 +--- a/src/buildtools/config/linux.pri ++++ b/src/buildtools/config/linux.pri +@@ -124,7 +124,7 @@ contains(QT_ARCH, "mips") { + + host_build { + gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" +- GN_HOST_CPU = $$gnArch($$QT_ARCH) ++ GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch) + gn_args += host_cpu=\"$$GN_HOST_CPU\" + # Don't bother trying to use system libraries in this case + gn_args += use_glib=false diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro -index dd0d3e32..6312c867 100644 +index dd0d3e3..6312c86 100644 --- a/src/buildtools/configure_host.pro +++ b/src/buildtools/configure_host.pro @@ -4,7 +4,7 @@ TEMPLATE = aux @@ -58,7 +71,7 @@ index dd0d3e32..6312c867 100644 " nm = \"$$which(nm)\" " \ " toolchain_args = { " \ diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro -index b6bf9cfc..ae419b1a 100644 +index 033202e..a8ca656 100644 --- a/src/buildtools/gn.pro +++ b/src/buildtools/gn.pro @@ -19,8 +19,8 @@ build_pass|!debug_and_release { @@ -72,16 +85,3 @@ index b6bf9cfc..ae419b1a 100644 msvc:!clang_cl: gn_gen_args += --use-lto -diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri -index f45c418f..df8ac00b 100644 ---- a/src/core/config/linux.pri -+++ b/src/core/config/linux.pri -@@ -123,7 +123,7 @@ contains(QT_ARCH, "mips") { - - host_build { - gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" -- GN_HOST_CPU = $$gnArch($$QT_ARCH) -+ GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch) - gn_args += host_cpu=\"$$GN_HOST_CPU\" - # Don't bother trying to use system libraries in this case - 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] Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/linux-syscall-support/+/1390160] Signed-off-by: Khem Raj --- - chromium/third_party/lss/linux_syscall_support.h | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + chromium/third_party/lss/linux_syscall_support.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h -index 5d9c2e8582f..e19e51dd304 100644 +index 9276f56..622cc1f 100644 --- a/chromium/third_party/lss/linux_syscall_support.h +++ b/chromium/third_party/lss/linux_syscall_support.h -@@ -1964,7 +1964,7 @@ struct kernel_statfs { - __asm__ volatile(LSS_ENTRYPOINT \ - : "=a" (__res) \ - : "0" (__NR_##name) \ -- : "esp", "memory"); \ -+ : "memory"); \ - LSS_RETURN(type,__res); \ - } - #undef _syscall1 @@ -2012,7 +2012,7 @@ struct kernel_statfs { : "i" (__NR_##name), "ri" ((long)(arg1)), \ "c" ((long)(arg2)), "d" ((long)(arg3)), \ @@ -56,12 +47,3 @@ index 5d9c2e8582f..e19e51dd304 100644 LSS_RETURN(int, __res); } -@@ -2405,7 +2405,7 @@ struct kernel_statfs { - "d"(LSS_SYSCALL_ARG(parent_tidptr)), - "r"(LSS_SYSCALL_ARG(newtls)), - "r"(LSS_SYSCALL_ARG(child_tidptr)) -- : "rsp", "memory", "r8", "r10", "r11", "rcx"); -+ : "memory", "r8", "r10", "r11", "rcx"); - } - LSS_RETURN(int, __res); - } 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 index 17f486447fe..06c93e5b3cf 100644 --- a/chromium/build/config/compiler/BUILD.gn +++ b/chromium/build/config/compiler/BUILD.gn -@@ -570,13 +570,6 @@ config("compiler") { - } - } - -- # Tells the compiler not to use absolute paths when passing the default -- # paths to the tools it invokes. We don't want this because we don't -- # really need it and it can mess up the goma cache entries. -- if (is_clang && !is_nacl) { -- cflags += [ "-no-canonical-prefixes" ] -- } -- - # C11/C++11 compiler flags setup. - # --------------------------- - if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") { -@@ -815,8 +808,6 @@ config("compiler_cpu_abi") { +@@ -773,8 +773,6 @@ config("compiler_cpu_abi") { } } else if (current_cpu == "arm") { if (is_clang && !is_android && !is_nacl) { @@ -36,7 +22,7 @@ index 17f486447fe..06c93e5b3cf 100644 } if (!is_nacl) { cflags += [ -@@ -829,8 +820,6 @@ config("compiler_cpu_abi") { +@@ -787,8 +785,6 @@ config("compiler_cpu_abi") { } } else if (current_cpu == "arm64") { if (is_clang && !is_android && !is_nacl && !is_fuchsia) { @@ -45,7 +31,7 @@ index 17f486447fe..06c93e5b3cf 100644 } } else if (current_cpu == "mipsel" && !is_nacl) { ldflags += [ "-Wl,--hash-style=sysv" ] -@@ -839,9 +828,6 @@ config("compiler_cpu_abi") { +@@ -797,9 +793,6 @@ config("compiler_cpu_abi") { if (is_android) { cflags += [ "--target=mipsel-linux-android" ] ldflags += [ "--target=mipsel-linux-android" ] @@ -55,7 +41,7 @@ index 17f486447fe..06c93e5b3cf 100644 } } else { cflags += [ "-EL" ] -@@ -920,10 +906,7 @@ config("compiler_cpu_abi") { +@@ -878,10 +871,7 @@ config("compiler_cpu_abi") { } else if (current_cpu == "mips" && !is_nacl) { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { @@ -67,7 +53,7 @@ index 17f486447fe..06c93e5b3cf 100644 cflags += [ "-EB" ] ldflags += [ "-EB" ] } -@@ -970,9 +953,6 @@ config("compiler_cpu_abi") { +@@ -928,9 +918,6 @@ config("compiler_cpu_abi") { if (is_android) { cflags += [ "--target=mips64el-linux-android" ] ldflags += [ "--target=mips64el-linux-android" ] @@ -77,7 +63,7 @@ index 17f486447fe..06c93e5b3cf 100644 } } else { cflags += [ -@@ -1029,10 +1009,7 @@ config("compiler_cpu_abi") { +@@ -987,10 +974,7 @@ config("compiler_cpu_abi") { } else if (current_cpu == "mips64") { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { @@ -89,3 +75,17 @@ index 17f486447fe..06c93e5b3cf 100644 cflags += [ "-EB", "-mabi=64", +@@ -1169,13 +1153,6 @@ config("compiler_deterministic") { + } + } + } +- +- # Tells the compiler not to use absolute paths when passing the default +- # paths to the tools it invokes. We don't want this because we don't +- # really need it and it can mess up the goma cache entries. +- if (is_clang && !is_nacl) { +- cflags += [ "-no-canonical-prefixes" ] +- } + } + + 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 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn -index 458f428b7ce..18b4f23f769 100644 +index 29dda54..6870dbb 100644 --- a/chromium/third_party/zlib/BUILD.gn +++ b/chromium/third_party/zlib/BUILD.gn -@@ -74,8 +74,11 @@ if (use_arm_neon_optimizations) { - # implement the CRC32* instructions. These are optional in ARMv8.0." - # - Fuchsia just added a syscall for feature detection. - # TODO(cavalcantii): crbug.com/810125. +@@ -78,8 +78,11 @@ if (use_arm_neon_optimizations) { + # Disabled for iPhone, as described in DDI0487C_a_armv8_arm: + # "All implementations of the ARMv8.1 architecture are required to + # implement the CRC32* instructions. These are optional in ARMv8.0." + defines = [] - if (is_clang && (!is_ios && !is_fuchsia)) { + if (!is_ios) { - defines = [ "CRC32_ARMV8_CRC32" ] + if (current_cpu == "arm64") { + 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 index 06c93e5b3cf..8ba0f8a3109 100644 --- a/chromium/build/config/compiler/BUILD.gn +++ b/chromium/build/config/compiler/BUILD.gn -@@ -809,15 +809,6 @@ config("compiler_cpu_abi") { +@@ -774,15 +774,6 @@ config("compiler_cpu_abi") { } else if (current_cpu == "arm") { if (is_clang && !is_android && !is_nacl) { } 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. Signed-off-by: Raphael Kubo da Costa --- - .../skia/src/opts/SkRasterPipeline_opts.h | 15 ++------------- - 1 file changed, 2 insertions(+), 13 deletions(-) + .../third_party/skia/src/opts/SkRasterPipeline_opts.h | 17 ++--------------- + 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h -index de14e65b94e..b8be7852086 100644 +index b59506d..b8f22c9 100644 --- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h +++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h -@@ -729,12 +729,7 @@ SI F approx_powf(F x, F y) { +@@ -972,13 +972,7 @@ SI F approx_powf(F x, F y) { } SI F from_half(U16 h) { --#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. +-#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \ +- && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. - __fp16 fp16; - memcpy(&fp16, &h, sizeof(U16)); - return float(fp16); @@ -45,11 +46,12 @@ index de14e65b94e..b8be7852086 100644 return _mm256_cvtph_ps(h); #else -@@ -751,13 +746,7 @@ SI F from_half(U16 h) { +@@ -995,14 +989,7 @@ SI F from_half(U16 h) { } SI U16 to_half(F f) { --#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. +-#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \ +- && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. - __fp16 fp16 = __fp16(f); - U16 u16; - 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 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc -index 277a7e9338d..2a6e060fa32 100644 +index 095c49b8dc0..d1479b54d48 100644 --- a/chromium/base/threading/platform_thread_linux.cc +++ b/chromium/base/threading/platform_thread_linux.cc @@ -186,7 +186,8 @@ void TerminateOnThread() {} @@ -24,10 +24,10 @@ index 277a7e9338d..2a6e060fa32 100644 // ThreadSanitizer bloats the stack heavily. Evidence has been that the // default stack size isn't enough for some browser tests. diff --git a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc -index 248f93968a6..4bc5ac692af 100644 +index b2421649ff3..a31b96e90e6 100644 --- a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc +++ b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc -@@ -30,7 +30,7 @@ size_t GetUnderestimatedStackSize() { +@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() { // FIXME: On Mac OSX and Linux, this method cannot estimate stack size // correctly for the main thread. @@ -35,8 +35,8 @@ index 248f93968a6..4bc5ac692af 100644 +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ defined(OS_FUCHSIA) // pthread_getattr_np() can fail if the thread is not invoked by - // pthread_create() (e.g., the main thread of webkit_unit_tests). -@@ -98,7 +98,7 @@ size_t GetUnderestimatedStackSize() { + // pthread_create() (e.g., the main thread of blink_unittests). +@@ -97,7 +97,7 @@ return Threading::ThreadStackSize(); } void* GetStackStart() { -- cgit v1.2.3-54-g00ecf