diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-04-03 15:05:29 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-04-08 05:26:52 +0000 |
commit | 119a5bde5b852f663f7c1f0cd720a810a29db2a4 (patch) | |
tree | 8178565863090759a905a6cff65031de986f0a19 /recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch | |
parent | 7b03a69d33cf7887d2c202b38716d04433318b1d (diff) | |
download | meta-qt5-119a5bde5b852f663f7c1f0cd720a810a29db2a4.tar.gz |
qt5: update submodules
Update to latest content in Qt 5.13.0 beta2 branch
Task-number: QTBUG-72311
Change-Id: I6b7a6629412bb595d5e668ce28d95e3dee45345c
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch | 12 |
1 files changed, 6 insertions, 6 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 392fb5a7..73d838b6 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 @@ | |||
1 | From af02d2c093b870d3c8b751d0cb573a797f46ccb9 Mon Sep 17 00:00:00 2001 | 1 | From 99660440fb4e876fe6c008f37fb70fce9cb61b9b 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,18 +15,18 @@ 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 6aca13e..bd49d99 100644 | 18 | index 458f428..18b4f23 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 | @@ -70,8 +70,11 @@ config("zlib_arm_crc32_config") { | 21 | @@ -74,8 +74,11 @@ if (use_arm_neon_optimizations) { |
22 | # - ChromeOS has wrapper scripts that are borking the compiler flags. | 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_chromeos && !is_fuchsia)) { | 26 | if (is_clang && (!is_ios && !is_fuchsia)) { |
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" ] |
30 | + } | 30 | + } |
31 | if (is_android) { | 31 | if (is_android) { |
32 | defines += [ "ARMV8_OS_ANDROID" ] | 32 | defines += [ "ARMV8_OS_ANDROID" ] |