commit d49173afc862e0a33133190c392cd5a221a7e51f
author mtklein@google.com <mtklein@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jul 29 20:53:14 2013 +0000
committer mtklein@google.com <mtklein@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jul 29 20:53:14 2013 +0000
tree 947e56c2609077feaefbbc3856ed37e9e9665c6c
parent 069aea7f2ca9698dddfc2679e26ce61519b91b55

always have conditional instruction

BUG=
R=djsollen@google.com

Review URL: https://codereview.chromium.org/21155002

git-svn-id: http://skia.googlecode.com/svn/trunk@10422 2bbb7eff-a529-9590-31e7-b0007b416f81

include/core/SkPreConfig.h

diff --git a/include/core/SkPreConfig.h b/include/core/SkPreConfig.h
index 11cb223..a59ead1 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
 
 //////////////////////////////////////////////////////////////////////