summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2019-07-03 15:01:08 +0300
committerMartin Jansa <Martin.Jansa@gmail.com>2019-07-15 13:58:40 +0000
commit8d2e1b401987d743ebdf964927c03f41e8f60328 (patch)
treed002364505c85ecb0a508dc359156c4444ffeaed /recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch
parent8da88b098fae46e13cd7cbaf8d65dd0e99b4e0e5 (diff)
downloadmeta-qt5-8d2e1b401987d743ebdf964927c03f41e8f60328.tar.gz
qt5: Upgrade to Qt 5.13.0
Update recipes for Qt 5.13.0, add new recipes for Qt modules qtcoap and qtlottie, and remove qtcanvas3d. Signed-off-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.patch6
1 files changed, 3 insertions, 3 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 377795f8..9a080207 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
@@ -18,12 +18,12 @@ diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUIL
18index 05907b481ac..dbc4be143cd 100644 18index 05907b481ac..dbc4be143cd 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_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" ]