Bug 1295671 - Move enabling ARM-NEON PNG from old-configure.in to libpng/moz.build. r=jrmuizel
☠☠ backed out by 3cb8b5473737 ☠ ☠
authorGlenn Randers-Pehrson <glennrp+bmo@gmail.com>
Wed, 24 Aug 2016 15:44:00 -0400
changeset 311257 7785b40af14f91910ad30c731212e5bdbb50bb09
parent 311256 a5657c5416cec71c7d589a7d67a2b7ceb2bad635
child 311258 96281cc98bc619164580b33340e116318c94de2a
push id81080
push userryanvm@gmail.com
push dateFri, 26 Aug 2016 01:42:06 +0000
treeherdermozilla-inbound@e59fbcb1da07 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel
bugs1295671
milestone51.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1295671 - Move enabling ARM-NEON PNG from old-configure.in to libpng/moz.build. r=jrmuizel
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['MOZ_PNG_ARM_NEON']:
+if CONFIG['CPU_ARCH'] == 'arm':
     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,18 +2202,16 @@ 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)
 
@@ -2279,42 +2277,18 @@ 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)