diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch deleted file mode 100644 index 5da3c36f..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | From 2eab9281d34bf53fd5a4b58184f9e165e27f9eaf Mon Sep 17 00:00:00 2001 | ||
2 | From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> | ||
3 | Date: Thu, 8 Mar 2018 15:39:55 +0100 | ||
4 | Subject: [PATCH] chromium: aarch64 skia build fix | ||
5 | |||
6 | Upstream-Status: Inappropriate | ||
7 | |||
8 | GCC (tested rocko's 7.3.0) cannot find these intrinsics and the build fails: | ||
9 | |||
10 | ../../third_party/skia/src/opts/SkRasterPipeline_opts.h: In function 'neon::F neon::from_half(neon::U16)': | ||
11 | ../../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 ' | ||
12 | float32x4_t vcvt_f32_f16(float16x4_t)' | ||
13 | return vcvt_f32_f16(h); | ||
14 | ^ | ||
15 | ../../third_party/skia/src/opts/SkRasterPipeline_opts.h: In function 'neon::U16 neon::to_half(neon::F)': | ||
16 | ../../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 | ||
17 | _f16_f32(float32x4_t)' | ||
18 | return vcvt_f16_f32(f); | ||
19 | ^ | ||
20 | |||
21 | Upstream seems to have had similar issues according to | ||
22 | https://skia-review.googlesource.com/c/skia/+/84222, but there is no fix at the | ||
23 | moment. | ||
24 | |||
25 | Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> | ||
26 | --- | ||
27 | .../skia/src/opts/SkRasterPipeline_opts.h | 17 ++--------------- | ||
28 | 1 file changed, 2 insertions(+), 15 deletions(-) | ||
29 | |||
30 | diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h | ||
31 | index 831f5b3bb03..bb9377c3641 100644 | ||
32 | --- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h | ||
33 | +++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h | ||
34 | @@ -986,13 +986,7 @@ SI F approx_powf(F x, F y) { | ||
35 | } | ||
36 | |||
37 | SI F from_half(U16 h) { | ||
38 | -#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \ | ||
39 | - && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. | ||
40 | - __fp16 fp16; | ||
41 | - memcpy(&fp16, &h, sizeof(U16)); | ||
42 | - return float(fp16); | ||
43 | - | ||
44 | -#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) | ||
45 | +#if defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) | ||
46 | return _mm256_cvtph_ps(h); | ||
47 | |||
48 | #else | ||
49 | @@ -1009,14 +1003,7 @@ SI F from_half(U16 h) { | ||
50 | } | ||
51 | |||
52 | SI U16 to_half(F f) { | ||
53 | -#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \ | ||
54 | - && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. | ||
55 | - __fp16 fp16 = __fp16(f); | ||
56 | - U16 u16; | ||
57 | - memcpy(&u16, &fp16, sizeof(U16)); | ||
58 | - return u16; | ||
59 | - | ||
60 | -#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) | ||
61 | +#if defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) | ||
62 | return _mm256_cvtps_ph(f, _MM_FROUND_CUR_DIRECTION); | ||
63 | |||
64 | #else | ||