Backed out changeset 7785b40af14f for landing with the wrong bug number in the commit message.
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 25 Aug 2016 21:45:15 -0400
changeset 311300 3cb8b5473737614f96e6ebf346c12acfdd91dcd0
parent 311299 e59fbcb1da07bb3e330c8c35759e58404981ffa6
child 311301 ab552be6e7e78d5e9f1d74125406be0fd054270c
push id20395
push userryanvm@gmail.com
push dateFri, 26 Aug 2016 13:37:30 +0000
treeherderfx-team@a65b35c8e5b1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone51.0a1
backs out7785b40af14f91910ad30c731212e5bdbb50bb09
Backed out changeset 7785b40af14f for landing with the wrong bug number in the commit message.
media/libpng/moz.build
old-configure.in
--- a/media/libpng/moz.build
+++ b/media/libpng/moz.build
@@ -22,17 +22,17 @@ UNIFIED_SOURCES += [
     'pngrutil.c',
     'pngset.c',
     'pngtrans.c',
     'pngwio.c',
     'pngwrite.c',
     'pngwutil.c'
 ]
 
-if CONFIG['CPU_ARCH'] == 'arm':
+if CONFIG['MOZ_PNG_ARM_NEON']:
     DEFINES['MOZ_PNG_HAVE_ARM_NEON'] = True
     UNIFIED_SOURCES += [
         'arm/arm_init.c',
         'arm/filter_neon_intrinsics.c'
     ]
 
     SOURCES += [
         'arm/filter_neon.S'
--- a/old-configure.in
+++ b/old-configure.in
@@ -2202,16 +2202,18 @@ fi # SKIP_LIBRARY_CHECKS
 dnl system ZLIB support
 dnl ========================================================
 MOZ_ZLIB_CHECK([1.2.3])
 
 if test "$MOZ_LINKER" = 1 -a "$MOZ_SYSTEM_ZLIB" != 1; then
     AC_MSG_ERROR([Custom dynamic linker requires --with-system-zlib])
 fi
 
+MOZ_PNG_ARM_NEON=
+
 if test -z "$SKIP_LIBRARY_CHECKS"; then
 dnl system BZIP2 Support
 dnl ========================================================
 MOZ_ARG_WITH_STRING(system-bz2,
 [  --with-system-bz2[=PFX]
                           Use system libbz2 [installed at prefix PFX]],
     BZ2_DIR=$withval)
 
@@ -2277,18 +2279,42 @@ CFLAGS=$_SAVE_CFLAGS
 LDFLAGS=$_SAVE_LDFLAGS
 LIBS=$_SAVE_LIBS
 
 if test "${PNG_DIR}" -a -d "${PNG_DIR}" -a "$MOZ_SYSTEM_PNG" = 1; then
     MOZ_PNG_CFLAGS="-I${PNG_DIR}/include"
     MOZ_PNG_LIBS="-L${PNG_DIR}/lib ${MOZ_PNG_LIBS}"
 fi
 
+if test "$MOZ_SYSTEM_PNG" != 1 -a "$CPU_ARCH" = "arm" ; then
+    MOZ_ARG_ENABLE_STRING(png-arm-neon-support,
+        [  --enable-png-arm-neon-support=TYPE
+             Options include:
+                 no
+                 check (default)
+                 nocheck (faster but unsafe)],
+        [MOZ_PNG_ARM_NEON_SUPPORT=$enableval ] )
+    case "$MOZ_PNG_ARM_NEON_SUPPORT" in
+        no)
+            # enable-png-arm-neon-support = no
+            ;;
+        nocheck)
+            # enable-png-arm-neon-support = nocheck
+            MOZ_PNG_ARM_NEON=1
+            ;;
+        *)
+            MOZ_PNG_ARM_NEON=1
+            ;;
+    esac
+fi
+
 fi # SKIP_LIBRARY_CHECKS
 
+AC_SUBST(MOZ_PNG_ARM_NEON)
+
 dnl ========================================================
 dnl =
 dnl = Application
 dnl =
 dnl ========================================================
 
 MOZ_ARG_HEADER(Application)