Bug 1342707 - Don't use Init_neon if runtime detection of neon is not enabled. r=lsalzman, a=jcristau
authorMike Hommey <mh+mozilla@glandium.org>
Sun, 26 Feb 2017 08:12:18 +0900
changeset 376486 a5a59d3ea53d9152338fd405b96383f130654ff7
parent 376485 ff266510b1c97d4f7e619118213e276f1972eb03
child 376487 397bf222b4d46cdac5fb4c2531cdc9d11f0a96f4
push id6996
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 20:48:21 +0000
treeherdermozilla-beta@d89512dab048 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslsalzman, jcristau
bugs1342707
milestone53.0a2
Bug 1342707 - Don't use Init_neon if runtime detection of neon is not enabled. r=lsalzman, a=jcristau
gfx/skia/skia/src/core/SkOpts.cpp
--- a/gfx/skia/skia/src/core/SkOpts.cpp
+++ b/gfx/skia/skia/src/core/SkOpts.cpp
@@ -204,17 +204,17 @@ namespace SkOpts {
         if (SkCpu::Supports(SkCpu::SSE41)) { Init_sse41(); }
         if (SkCpu::Supports(SkCpu::SSE42)) { Init_sse42(); }
         if (SkCpu::Supports(SkCpu::AVX  )) { Init_avx();   }
         if (SkCpu::Supports(SkCpu::HSW  )) { Init_hsw();   }
 
     #elif defined(SK_CPU_ARM64)
         if (SkCpu::Supports(SkCpu::CRC32)) { Init_crc32(); }
 
-    #elif defined(SK_CPU_ARM32) && !defined(SK_ARM_HAS_NEON)
+    #elif defined(SK_CPU_ARM32) && !defined(SK_ARM_HAS_NEON) && defined(SK_ARM_HAS_OPTIONAL_NEON)
         if (SkCpu::Supports(SkCpu::NEON)) { Init_neon(); }
 
     #endif
 #endif
     }
 
     void Init() {
         static SkOnce once;