From e9fdfb545d8e6af89f5b91cd55e44dfefc21d923 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 17 Jul 2012 12:13:56 +0000 Subject: [PATCH] remove Symbian (not needed) flag, and assume all CPUs *except* thumb have fast conditional instructions. git-svn-id: http://skia.googlecode.com/svn/trunk@4635 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/core/SkPreConfig.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/include/core/SkPreConfig.h b/include/core/SkPreConfig.h index 63fa815..2f29886 100644 --- a/include/core/SkPreConfig.h +++ b/include/core/SkPreConfig.h @@ -16,7 +16,7 @@ ////////////////////////////////////////////////////////////////////// -#if !defined(SK_BUILD_FOR_ANDROID) && !defined(SK_BUILD_FOR_ANDROID_NDK) && !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_PALM) && !defined(SK_BUILD_FOR_WINCE) && !defined(SK_BUILD_FOR_WIN32) && !defined(SK_BUILD_FOR_SYMBIAN) && !defined(SK_BUILD_FOR_UNIX) && !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_SDL) && !defined(SK_BUILD_FOR_BREW) +#if !defined(SK_BUILD_FOR_ANDROID) && !defined(SK_BUILD_FOR_ANDROID_NDK) && !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_PALM) && !defined(SK_BUILD_FOR_WINCE) && !defined(SK_BUILD_FOR_WIN32) && !defined(SK_BUILD_FOR_UNIX) && !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_SDL) && !defined(SK_BUILD_FOR_BREW) #ifdef __APPLE__ #include "TargetConditionals.h" @@ -144,8 +144,11 @@ ////////////////////////////////////////////////////////////////////// -#if (defined(__arm__) && !defined(__thumb__)) || defined(SK_BUILD_FOR_WINCE) || (defined(SK_BUILD_FOR_SYMBIAN) && !defined(__MARM_THUMB__)) - /* e.g. the ARM instructions have conditional execution, making tiny branches cheap */ +/** + * 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 -- 2.7.4