Bug 1515257 - Remove VPX_X86_ASM. r=firefox-build-system-reviewers,ted
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 19 Dec 2018 11:10:23 +0000
changeset 451412 b3e4e6b2744de5ab383411490d35d4215b2fdebf
parent 451411 538c59c855dbe1327ccfb8684afaf553d9ed91d3
child 451413 fc53b08bfb58d4e1cbe6ddd82f0041657dd980e7
push id35237
push userrmaries@mozilla.com
push dateThu, 20 Dec 2018 04:52:39 +0000
treeherdermozilla-central@1260c07d4b17 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfirefox-build-system-reviewers, ted
bugs1515257
milestone66.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 1515257 - Remove VPX_X86_ASM. r=firefox-build-system-reviewers,ted It is used nowhere. Also remove the warning when there no assembly for VPX. Barely anybody notices it, and there's nothing really noteworthy about it. Differential Revision: https://phabricator.services.mozilla.com/D14945
old-configure.in
--- a/old-configure.in
+++ b/old-configure.in
@@ -1806,17 +1806,16 @@ MOZ_BRANDING_DIRECTORY=
 MOZ_OFFICIAL_BRANDING=
 MOZ_AUTH_EXTENSION=1
 if test "$MOZ_IOS"; then
    MOZ_AUTH_EXTENSION=
 fi
 VPX_USE_YASM=
 VPX_ASFLAGS=
 VPX_AS_CONVERSION=
-VPX_X86_ASM=
 VPX_ARM_ASM=
 LIBJPEG_TURBO_AS=
 LIBJPEG_TURBO_ASFLAGS=
 MOZ_PREF_EXTENSIONS=1
 MOZ_SPELLCHECK=1
 MOZ_TOOLKIT_SEARCH=1
 MOZ_UNIVERSALCHARDET=1
 MOZ_XUL=1
@@ -2258,35 +2257,31 @@ if test -z "$MOZ_SYSTEM_LIBVPX"; then
     dnl Detect if we can use an assembler to compile optimized assembly for libvpx.
     dnl We currently require yasm on all x86 platforms and require yasm 1.1.0 on Win32.
     dnl We currently require gcc on all arm platforms.
 
     dnl See if we have assembly on this platform.
     case "$OS_ARCH:$CPU_ARCH" in
     Darwin:x86)
       VPX_USE_YASM=1
-      VPX_X86_ASM=1
     ;;
     Darwin:x86_64)
       VPX_USE_YASM=1
-      VPX_X86_ASM=1
     ;;
     WINNT:x86_64)
       VPX_USE_YASM=1
-      VPX_X86_ASM=1
     ;;
     WINNT:x86)
       dnl Check for yasm 1.1 or greater.
       if test -n "$COMPILE_ENVIRONMENT" -a -z "$YASM"; then
         AC_MSG_ERROR([yasm 1.1 or greater is required to build libvpx on Win32, but it appears not to be installed.  Install it (included in MozillaBuild 1.5.1 and newer) or configure with --disable-webm (which disables the WebM video format). See https://developer.mozilla.org/en/YASM for more details.])
       elif test -n "$COMPILE_ENVIRONMENT" -a "$_YASM_MAJOR_VERSION" -lt "1" -o \( "$_YASM_MAJOR_VERSION" -eq "1" -a "$_YASM_MINOR_VERSION" -lt "1" \) ; then
         AC_MSG_ERROR([yasm 1.1 or greater is required to build libvpx on Win32, but you appear to have version $_YASM_MAJOR_VERSION.$_YASM_MINOR_VERSION.  Upgrade to the newest version (included in MozillaBuild 1.5.1 and newer) or configure with --disable-webm (which disables the WebM video format). See https://developer.mozilla.org/en/YASM for more details.])
       else
         VPX_USE_YASM=1
-        VPX_X86_ASM=1
         dnl The encoder needs obj_int_extract to get asm offsets.
       fi # COMPILE_ENVIRONMENT and others
     ;;
     *:arm*)
       if test -n "$GNU_AS" ; then
         dnl These flags are a lie; they're just used to enable the requisite
         dnl opcodes; actual arch detection is done at runtime.
         VPX_ASFLAGS="-march=armv7-a -mfpu=neon"
@@ -2309,41 +2304,35 @@ if test -z "$MOZ_SYSTEM_LIBVPX"; then
            #endif],
            VPX_ASFLAGS="$VPX_ASFLAGS -mfloat-abi=softfp"
            )
       fi
     ;;
     *:x86)
       if $CC -E -dM -</dev/null | grep -q __ELF__; then
         VPX_USE_YASM=1
-        VPX_X86_ASM=1
       fi
     ;;
     *:x86_64)
       if $CC -E -dM -</dev/null | grep -q __ELF__; then
         VPX_USE_YASM=1
-        VPX_X86_ASM=1
       fi
     ;;
     esac
 
     if test -n "$COMPILE_ENVIRONMENT" -a -n "$VPX_USE_YASM" -a -z "$YASM"; then
       AC_MSG_ERROR([yasm is a required build tool for this architecture when webm is enabled. You may either install yasm or --disable-webm (which disables the WebM video format). See https://developer.mozilla.org/en/YASM for more details.])
     fi # COMPILE_ENVIRONMENT and others
 
     if test -n "$VPX_USE_YASM" && test "$OS_ARCH:$CPU_ARCH" != "WINNT:x86_64"; then
       VPX_ASFLAGS="-DPIC"
     fi
 
-    if test -n "$VPX_X86_ASM"; then
-      AC_DEFINE(VPX_X86_ASM)
-    elif test -n "$VPX_ARM_ASM"; then
+    if test -n "$VPX_ARM_ASM"; then
       AC_DEFINE(VPX_ARM_ASM)
-    else
-      AC_MSG_WARN([No assembler or assembly support for libvpx. Using unoptimized C routines.])
     fi
 fi
 
 dnl ========================================================
 dnl = Handle dependent MEDIA defines
 dnl ========================================================
 
 MOZ_WEBM_ENCODER=1
@@ -4152,17 +4141,16 @@ AC_SUBST(WIN32_CONSOLE_EXE_LDFLAGS)
 AC_SUBST(WIN32_GUI_EXE_LDFLAGS)
 
 AC_SUBST(MOZ_FFVPX)
 AC_SUBST(MOZ_FFVPX_FLACONLY)
 AC_SUBST_LIST(FFVPX_ASFLAGS)
 AC_SUBST(VPX_USE_YASM)
 AC_SUBST_LIST(VPX_ASFLAGS)
 AC_SUBST(VPX_AS_CONVERSION)
-AC_SUBST(VPX_X86_ASM)
 AC_SUBST(VPX_ARM_ASM)
 AC_SUBST(LIBJPEG_TURBO_USE_YASM)
 AC_SUBST_LIST(LIBJPEG_TURBO_ASFLAGS)
 AC_SUBST(MOZ_LIBAV_FFT)
 AC_SUBST_LIST(LIBAV_FFT_ASFLAGS)
 AC_SUBST(MOZ_DEVTOOLS)
 
 AC_SUBST(MOZ_PACKAGE_JSSHELL)