Bug 1515257 - Remove VPX_ARM_ASM. r=firefox-build-system-reviewers,ted
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 19 Dec 2018 11:11:17 +0000
changeset 508516 fc53b08bfb58d4e1cbe6ddd82f0041657dd980e7
parent 508515 b3e4e6b2744de5ab383411490d35d4215b2fdebf
child 508517 2483ed8c7b8242b975c0bbe707972337066f34c4
push id10547
push userffxbld-merge
push dateMon, 21 Jan 2019 13:03:58 +0000
treeherdermozilla-beta@24ec1916bffe [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_ARM_ASM. r=firefox-build-system-reviewers,ted It is only used in one place, where it is redundant with VPX_AS_CONVERSION. Depends on D14945 Differential Revision: https://phabricator.services.mozilla.com/D14946
media/libvpx/Makefile.in
old-configure.in
--- a/media/libvpx/Makefile.in
+++ b/media/libvpx/Makefile.in
@@ -1,25 +1,22 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Set up the libvpx assembler config.
 
 include $(topsrcdir)/config/rules.mk
 
-ifdef VPX_ARM_ASM
-
 ifdef VPX_AS_CONVERSION
 # The ARM asm is written in ARM RVCT syntax, but we actually build it with
 # gas using GNU syntax. Add some rules to perform the conversion.
 
 # Previously used $(dir $(ASFILES)) to figure out which directories to generate.
 # However, .S (as opposed to .s) files are not added to ASFILES. There is only
 # one directory with arm assembly currently so enumerate it manually.
 GENERATED_DIRS += libvpx/vpx_dsp/arm
 
 %.asm.S: %.asm $(ASM_OFFSETS) $(call mkdir_deps,libvpx/vpx_dsp/arm)
 	$(VPX_AS_CONVERSION) < $< > $@
 
 $(addsuffix .$(OBJ_SUFFIX), idct4x4_add_neon.asm idct8x8_add_neon.asm idct16x16_add_neon.asm): libvpx/vpx_dsp/arm/idct_neon.asm.S
 endif
-endif
--- 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_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
 MOZ_ZIPWRITER=1
@@ -2281,17 +2280,16 @@ if test -z "$MOZ_SYSTEM_LIBVPX"; then
       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"
         VPX_AS_CONVERSION='$(PERL) $(topsrcdir)/media/libvpx/libvpx/build/make/ads2gas.pl'
-        VPX_ARM_ASM=1
         dnl Building with -mfpu=neon requires either the "softfp" or the
         dnl "hardfp" ABI. Depending on the compiler's default target, and the
         dnl CFLAGS, the default ABI might be neither, in which case it is the
         dnl "softfloat" ABI.
         dnl The "softfloat" ABI is binary-compatible with the "softfp" ABI, so
         dnl we can safely mix code built with both ABIs. So, if we detect
         dnl that compiling uses the "softfloat" ABI, force the use of the
         dnl "softfp" ABI instead.
@@ -2320,20 +2318,16 @@ if test -z "$MOZ_SYSTEM_LIBVPX"; then
 
     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_ARM_ASM"; then
-      AC_DEFINE(VPX_ARM_ASM)
-    fi
 fi
 
 dnl ========================================================
 dnl = Handle dependent MEDIA defines
 dnl ========================================================
 
 MOZ_WEBM_ENCODER=1
 AC_DEFINE(MOZ_WEBM_ENCODER)
@@ -4141,17 +4135,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_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)
 AC_SUBST(MOZ_FOLD_LIBS)