From 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf Mon Sep 17 00:00:00 2001 From: takeshi_hoshina Date: Mon, 2 Nov 2020 11:07:33 +0900 Subject: basesystem-jj recipes --- .../0006-chromium-aarch64-skia-build-fix.patch | 64 ++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 external/meta-qt5/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch (limited to 'external/meta-qt5/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch') diff --git a/external/meta-qt5/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch b/external/meta-qt5/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch new file mode 100644 index 00000000..6a659ae9 --- /dev/null +++ b/external/meta-qt5/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch @@ -0,0 +1,64 @@ +From 2ce7742c9dfde9ccbf2ede0db6359beb18c49189 Mon Sep 17 00:00:00 2001 +From: Raphael Kubo da Costa +Date: Thu, 8 Mar 2018 15:39:55 +0100 +Subject: [PATCH] chromium: aarch64 skia build fix + +Upstream-Status: Inappropriate + +GCC (tested rocko's 7.3.0) cannot find these intrinsics and the build fails: + +../../third_party/skia/src/opts/SkRasterPipeline_opts.h: In function 'neon::F neon::from_half(neon::U16)': +../../third_party/skia/src/opts/SkRasterPipeline_opts.h:657:26: error: cannot convert 'neon::U16 {aka short unsigned int}' to 'float16x4_ t {aka __vector(4) __ fp16}' for argument '1' to ' +float32x4_t vcvt_f32_f16(float16x4_t)' + return vcvt_f32_f16(h); + ^ +../../third_party/skia/src/opts/SkRasterPipeline_opts.h: In function 'neon::U16 neon::to_half(neon::F)': +../../third_party/skia/src/opts/SkRasterPipeline_opts.h:677:26: error: cannot convert 'neon::F {aka float}' to 'float32x4_t {aka __vector (4) float}' for argum ent '1' to 'float16x4_t vcvt +_f16_f32(float32x4_t)' + return vcvt_f16_f32(f); + ^ + +Upstream seems to have had similar issues according to +https://skia-review.googlesource.com/c/skia/+/84222, but there is no fix at the +moment. + +Signed-off-by: Raphael Kubo da Costa +--- + .../skia/src/opts/SkRasterPipeline_opts.h | 17 ++--------------- + 1 file changed, 2 insertions(+), 15 deletions(-) + +diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h +index b59506dcd6d..b8f22c948c0 100644 +--- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h ++++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h +@@ -972,13 +972,7 @@ SI F approx_powf(F x, F y) { + } + + SI F from_half(U16 h) { +-#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \ +- && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. +- __fp16 fp16; +- memcpy(&fp16, &h, sizeof(U16)); +- return float(fp16); +- +-#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) ++#if defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) + return _mm256_cvtph_ps(h); + + #else +@@ -995,14 +989,7 @@ SI F from_half(U16 h) { + } + + SI U16 to_half(F f) { +-#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \ +- && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. +- __fp16 fp16 = __fp16(f); +- U16 u16; +- memcpy(&u16, &fp16, sizeof(U16)); +- return u16; +- +-#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) ++#if defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) + return _mm256_cvtps_ph(f, _MM_FROUND_CUR_DIRECTION); + + #else -- cgit 1.2.3-korg