---
configure | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/configure b/configure
index 8f6a063..fee8f00 100755
--- a/configure
+++ b/configure
@@ -4227,6 +4227,20 @@ fi
check_inline_asm inline_asm_labels '"1:\n"'
+probe_asm(){
+ if check_cmd $asm -v; then
+ asm=nasm
+ asm_debug="-g -F dwarf"
+ ASM_DEPFLAGS='-MD $(@:.o=.d)'
+ enabled x86_64 && test "$objformat" = elf && objformat=elf64
+ elif check_cmd $asm --version; then
+ asm=yasm
+ asm_debug="-g dwarf2"
+ ASMDEP='$(DEPASM) $(ASMFLAGS) -M -o $@ $< > $(@:.o=.d)'
+ enabled x86_64 && asm_extra="-m amd64"
+ fi
+}
+
if enabled aarch64; then
enabled armv8 && check_insn armv8 'prfm pldl1strm, [x0]'
# internal assembler in clang 3.3 does not support this instruction
@@ -4380,17 +4394,7 @@ EOF
enabled mmxext && check_inline_asm mmxext_inline '"pmaxub %mm0, %mm1"'
if ! disabled_any assembly mmx assembler; then
- if check_cmd $asmexe --version; then
- enabled x86_64 && asm_extra="-m amd64"
- asm_debug="-g dwarf2"
- ASMDEP='$(DEPASM) $(ASMFLAGS) -M -o $@ $< > $(@:.o=.d)'
- elif check_cmd nasm -v; then
- asm=nasm
- asm_debug="-g -F dwarf"
- ASM_DEPFLAGS='-MD $(@:.o=.d)'
- enabled x86_64 && test "$objformat" = elf && objformat=elf64
- fi
-
+ probe_asm
ASMFLAGS="-f $objformat $asm_extra"
enabled pic && append ASMFLAGS "-DPIC"
test -n "$extern_prefix" && append ASMFLAGS "-DPREFIX"
--
2.1.4
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
