-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
First m75 beta release. Moved patches in dev m75 based to beta. Also added fix to reenable CRC32 on ARM for GCC, and upstream buildfix. Non relevant license changes: libpng, ffmpeg, icu, v8
- Loading branch information
Jose Dapena Paz
committed
Jun 4, 2019
1 parent
9fbc6c0
commit a6cd824
Showing
3 changed files
with
120 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
...es-browser/chromium/files/0001-libstdc-do-not-assume-unique_ptr-has-ostream-operato.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| From aeed4d1f15ce84a17ea0bc219e258dc4982b2368 Mon Sep 17 00:00:00 2001 | ||
| From: Jose Dapena Paz <jose.dapena@lge.com> | ||
| Date: Fri, 26 Apr 2019 20:07:05 +0000 | ||
| Subject: libstdc++: do not assume unique_ptr has ostream operator | ||
| MIME-Version: 1.0 | ||
| Content-Type: text/plain; charset=UTF-8 | ||
| Content-Transfer-Encoding: 8bit | ||
|
|
||
| CompositorFrameReportingController is using DCHECK_NE to compare | ||
| several unique_ptr. This is valid in libc++, but on libstdc++ unique_ptr | ||
| does not have an ostream operator. | ||
|
|
||
| Change-Id: I9f23ef17f02b9e107694ba493f6f8f3caf5cac4d | ||
| Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1584292 | ||
| Reviewed-by: Sunny Sachanandani <sunnyps@chromium.org> | ||
| Commit-Queue: José Dapena Paz <jose.dapena@lge.com> | ||
| Cr-Commit-Position: refs/heads/master@{#654570} | ||
|
|
||
| diff --git a/cc/scheduler/compositor_frame_reporting_controller.cc b/cc/scheduler/compositor_frame_reporting_controller.cc | ||
| index f1587ed158d4..1b17021fd229 100644 | ||
| --- a/cc/scheduler/compositor_frame_reporting_controller.cc | ||
| +++ b/cc/scheduler/compositor_frame_reporting_controller.cc | ||
| @@ -31,8 +31,8 @@ void CompositorFrameReportingController::WillBeginImplFrame() { | ||
|
|
||
| void CompositorFrameReportingController::WillBeginMainFrame() { | ||
| DCHECK(reporters_[PipelineStage::kBeginImplFrame]); | ||
| - DCHECK_NE(reporters_[PipelineStage::kBeginMainFrame], | ||
| - reporters_[PipelineStage::kBeginImplFrame]); | ||
| + DCHECK(reporters_[PipelineStage::kBeginMainFrame] != | ||
| + reporters_[PipelineStage::kBeginImplFrame]); | ||
| reporters_[PipelineStage::kBeginImplFrame]->StartStage( | ||
| "SendBeginMainFrameToCommit"); | ||
| AdvanceReporterStage(PipelineStage::kBeginImplFrame, | ||
| -- | ||
| 2.20.1 | ||
|
|
73 changes: 73 additions & 0 deletions
73
recipes-browser/chromium/files/0001-zlib-fix-ARMv8-CRC32-compilation-in-GCC.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| From 674607311bdf0b79b3435767de7068bc142dbc8e Mon Sep 17 00:00:00 2001 | ||
| From: Jose Dapena Paz <jose.dapena@lge.com> | ||
| Date: Tue, 4 Jun 2019 11:42:14 +0200 | ||
| Subject: zlib: fix ARMv8 CRC32 compilation in GCC | ||
|
|
||
| GCC compilation in ARM architectures with CRC32 extension was | ||
| broken, as the extension was guarded for clang. | ||
|
|
||
| For GCC we need to at least enforce armv8-a+crc architecture | ||
| so the extensions are available. We can also just include | ||
| arm_acle.h to get the required builtins. | ||
|
|
||
| Adapted from Vladislav Mukulov <vladislav.mukulov@lge.com> | ||
| original patch. | ||
|
|
||
| Bug: 819294 | ||
| Change-Id: Ifa5cf64318f88220052c44126db90bef999b7113 | ||
|
|
||
| diff --git a/third_party/zlib/BUILD.gn b/third_party/zlib/BUILD.gn | ||
| index 1a9cd3b827b3..aa5b1e748f73 100644 | ||
| --- a/third_party/zlib/BUILD.gn | ||
| +++ b/third_party/zlib/BUILD.gn | ||
| @@ -89,7 +89,7 @@ if (use_arm_neon_optimizations) { | ||
| source_set("zlib_arm_crc32") { | ||
| visibility = [ ":*" ] | ||
|
|
||
| - if (is_clang && !is_ios) { | ||
| + if (!is_ios) { | ||
| include_dirs = [ "." ] | ||
|
|
||
| if (is_android) { | ||
| @@ -101,6 +101,8 @@ if (use_arm_neon_optimizations) { | ||
| } else { | ||
| assert(false, "CPU detection requires the Android NDK") | ||
| } | ||
| + } else if (!is_win && !is_clang) { | ||
| + cflags_c = [ "-march=armv8-a+crc" ] | ||
| } | ||
|
|
||
| sources = [ | ||
| diff --git a/third_party/zlib/crc32_simd.c b/third_party/zlib/crc32_simd.c | ||
| index 03698adf7523..2a793f39f8e3 100644 | ||
| --- a/third_party/zlib/crc32_simd.c | ||
| +++ b/third_party/zlib/crc32_simd.c | ||
| @@ -161,6 +161,7 @@ uint32_t ZLIB_INTERNAL crc32_sse42_simd_( /* SSE4.2+PCLMUL */ | ||
| * TODO: implement a version using the PMULL instruction. | ||
| */ | ||
|
|
||
| +#if defined(__clang__) | ||
| /* CRC32 intrinsics are #ifdef'ed out of arm_acle.h unless we build with an | ||
| * armv8 target, which is incompatible with ThinLTO optimizations on Android. | ||
| * (Namely, mixing and matching different module-level targets makes ThinLTO | ||
| @@ -187,6 +188,11 @@ uint32_t ZLIB_INTERNAL crc32_sse42_simd_( /* SSE4.2+PCLMUL */ | ||
| #define TARGET_ARMV8_WITH_CRC __attribute__((target("armv8-a,crc"))) | ||
| #endif | ||
|
|
||
| +#else | ||
| +#include <arm_acle.h> | ||
| +#define TARGET_ARMV8_WITH_CRC | ||
| +#endif | ||
| + | ||
| TARGET_ARMV8_WITH_CRC | ||
| uint32_t ZLIB_INTERNAL armv8_crc32_little(unsigned long crc, | ||
| const unsigned char *buf, | ||
| @@ -248,5 +254,4 @@ Pos ZLIB_INTERNAL insert_string_arm(deflate_state *const s, const Pos str) | ||
| return ret; | ||
| } | ||
|
|
||
| - | ||
| #endif | ||
| -- | ||
| 2.20.1 | ||
|
|