one more thing to try before rebaselining android

include/core/SkFixed.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 SkFixed_DEFINED
@@ skipping 172 matching lines @@
     }
     inline SkFixed SkFixedSquare_longlong(SkFixed value)
     {
         return (SkFixed)((SkLONGLONG)value * value >> 16);
     }
     #define SkFixedMul(a,b)     SkFixedMul_longlong(a,b)
     #define SkFractMul(a,b)     SkFractMul_longlong(a,b)
     #define SkFixedSquare(a)    SkFixedSquare_longlong(a)
 #endif
 
-#if defined(SK_CPU_ARM) && !defined(__thumb__)
+#if defined(SK_CPU_ARM)
     /* This guy does not handle NaN or other obscurities, but is faster than
        than (int)(x*65536)
     */
     inline SkFixed SkFloatToFixed_arm(float x)
     {
         register int32_t y, z;
         asm("movs    %1, %3, lsl #1         \n"
             "mov     %2, #0x8E              \n"
             "sub     %1, %2, %1, lsr #24    \n"
             "mov     %2, %3, lsl #8         \n"
             "orr     %2, %2, #0x80000000    \n"
             "mov     %1, %2, lsr %1         \n"
+            "it cs                          \n"
             "rsbcs   %1, %1, #0             \n"
             : "=r"(x), "=&r"(y), "=&r"(z)
             : "r"(x)
             : "cc"
             );
         return y;
     }
     inline SkFixed SkFixedMul_arm(SkFixed x, SkFixed y)
     {
         register int32_t t;
@@ skipping 65 matching lines @@
 #define SkFixed48ToFixed(x)     ((SkFixed)((x) >> 32))
 #define SkFloatToFixed48(x)     ((SkFixed48)((x) * (65536.0f * 65536.0f * 65536.0f)))
 
 #ifdef SK_SCALAR_IS_FLOAT
     #define SkScalarToFixed48(x)    SkFloatToFixed48(x)
 #else
     #define SkScalarToFixed48(x)    SkFixedToFixed48(x)
 #endif
 
 #endif