virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '31a53ab34e22fe1eec902f79ec1f19ab828a7a0c'

Browse Source 
* commit '31a53ab34e22fe1eec902f79ec1f19ab828a7a0c':
  configure: Add check_as() helper function to simplify some expressions

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2018-03-28 15:28:13 -03:00
commit 23ba9b3fd1
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
configure vendored
View File

@ -975,6 +975,17 @@ check_cmd(){
test_cmd $@ && enable $cmd
}
check_as(){
log check_as "$@"
name=$1
code=$2
shift 2
disable $name
test_as $@ <<EOF && enable $name
$code
EOF
}
check_inline_asm(){
log check_inline_asm "$@"
name="$1"
@ -1008,7 +1019,7 @@ EOF
check_insn(){
log check_insn "$@"
check_inline_asm ${1}_inline "$2"
echo "$2" | test_as && enable ${1}_external || disable ${1}_external
check_as ${1}_external "$2"
}
test_x86asm(){
@ -5410,11 +5421,7 @@ check_gas() {
m x
EOF
# .altmacro is only used in arm asm
! enabled arm || test_as <<EOF || return 1
.altmacro
EOF
enable gnu_as
return 0
! enabled arm || check_as gnu_as ".altmacro"
}
if enabled_any arm aarch64 || enabled_all ppc altivec && enabled asm; then
@ -5441,10 +5448,8 @@ if enabled_any arm aarch64 || enabled_all ppc altivec && enabled asm; then
$nogas "GNU assembler not found, install/update gas-preprocessor"
fi
test_as <<EOF && enable as_func
.func test
.endfunc
EOF
check_as as_func ".func test
.endfunc"
fi
check_inline_asm inline_asm_labels '"1:\n"'
@ -5500,18 +5505,12 @@ EOF
check_inline_asm asm_mod_q '"add r0, %Q0, %R0" :: "r"((long long)0)'
test_as <<EOF && enable as_arch_directive
.arch armv7-a
EOF
test_as <<EOF && enable as_fpu_directive
.fpu neon
EOF
check_as as_arch_directive ".arch armv7-a"
check_as as_fpu_directive ".fpu neon"
# llvm's integrated assembler supports .object_arch from llvm 3.5
[ "$objformat" = elf32 ] || [ "$objformat" = elf64 ] &&
test_as <<EOF && enable as_object_arch
.object_arch armv4
EOF
check_as as_object_arch ".object_arch armv4"
# MS armasm fails to assemble our PIC constructs
[ $target_os != win32 ] && enabled_all armv6t2 shared !pic && enable_weak_pic