Revert of Specialize Sk2d for ARM64

src/core/SkUtilsArm.h

 
 /*
  * Copyright 2012 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkUtilsArm_DEFINED
 #define SkUtilsArm_DEFINED
 
 #include "SkUtils.h"
 
 // Define SK_ARM_NEON_MODE to one of the following values
 // corresponding respectively to:
 // - No ARM Neon support at all  (not targetting ARMv7-A, or don't have NEON)
 // - Full ARM Neon support (i.e. assume the CPU always supports it)
 // - Optional ARM Neon support (i.e. probe CPU at runtime)
 //
 #define SK_ARM_NEON_MODE_NONE     0
 #define SK_ARM_NEON_MODE_ALWAYS   1
 #define SK_ARM_NEON_MODE_DYNAMIC  2
 
-#if defined(SK_ARM_HAS_OPTIONAL_NEON)
+#if defined(SK_CPU_ARM32) && defined(SK_ARM_HAS_OPTIONAL_NEON)
 #  define SK_ARM_NEON_MODE  SK_ARM_NEON_MODE_DYNAMIC
-#elif defined(SK_ARM_HAS_NEON)
+#elif defined(SK_CPU_ARM32) && defined(SK_ARM_HAS_NEON) || defined(SK_CPU_ARM64)
 #  define SK_ARM_NEON_MODE  SK_ARM_NEON_MODE_ALWAYS
 #else
 #  define SK_ARM_NEON_MODE  SK_ARM_NEON_MODE_NONE
 #endif
 
 // Convenience test macros, always defined as 0 or 1
 #define SK_ARM_NEON_IS_NONE    (SK_ARM_NEON_MODE == SK_ARM_NEON_MODE_NONE)
 #define SK_ARM_NEON_IS_ALWAYS  (SK_ARM_NEON_MODE == SK_ARM_NEON_MODE_ALWAYS)
 #define SK_ARM_NEON_IS_DYNAMIC (SK_ARM_NEON_MODE == SK_ARM_NEON_MODE_DYNAMIC)
 
@@ skipping 41 matching lines @@
 //
 #if SK_ARM_NEON_IS_NONE
 #  define SK_ARM_NEON_WRAP(x)   (x)
 #elif SK_ARM_NEON_IS_ALWAYS
 #  define SK_ARM_NEON_WRAP(x)   (x ## _neon)
 #elif SK_ARM_NEON_IS_DYNAMIC
 #  define SK_ARM_NEON_WRAP(x)   (sk_cpu_arm_has_neon() ? x ## _neon : x)
 #endif
 
 #endif // SkUtilsArm_DEFINED