From d49173afc862e0a33133190c392cd5a221a7e51f Mon Sep 17 00:00:00 2001 From: "mtklein@google.com" Date: Mon, 29 Jul 2013 20:53:14 +0000 Subject: 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 | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'include/core') diff --git a/include/core/SkPreConfig.h b/include/core/SkPreConfig.h index 11cb2235a7..a59ead1efb 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 ////////////////////////////////////////////////////////////////////// -- cgit v1.2.3