diff --git a/media/libvpx/Makefile.in b/media/libvpx/Makefile.in index 37a7de0854e5..b3dc1c209437 100644 --- a/media/libvpx/Makefile.in +++ b/media/libvpx/Makefile.in @@ -6,8 +6,6 @@ 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. @@ -22,4 +20,3 @@ GENERATED_DIRS += libvpx/vpx_dsp/arm $(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 diff --git a/old-configure.in b/old-configure.in index be6450f0e5c4..d1a10455ee68 100644 --- a/old-configure.in +++ b/old-configure.in @@ -1811,7 +1811,6 @@ fi VPX_USE_YASM= VPX_ASFLAGS= VPX_AS_CONVERSION= -VPX_ARM_ASM= LIBJPEG_TURBO_AS= LIBJPEG_TURBO_ASFLAGS= MOZ_PREF_EXTENSIONS=1 @@ -2286,7 +2285,6 @@ if test -z "$MOZ_SYSTEM_LIBVPX"; then 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 @@ -2325,10 +2323,6 @@ if test -z "$MOZ_SYSTEM_LIBVPX"; then 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 ======================================================== @@ -4146,7 +4140,6 @@ 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)