From 5cae5a1defa360da076365a786093a749d1ddf4e Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 22 May 2017 12:48:15 +0000 Subject: [PATCH] configure: Move x86 assembler sanity check into assembler probe function This allows for more graceful fallback from NASM to Yasm if the available NASM version is too old. (Cherry-picked from libav commit adfd7892e3b8b40e7a1620f7254459d8e096a9a1) Signed-off-by: James Almer --- configure | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index d75aa7fe70..dd9608540e 100755 --- a/configure +++ b/configure @@ -5503,13 +5503,15 @@ EOF x86asm_debug="-g dwarf2" X86ASMDEP='$(DEPX86ASM) $(X86ASMFLAGS) -M $(X86ASM_O) $< > $(@:.o=.d)' fi + check_x86asm "movbe ecx, [5]" && enable x86asm } if ! disabled_any asm mmx x86asm; then + disable x86asm for program in $x86asmexe nasm yasm; do - probe_x86asm $program - test -n "$x86asm_type" && break + probe_x86asm $program && break done + disabled x86asm && die "nasm/yasm not found or too old. Use --disable-x86asm for a crippled build." X86ASMFLAGS="-f $objformat" enabled pic && append X86ASMFLAGS "-DPIC" test -n "$extern_prefix" && append X86ASMFLAGS "-DPREFIX" @@ -5517,8 +5519,6 @@ EOF elf*) enabled debug && append X86ASMFLAGS $x86asm_debug ;; esac - check_x86asm "movbe ecx, [5]" && enable x86asm || - die "nasm/yasm not found or too old. Use --disable-x86asm for a crippled build." check_x86asm "vextracti128 xmm0, ymm0, 0" || disable avx2_external check_x86asm "vpmacsdd xmm0, xmm1, xmm2, xmm3" || disable xop_external check_x86asm "vfmaddps ymm0, ymm1, ymm2, ymm3" || disable fma4_external