diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-10-17 09:34:13 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-10-22 10:28:56 +0300 |
commit | b16599a516e0f5e73673ba101ae0a852d8a14cf0 (patch) | |
tree | d53dc26cba9dda359f16c0c715e557ab5423aec4 /recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch | |
parent | 5aeeb6f72b048e0dd804fae74fa0e359182828de (diff) | |
download | meta-qt5-b16599a516e0f5e73673ba101ae0a852d8a14cf0.tar.gz |
qt5: update submodulesv5.14.0-beta2
Update to latest content in Qt 5.14 branch.
Task-number: QTBUG-77876
Change-Id: I2b539ee3c0687bf9bc16787878ad0e8e09e8b4d7
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch | 8 |
1 files changed, 4 insertions, 4 deletions
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 4eba389f..4b8dcf8f 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 07161d6cffe2f38f8de1d176047548ea448c0b8f Mon Sep 17 00:00:00 2001 | 1 | From 147314e33ca3d397321da29287c7c64843229cb7 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: Tue, 5 Feb 2019 14:32:20 -0800 | 3 | Date: Tue, 5 Feb 2019 14:32:20 -0800 |
4 | Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm | 4 | Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm |
@@ -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 | ||
17 | diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn | 17 | diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn |
18 | index b9f1bba6062..354bd444482 100644 | 18 | index 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 | @@ -77,8 +77,11 @@ if (use_arm_neon_optimizations) { | 21 | @@ -78,8 +78,11 @@ if (use_arm_neon_optimizations) { |
22 | # Disabled for iPhone, as described in DDI0487C_a_armv8_arm: | 22 | # Disabled for iPhone, as described in DDI0487C_a_armv8_arm: |
23 | # "All implementations of the ARMv8.1 architecture are required to | 23 | # "All implementations of the ARMv8.1 architecture are required to |
24 | # implement the CRC32* instructions. These are optional in ARMv8.0." | 24 | # implement the CRC32* instructions. These are optional in ARMv8.0." |
25 | + defines = [] | 25 | + defines = [] |
26 | if (is_clang && !is_ios) { | 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" ] |