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

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Mike Hommey 2018-12-19 11:10:23 +00:00
Родитель 487f1c0c07
Коммит 1114d3ab41
1 изменённых файлов: 1 добавлений и 13 удалений

Просмотреть файл

@ -1811,7 +1811,6 @@ fi
VPX_USE_YASM=
VPX_ASFLAGS=
VPX_AS_CONVERSION=
VPX_X86_ASM=
VPX_ARM_ASM=
LIBJPEG_TURBO_AS=
LIBJPEG_TURBO_ASFLAGS=
@ -2263,15 +2262,12 @@ if test -z "$MOZ_SYSTEM_LIBVPX"; then
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.
@ -2281,7 +2277,6 @@ if test -z "$MOZ_SYSTEM_LIBVPX"; 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
;;
@ -2314,13 +2309,11 @@ if test -z "$MOZ_SYSTEM_LIBVPX"; then
*: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
@ -2333,12 +2326,8 @@ if test -z "$MOZ_SYSTEM_LIBVPX"; 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
@ -4157,7 +4146,6 @@ 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)