mozilla-fix-skia-aarch64.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Sat, 26 May 2018 18:04:18 +0200
branchfirefox60
changeset 1051 87c1625d07e2
parent 1049 08307c08d990
permissions -rw-r--r--
fix aarch64 startup crash

--- firefox-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp.orig	2018-05-14 13:23:26.001095058 +0200
+++ firefox-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp	2018-05-14 13:24:46.851416500 +0200
@@ -666,7 +666,7 @@ SI F approx_powf(F x, F y) {
 }
 
 SI F from_half(U16 h) {
-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
     return vcvt_f32_f16(h);
 
 #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
@@ -686,7 +686,7 @@ SI F from_half(U16 h) {
 }
 
 SI U16 to_half(F f) {
-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
     return vcvt_f16_f32(f);
 
 #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)