summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2019-02-22 13:36:16 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2019-02-22 13:36:16 +0200
commitc8c8613d679241b2ceac39e248a3062cc2e56ccd (patch)
treec1a47ac8b8a04a80ac98b38015f58254980fffb9 /recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch
parent62312010bba98e2b93f24b8b9e06736f9199df9e (diff)
parentfb71293f257c6fd02ccc06765a96dbf11d4569a0 (diff)
downloadmeta-qt5-c8c8613d679241b2ceac39e248a3062cc2e56ccd.tar.gz
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.12
* qtyocto/upstream/master: fb71293 qtwebengine: drop 0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch 38ec325 qwt-qt5: upgrade 6.1.3 -> 6.1.4 e2d9845 qwt-qt5: Fix multilib install 5be2654 qtwebengine: Fix build with clang/libc++ on aarch64/arm cb1b472 qtbase: Export host compiler and linker 6d919b0 qt5-plugin-generic-vboxtouch: Fix build with clang/libc++ 6713882 maliit-framework,maliit-plugins: Fix build with libc++ 9a83f2d qtconnectivity: Fix build with clang/libc++ 080cc29 qtwayland: workaround upstream bug: install missing headers manually f6f61b0 gstreamer1.0-plugins-good: fix qt5 dependency d055d6a qtbase: Update the PACKAGECONFIG_KDE to enable more 82abc2b qtbase: fix incomplete recipe changes from previous commit f4c8cef qtbase: Fix qtopcua issue on bigendian systems be8bc9f qtwebkit: Disable JIT for mips64 Conflicts: recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtwayland_git.bb Change-Id: I4ec16ed288fda7270c59abe70d337e7016f547c7
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.patch31
1 files changed, 31 insertions, 0 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
new file mode 100644
index 00000000..e0c0dbb6
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch
@@ -0,0 +1,31 @@
1From 432514e835f5bfefc2bb88adbb2ba468e9c07beb Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 5 Feb 2019 14:32:20 -0800
4Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm
5
6This fixes build issues during cross compiling for linux using clang
7
8Fixes
9src/3rdparty/chromium/third_party/zlib/crc32_simd.c:184: undefined reference to `__crc32d'
10
11Upstream-Status: Pending
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 chromium/third_party/zlib/BUILD.gn | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-)
16
17--- a/chromium/third_party/zlib/BUILD.gn
18+++ b/chromium/third_party/zlib/BUILD.gn
19@@ -70,8 +70,11 @@ config("zlib_arm_crc32_config") {
20 # - ChromeOS has wrapper scripts that are borking the compiler flags.
21 # - Fuchsia just added a syscall for feature detection.
22 # TODO(cavalcantii): crbug.com/810125.
23+ defines = []
24 if (!is_ios && !is_chromeos && !is_fuchsia) {
25- defines = [ "CRC32_ARMV8_CRC32" ]
26+ if (current_cpu == "arm64") {
27+ defines += [ "CRC32_ARMV8_CRC32" ]
28+ }
29 if (is_android) {
30 defines += [ "ARMV8_OS_ANDROID" ]
31 } else if (is_linux || is_chromeos) {