| Index: src/opts/SkBlitMask_opts_arm.cpp
|
| diff --git a/src/opts/SkBlitMask_opts_arm.cpp b/src/opts/SkBlitMask_opts_arm.cpp
|
| index 2bf760313c1edaa09072bab379d6bb01f33c6362..5cac6c8fc75b4d667c2486b9c8dd10ffccd8daba 100644
|
| --- a/src/opts/SkBlitMask_opts_arm.cpp
|
| +++ b/src/opts/SkBlitMask_opts_arm.cpp
|
| @@ -11,6 +11,8 @@ SkBlitMask::ColorProc SkBlitMask::PlatformColorProcs(SkBitmap::Config dstConfig,
|
| #if SK_ARM_NEON_IS_NONE
|
| return NULL;
|
| #else
|
| +/* ** This has been disabled until we can diagnose and fix the SIGILL generated
|
| + ** in the NEON code. See http://skbug.com/2067 for details.
|
| #if SK_ARM_NEON_IS_DYNAMIC
|
| if (!sk_cpu_arm_has_neon()) {
|
| return NULL;
|
| @@ -20,6 +22,7 @@ SkBlitMask::ColorProc SkBlitMask::PlatformColorProcs(SkBitmap::Config dstConfig,
|
| (SkMask::kA8_Format == maskFormat)) {
|
| return D32_A8_Factory_neon(color);
|
| }
|
| +*/
|
| #endif
|
|
|
| // We don't need to handle the SkMask::kLCD16_Format case as the default
|
|
|