From c43f3da22d67a04d99420901137ff1d499d2be22 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 25 Aug 2016 21:45:15 -0400
Subject: [PATCH] Backed out changeset 7785b40af14f for landing with the wrong
 bug number in the commit message.

---
 media/libpng/moz.build |  2 +-
 old-configure.in       | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/media/libpng/moz.build b/media/libpng/moz.build
index c52b07a28fa91..2a70b142d8010 100644
--- a/media/libpng/moz.build
+++ b/media/libpng/moz.build
@@ -27,7 +27,7 @@ UNIFIED_SOURCES += [
     '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',
diff --git a/old-configure.in b/old-configure.in
index 45e6903b3afd9..ab3475495821a 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -2207,6 +2207,8 @@ 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 ========================================================
@@ -2282,8 +2284,32 @@ if test "${PNG_DIR}" -a -d "${PNG_DIR}" -a "$MOZ_SYSTEM_PNG" = 1; then
     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