Index: include/core/SkPreConfig.h |
diff --git a/include/core/SkPreConfig.h b/include/core/SkPreConfig.h |
index 11cb2235a71999c9f7cf45123776413acea21429..a59ead1efba2ce84daba71f14c4fe8842ebf21ed 100644 |
--- a/include/core/SkPreConfig.h |
+++ b/include/core/SkPreConfig.h |
@@ -195,13 +195,8 @@ |
////////////////////////////////////////////////////////////////////// |
-/** |
- * THUMB is the only known config where we avoid small branches in |
- * favor of more complex math. |
- */ |
-#if !(defined(__arm__) && defined(__thumb__)) |
- #define SK_CPU_HAS_CONDITIONAL_INSTR |
-#endif |
+// TODO(mtklein): propagate this through the codebase and remove |
+#define SK_CPU_HAS_CONDITIONAL_INSTR |
////////////////////////////////////////////////////////////////////// |