fold SK_CPU_HAS_CONDITION_INSTR through as always defined

src/core/SkMath.cpp

 /*
  * Copyright 2008 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.
  */
 
 #include "SkMathPriv.h"
 #include "SkCordic.h"
 #include "SkFloatBits.h"
 #include "SkFloatingPoint.h"
 #include "Sk64.h"
 #include "SkScalar.h"
 
 #ifdef SK_SCALAR_IS_FLOAT
     const uint32_t gIEEENotANumber = 0x7FFFFFFF;
     const uint32_t gIEEEInfinity = 0x7F800000;
     const uint32_t gIEEENegativeInfinity = 0xFF800000;
 #endif
 
 #define sub_shift(zeros, x, n)  \
     zeros -= n;                 \
     x >>= n
 
 int SkCLZ_portable(uint32_t x) {
     if (x == 0) {
         return 32;
     }
 
-#ifdef SK_CPU_HAS_CONDITIONAL_INSTR
     int zeros = 31;
     if (x & 0xFFFF0000) {
         sub_shift(zeros, x, 16);
     }
     if (x & 0xFF00) {
         sub_shift(zeros, x, 8);
     }
     if (x & 0xF0) {
         sub_shift(zeros, x, 4);
     }
     if (x & 0xC) {
         sub_shift(zeros, x, 2);
     }
     if (x & 0x2) {
         sub_shift(zeros, x, 1);
     }
-#else
-    int zeros = ((x >> 16) - 1) >> 31 << 4;
-    x <<= zeros;
-
-    int nonzero = ((x >> 24) - 1) >> 31 << 3;
-    zeros += nonzero;
-    x <<= nonzero;
-
-    nonzero = ((x >> 28) - 1) >> 31 << 2;
-    zeros += nonzero;
-    x <<= nonzero;
-
-    nonzero = ((x >> 30) - 1) >> 31 << 1;
-    zeros += nonzero;
-    x <<= nonzero;
-
-    zeros += (~x) >> 31;
-#endif
 
     return zeros;
 }
 
 int32_t SkMulDiv(int32_t numer1, int32_t numer2, int32_t denom) {
     SkASSERT(denom);
 
     Sk64 tmp;
     tmp.setMul(numer1, numer2);
     tmp.div(denom, Sk64::kTrunc_DivOption);
@@ skipping 452 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkFixed SkFixedTan(SkFixed radians) { return SkCordicTan(radians); }
 SkFixed SkFixedASin(SkFixed x) { return SkCordicASin(x); }
 SkFixed SkFixedACos(SkFixed x) { return SkCordicACos(x); }
 SkFixed SkFixedATan2(SkFixed y, SkFixed x) { return SkCordicATan2(y, x); }
 SkFixed SkFixedExp(SkFixed x) { return SkCordicExp(x); }
 SkFixed SkFixedLog(SkFixed x) { return SkCordicLog(x); }