Skip to content

Commit 527ff15

Browse files
committed
chromium-ozone-wayland: Exclude CRC32 for aarch64
If you have a aarch64 machine with armv8.1-a+ and one uses clang then feel free to remove this patch, otherwise this is required to fix build failures in zlib Signed-off-by: Khem Raj <[email protected]>
1 parent bae41e5 commit 527ff15

File tree

2 files changed

+31
-0
lines changed

2 files changed

+31
-0
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
Upstream-status: Inappropriate [embedded specific]
2+
3+
Signed-off-by: Maksim Sisov <[email protected]>
4+
---
5+
From f59799ef353e4221e61ec565b4b03c1fc1ea127b Mon Sep 17 00:00:00 2001
6+
From: Maksim Sisov <[email protected]>
7+
Date: Mon, 17 Sep 2018 09:54:31 +0300
8+
Subject: [PATCH] Exclude CRC32 define for the Renesas M3 board
9+
10+
The CRC32 APIs are optional for armv8-a. They became mandatory since
11+
armv8.1-a. The Renesas board doesn't have them implemented. Thus,
12+
just disable them.
13+
---
14+
third_party/zlib/BUILD.gn | 2 +-
15+
1 file changed, 1 insertion(+), 1 deletion(-)
16+
17+
Index: chromium-ozone-wayland-dev-71.0.3545.0.r589108.igalia.1/third_party/zlib/BUILD.gn
18+
===================================================================
19+
--- chromium-ozone-wayland-dev-71.0.3545.0.r589108.igalia.1.orig/third_party/zlib/BUILD.gn
20+
+++ chromium-ozone-wayland-dev-71.0.3545.0.r589108.igalia.1/third_party/zlib/BUILD.gn
21+
@@ -65,9 +65,6 @@ config("zlib_arm_crc32_config") {
22+
# TODO(cavalcantii): crbug.com/810125.
23+
if (!is_ios && !is_chromeos && !is_fuchsia) {
24+
defines = []
25+
- if (current_cpu == "arm64") {
26+
- defines = [ "CRC32_ARMV8_CRC32" ]
27+
- }
28+
if (is_android) {
29+
defines += [ "ARMV8_OS_ANDROID" ]
30+
} else if (is_linux || is_chromeos) {

recipes-browser/chromium/chromium-ozone-wayland_71.0.3545.0.r589108.igalia.1.bb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ SRC_URI += " \
99
file://0001-ozone-wayland-Fix-fpermissive-problem-for-GCC.patch \
1010
file://oe-clang-fixes.patch \
1111
file://aarch64-skia-build-fix.patch \
12+
file://0001-Exclude-CRC32-define-for-the-Renesas-M3-board.patch \
1213
"
1314

1415
REQUIRED_DISTRO_FEATURES = "wayland"

0 commit comments

Comments
 (0)