Bug 1515257 - Remove VPX_AS_CONVERSION. r=firefox-build-system-reviewers,ted
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 19 Dec 2018 22:39:27 +0000
changeset 451415 38e6668872adc469653fb41d6ee4dd283fd17521
parent 451414 2483ed8c7b8242b975c0bbe707972337066f34c4
child 451416 85715bafc947c4502765d61490e4b7711d72afe4
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_AS_CONVERSION. r=firefox-build-system-reviewers,ted There's only really one place where it's used, and we can "inline" it there. Depends on D14947 Differential Revision: https://phabricator.services.mozilla.com/D14948
media/libvpx/Makefile.in
media/libvpx/moz.build
old-configure.in
--- a/media/libvpx/Makefile.in
+++ b/media/libvpx/Makefile.in
@@ -1,22 +1,24 @@
 # 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_AS_CONVERSION
+ifeq ($(CPU_ARCH),arm)
+ifdef GNU_AS
 # 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) < $< > $@
+	$(PERL) $(topsrcdir)/media/libvpx/libvpx/build/make/ads2gas.pl < $< > $@
 
 $(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/media/libvpx/moz.build
+++ b/media/libvpx/moz.build
@@ -50,17 +50,17 @@ elif CONFIG['CPU_ARCH'] == 'arm':
     ASFLAGS += [
         '-I%s/media/libvpx/config/linux/arm/' % TOPSRCDIR,
         '-I%s/libvpx' % OBJDIR,
     ]
     LOCAL_INCLUDES += [ '/media/libvpx/config/linux/arm/' ]
 
     arm_asm_files = files['ARM_SOURCES']
 
-    if CONFIG['VPX_AS_CONVERSION']:
+    if CONFIG['GNU_AS']:
         SOURCES += sorted([
             "!%s.S" % f if f.endswith('.asm') else f for f in arm_asm_files
         ])
     else:
         SOURCES += sorted(arm_asm_files)
 
     for f in SOURCES:
         if f.endswith('.c') and 'neon' in f:
--- a/old-configure.in
+++ b/old-configure.in
@@ -1805,17 +1805,16 @@ ENABLE_SYSTEM_EXTENSION_DIRS=1
 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=
 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
@@ -2279,17 +2278,16 @@ if test -z "$MOZ_SYSTEM_LIBVPX"; then
         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"
-        VPX_AS_CONVERSION='$(PERL) $(topsrcdir)/media/libvpx/libvpx/build/make/ads2gas.pl'
         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.
@@ -4134,17 +4132,16 @@ AC_SUBST(NS_ENABLE_TSF)
 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(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)