90fab27
--- a/gfx/skia/skia/modules/skcms/src/Transform_inl.h.aarch64-skia	2023-06-02 03:15:22.000000000 +0200
90fab27
+++ b/gfx/skia/skia/modules/skcms/src/Transform_inl.h	2023-06-05 10:18:46.942777997 +0200
90fab27
@@ -189,8 +189,6 @@ SI F F_from_Half(U16 half) {
746e53f
 SI U16 Half_from_F(F f) {
91d1df5
 #if defined(USING_NEON_FP16)
91d1df5
     return bit_pun<U16>(f);
91d1df5
-#elif defined(USING_NEON_F16C)
91d1df5
-    return (U16)vcvt_f16_f32(f);
91d1df5
 #elif defined(USING_AVX512F)
746e53f
     return (U16)_mm512_cvtps_ph((__m512 )f, _MM_FROUND_CUR_DIRECTION );
91d1df5
 #elif defined(USING_AVX_F16C)
90fab27
--- a/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia	2023-06-05 10:18:46.941777963 +0200
90fab27
+++ b/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h	2023-06-05 10:20:44.924843847 +0200
90fab27
@@ -1128,7 +1128,7 @@ SI F from_half(U16 h) {
90fab27
 }
90fab27
 
90fab27
 SI U16 to_half(F f) {
90fab27
-#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
90fab27
+#if 0 //defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
90fab27
     && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
90fab27
     return sk_bit_cast<U16>(vcvt_f16_f32(f));
90fab27