meta-html5-framework/recipes-wam/chromium/chromium68/0001-skia-Build-skcms-with-mfp16-format-ieee-on-GCC-ARM-b.patch

   1 From a01fb357a1ce755834779c905a14c3376e1a6239 Mon Sep 17 00:00:00 2001
   2 From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
   3 Date: Tue, 17 Jul 2018 11:56:52 +0000
   4 Subject: [PATCH] skia: Build skcms with -mfp16-format=ieee on GCC ARM builds
   5
   6 skcms' Transform_inl.h assumes support for 16-bit floating point in the
   7 __ARM_FP macro means the __fp16 (and corresponding SIMD data type) is
   8 present.
   9
  10 While this is currently true for LLVM, which always sets the equivalent of
  11 GCC's -mfp16-format=ieee internally on ARM builds, GCC explicitly needs that
  12 option to be specified in order to enable support for __fp16. Doing so
  13 allows GCC ARM builds to proceed without the following error:
  14
  15     ../../third_party/skia/third_party/skcms/src/Transform_inl.h: In function 'F_from_Half_':
  16     ../../third_party/skia/third_party/skcms/src/Transform_inl.h:101:72: error: 'float16x4_t' undeclared (first use in this function); did you mean 'float32x4_t'?
  17          SI ATTR F   NS(F_from_Half_(U16 half)) { return      vcvt_f32_f16((float16x4_t)half); }
  18                                                                             ^~~~~~~~~~~
  19                                                                             float32x4_t
  20     ../../third_party/skia/third_party/skcms/src/Transform_inl.h:101:72: note: each undeclared identifier is reported only once for each function it appears in
  21     ../../third_party/skia/third_party/skcms/src/Transform_inl.h:101:84: error: expected ')' before 'half'
  22          SI ATTR F   NS(F_from_Half_(U16 half)) { return      vcvt_f32_f16((float16x4_t)half); }
  23                                                                                         ^~~~
  24                                                                                         )
  25     ../../third_party/skia/third_party/skcms/src/Transform_inl.h: In function 'Half_from_F_':
  26     ../../third_party/skia/third_party/skcms/src/Transform_inl.h:102:5: error: can't convert a value of type 'int' to vector type '__vector(4) short unsigned int' which has different size
  27          SI ATTR U16 NS(Half_from_F_(F      f)) { return (U16)vcvt_f16_f32(                f); }
  28          ^~
  29
  30 Bug: 819294
  31 Change-Id: Ib7417fb9bdc6bd93553084053ba69f9d3409b112
  32 Reviewed-on: https://chromium-review.googlesource.com/1138251
  33 Reviewed-by: Florin Malita <fmalita@chromium.org>
  34 Commit-Queue: Raphael Kubo da Costa (CET) <raphael.kubo.da.costa@intel.com>
  35 Cr-Commit-Position: refs/heads/master@{#575608}
  36 ---
  37  src/skia/BUILD.gn | 7 +++++++
  38  1 file changed, 7 insertions(+)
  39
  40 diff --git a/src/skia/BUILD.gn b/src/skia/BUILD.gn
  41 index 294b9ac16..6efada326 100644
  42 --- a/src/skia/BUILD.gn
  43 +++ b/src/skia/BUILD.gn
  44 @@ -242,6 +242,13 @@ source_set("skcms") {
  45      ]
  46    }
  47
  48 +  # LLVM automatically sets the equivalent of GCC's -mfp16-format=ieee on ARM
  49 +  # builds by default, while GCC itself does not. We need it to enable support
  50 +  # for half-precision floating point data types used by SKCMS on ARM.
  51 +  if (is_linux && !is_clang && current_cpu == "arm") {
  52 +    cflags += [ "-mfp16-format=ieee" ]
  53 +  }
  54 +
  55    public = [
  56      "//third_party/skia/third_party/skcms/skcms.h",
  57    ]
  58 --
  59 2.11.0
  60