SK_CPU_ARM --> SK_CPU_ARM32

include/core/SkMath.h

 
 /*
  * Copyright 2006 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 SkMath_DEFINED
@@ skipping 66 matching lines @@
 
         static inline int SkCLZ(uint32_t mask) {
             if (mask) {
                 DWORD index;
                 _BitScanReverse(&index, mask);
                 return index ^ 0x1F;
             } else {
                 return 32;
             }
         }
-    #elif defined(SK_CPU_ARM) || defined(__GNUC__) || defined(__clang__)
+    #elif defined(SK_CPU_ARM32) || defined(__GNUC__) || defined(__clang__)
         static inline int SkCLZ(uint32_t mask) {
             // __builtin_clz(0) is undefined, so we have to detect that case.
             return mask ? __builtin_clz(mask) : 32;
         }
     #else
         #define SkCLZ(x)    SkCLZ_portable(x)
     #endif
 #endif
 
 /**
@@ skipping 104 matching lines @@
     SkASSERT(b <= 32767);
     unsigned prod = SkMulS16(a, b) + 128;
     return (prod + (prod >> 8)) >> 8;
 }
 
 /**
  * Stores numer/denom and numer%denom into div and mod respectively.
  */
 template <typename In, typename Out>
 inline void SkTDivMod(In numer, In denom, Out* div, Out* mod) {
-#ifdef SK_CPU_ARM
+#ifdef SK_CPU_ARM32
     // If we wrote this as in the else branch, GCC won't fuse the two into one
     // divmod call, but rather a div call followed by a divmod.  Silly!  This
     // version is just as fast as calling __aeabi_[u]idivmod manually, but with
     // prettier code.
     //
     // This benches as around 2x faster than the code in the else branch.
     const In d = numer/denom;
     *div = static_cast<Out>(d);
     *mod = static_cast<Out>(numer-d*denom);
 #else
     // On x86 this will just be a single idiv.
     *div = static_cast<Out>(numer/denom);
     *mod = static_cast<Out>(numer%denom);
-#endif  // SK_CPU_ARM
+#endif
 }
 
 #endif