ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-19 21:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '15201e256035a3e8f9d3d7b96fc327467e1a8ead'

Browse Source 
* commit '15201e256035a3e8f9d3d7b96fc327467e1a8ead':
  configure: check $as first before using $gas as GNU as

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-05 19:31:08 +02:00
commit 00d2346885
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
configure vendored
View File

@ -4345,22 +4345,32 @@ if [ "$cpu" = "power7" ] || [ "$cpu" = "power8" ] ;then
fi
fi
if enabled asm; then
enabled arm && nogas=die
enabled_all ppc altivec && [ $target_os_default != aix ] && nogas=warn
as=${gas:=$as}
check_as <<EOF && enable gnu_as || \
$nogas "GNU assembler not found, install gas-preprocessor"
.macro m n
\n: .int 0
check_gas() {
log "check_gas using '$as' as AS"
# :vararg is used on aarch64, arm and ppc altivec
check_as <<EOF || return 1
.macro m n, y:vararg=0
\n: .int \y
.endm
m x
EOF
check_as <<EOF || $nogas "GNU assembler not found, install gas-preprocessor"
# .altmacro is only used in arm asm
! enabled arm || check_as <<EOF || return 1
.altmacro
EOF
enable gnu_as
return 0
}
if enabled asm; then
enabled arm aarch64 && nogas=die
enabled_all ppc altivec && [ $target_os_default != aix ] && nogas=warn
if ! check_gas ; then
as=${gas:=$as}
check_gas || \
$nogas "GNU assembler not found, install gas-preprocessor"
fi
check_as <<EOF && enable as_func
.func test