]> git.sesse.net Git - ffmpeg/commitdiff
configure: don't enable $ARCH_external if $ARCH is disabled
authorJames Almer <jamrial@gmail.com>
Sun, 26 Jan 2020 15:08:26 +0000 (12:08 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 5 Feb 2020 00:59:14 +0000 (21:59 -0300)
The check_x86asm() checks would force enable these variables on success,
bypassing any --disable-* command line option.
This is important in the case of AVX512, where the relevant define is used
to choose between different values for memory alignment and strides in
some allocations.

Signed-off-by: James Almer <jamrial@gmail.com>
configure

index ec4ab96d1dbdd8a0bb7da16f9e9f39c3bd955af0..58419cd88c19879a6c0a50bc945f19eb7499b3bd 100755 (executable)
--- a/configure
+++ b/configure
@@ -5934,10 +5934,10 @@ EOF
             elf*) enabled debug && append X86ASMFLAGS $x86asm_debug ;;
         esac
 
-        check_x86asm avx512_external "vmovdqa32 [eax]{k1}{z}, zmm0"
-        check_x86asm avx2_external   "vextracti128 xmm0, ymm0, 0"
-        check_x86asm xop_external    "vpmacsdd xmm0, xmm1, xmm2, xmm3"
-        check_x86asm fma4_external   "vfmaddps ymm0, ymm1, ymm2, ymm3"
+        enabled avx512 && check_x86asm avx512_external "vmovdqa32 [eax]{k1}{z}, zmm0"
+        enabled avx2   && check_x86asm avx2_external   "vextracti128 xmm0, ymm0, 0"
+        enabled xop    && check_x86asm xop_external    "vpmacsdd xmm0, xmm1, xmm2, xmm3"
+        enabled fma4   && check_x86asm fma4_external   "vfmaddps ymm0, ymm1, ymm2, ymm3"
         check_x86asm cpunop          "CPU amdnop"
     fi