From 1cc652f5525f458b0b4ceb12af24bf5a4367db32 Mon Sep 17 00:00:00 2001

From: Nicolas Dufresne <nicolas.dufresne@collabora.com>

Date: Tue, 23 May 2017 13:09:48 -0400

Subject: [PATCH] Bug 1353817: Include SkNx_neon.h for ARM64 too

This fixes build errors as arm_neon.h was missing along with some

missing converters.

---

 gfx/skia/skia/src/core/SkNx.h | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gfx/skia/skia/src/core/SkNx.h b/gfx/skia/skia/src/core/SkNx.h

index 6bca856..b0427aa 100644

--- a/gfx/skia/skia/src/core/SkNx.h

+++ b/gfx/skia/skia/src/core/SkNx.h

@@ -299,7 +299,7 @@ typedef SkNx<4, uint32_t> Sk4u;

 // Include platform specific specializations if available.

 #if !defined(SKNX_NO_SIMD) && SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2

     #include "../opts/SkNx_sse.h"

-#elif !defined(SKNX_NO_SIMD) && defined(SK_ARM_HAS_NEON)

+#elif !defined(SKNX_NO_SIMD) && (defined(SK_ARM_HAS_NEON) || defined(SK_CPU_ARM64))

     #include "../opts/SkNx_neon.h"

 #else

-- 

2.9.4