From e990651e683b47e60fc981dc4edb285a795ae490 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 29 Apr 2019 15:27:49 +0300 Subject: qt5: Update to Qt 5.14 from dev branch Change-Id: Ie028c02cb79b7315ca58a81db311a8e839612284 Reviewed-by: Mikko Gronoff --- .../0021-chromium-Exclude-CRC32-for-32bit-arm.patch | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'recipes-qt/qt5/qtwebengine/chromium') diff --git a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch index 73d838b6..77c15b1c 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch @@ -1,4 +1,4 @@ -From 99660440fb4e876fe6c008f37fb70fce9cb61b9b Mon Sep 17 00:00:00 2001 +From 11c7288eca77725a6c461c8dbf953a72228cba08 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 5 Feb 2019 14:32:20 -0800 Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm @@ -11,23 +11,24 @@ src/3rdparty/chromium/third_party/zlib/crc32_simd.c:184: undefined reference to Upstream-Status: Pending Signed-off-by: Khem Raj --- - chromium/third_party/zlib/BUILD.gn | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) + chromium/third_party/zlib/BUILD.gn | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn -index 458f428..18b4f23 100644 +index 458f428b7ce..e82d24aa9bb 100644 --- a/chromium/third_party/zlib/BUILD.gn +++ b/chromium/third_party/zlib/BUILD.gn -@@ -74,8 +74,11 @@ if (use_arm_neon_optimizations) { +@@ -74,9 +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. + defines = [] if (is_clang && (!is_ios && !is_fuchsia)) { - defines = [ "CRC32_ARMV8_CRC32" ] +- if (is_android) { + if (current_cpu == "arm64") { -+ defines += [ "CRC32_ARMV8_CRC32" ] -+ } - if (is_android) { ++ defines += [ "CRC32_ARMV8_CRC32" ] ++ } if (is_android) { defines += [ "ARMV8_OS_ANDROID" ] } else if (is_linux || is_chromeos) { + defines += [ "ARMV8_OS_LINUX" ] -- cgit v1.2.3-54-g00ecf