diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-14 15:06:28 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-15 10:10:47 +0300 |
commit | 63dec9bbd826a4afafa7177aaa3439467f25d80a (patch) | |
tree | afcff4f6d8c72cb4a51f1e27cda2a65aeb55d712 /recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch | |
parent | 79791026ff20539180027de0d796f8acd55bc7bf (diff) | |
parent | 53500ade778bac6e1733db43fc41c290d7b9d16b (diff) | |
download | meta-qt5-63dec9bbd826a4afafa7177aaa3439467f25d80a.tar.gz |
Merge remote-tracking branch 'origin/upstream/master' into 5.13
* origin/upstream/master:
qtdeclarative: Use qmlcachegen provided by OE instead of system one.
qtbase-native: Always use qt provided doubleconversion library.
qttools: Enable clang support when using clang
qt5-creator: update to v4.9.2
maliit-framework-qt5: Fix build when ptest is enabled
qtwebengine: Fix build on aarch64
qtwebengine: refresh the patches to apply
qtremoteobjects: Use OE_PATH_EXTERNAL_HOST_BINS to enable cmake to find repc
qt5: Upgrade to Qt 5.13.0
Allow enabling gui for native and nativesdk
qt5everywheredemo: update HOMEPAGE
qtconnectivity,qtsystems: Account for bluez4 from oe-core
gdb_%.bbappend: Avoid PAK archive (application/x-pak)
Change-Id: I24e0b7b95920df3722f84a1f3a2e74546dc74810
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 | 33 |
1 files changed, 33 insertions, 0 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 new file mode 100644 index 00000000..e54cdc6b --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 3cacf1082e11c8047a42eb74dfa0e34f37995d92 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 5 Feb 2019 14:32:20 -0800 | ||
4 | Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm | ||
5 | |||
6 | This fixes build issues during cross compiling for linux using clang | ||
7 | |||
8 | Fixes | ||
9 | src/3rdparty/chromium/third_party/zlib/crc32_simd.c:184: undefined reference to `__crc32d' | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | chromium/third_party/zlib/BUILD.gn | 5 ++++- | ||
15 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn | ||
18 | index 458f428b7ce..18b4f23f769 100644 | ||
19 | --- a/chromium/third_party/zlib/BUILD.gn | ||
20 | +++ b/chromium/third_party/zlib/BUILD.gn | ||
21 | @@ -74,8 +74,11 @@ if (use_arm_neon_optimizations) { | ||
22 | # implement the CRC32* instructions. These are optional in ARMv8.0." | ||
23 | # - Fuchsia just added a syscall for feature detection. | ||
24 | # TODO(cavalcantii): crbug.com/810125. | ||
25 | + defines = [] | ||
26 | if (is_clang && (!is_ios && !is_fuchsia)) { | ||
27 | - defines = [ "CRC32_ARMV8_CRC32" ] | ||
28 | + if (current_cpu == "arm64") { | ||
29 | + defines += [ "CRC32_ARMV8_CRC32" ] | ||
30 | + } | ||
31 | if (is_android) { | ||
32 | defines += [ "ARMV8_OS_ANDROID" ] | ||
33 | } else if (is_linux || is_chromeos) { | ||