summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2019-04-29 15:27:49 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2019-05-02 07:57:44 +0000
commite990651e683b47e60fc981dc4edb285a795ae490 (patch)
tree3161f4634cbfb541dcababc7a4e8494d4ddaa0a4 /recipes-qt/qt5/qtwebengine/chromium
parenta2158ae2f8e347335b0e96f5524f173078819eee (diff)
downloadmeta-qt5-e990651e683b47e60fc981dc4edb285a795ae490.tar.gz
qt5: Update to Qt 5.14 from dev branch
Change-Id: Ie028c02cb79b7315ca58a81db311a8e839612284 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch17
1 files changed, 9 insertions, 8 deletions
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 @@
1From 99660440fb4e876fe6c008f37fb70fce9cb61b9b Mon Sep 17 00:00:00 2001 1From 11c7288eca77725a6c461c8dbf953a72228cba08 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 5 Feb 2019 14:32:20 -0800 3Date: Tue, 5 Feb 2019 14:32:20 -0800
4Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm 4Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm
@@ -11,23 +11,24 @@ src/3rdparty/chromium/third_party/zlib/crc32_simd.c:184: undefined reference to
11Upstream-Status: Pending 11Upstream-Status: Pending
12Signed-off-by: Khem Raj <raj.khem@gmail.com> 12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13--- 13---
14 chromium/third_party/zlib/BUILD.gn | 5 ++++- 14 chromium/third_party/zlib/BUILD.gn | 6 ++++--
15 1 file changed, 4 insertions(+), 1 deletion(-) 15 1 file changed, 4 insertions(+), 2 deletions(-)
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 458f428..18b4f23 100644 18index 458f428b7ce..e82d24aa9bb 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@@ -74,9 +74,11 @@ if (use_arm_neon_optimizations) {
22 # implement the CRC32* instructions. These are optional in ARMv8.0." 22 # implement the CRC32* instructions. These are optional in ARMv8.0."
23 # - Fuchsia just added a syscall for feature detection. 23 # - Fuchsia just added a syscall for feature detection.
24 # TODO(cavalcantii): crbug.com/810125. 24 # TODO(cavalcantii): crbug.com/810125.
25+ defines = [] 25+ defines = []
26 if (is_clang && (!is_ios && !is_fuchsia)) { 26 if (is_clang && (!is_ios && !is_fuchsia)) {
27- defines = [ "CRC32_ARMV8_CRC32" ] 27- defines = [ "CRC32_ARMV8_CRC32" ]
28- if (is_android) {
28+ if (current_cpu == "arm64") { 29+ if (current_cpu == "arm64") {
29+ defines += [ "CRC32_ARMV8_CRC32" ] 30+ defines += [ "CRC32_ARMV8_CRC32" ]
30+ } 31+ } if (is_android) {
31 if (is_android) {
32 defines += [ "ARMV8_OS_ANDROID" ] 32 defines += [ "ARMV8_OS_ANDROID" ]
33 } else if (is_linux || is_chromeos) { 33 } else if (is_linux || is_chromeos) {
34 defines += [ "ARMV8_OS_LINUX" ]