RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

configure: clean up check_inline_asm and check_as functions 

The check_inline_asm function should check the actual C compiler,
not the one used for assembly files.  Usually these are the same,
but they might be different, typically when using a compiler other
than gcc.

The check_as should, as its name suggests, test the type of input
the AS command is used with, i.e. a standalond assembly (.S) file.

Finally, check for gnu assembler using the modified check_as as
this reflects actual usage.

Signed-off-by: Mans Rullgard <mans@mansr.com>
This commit is contained in:
Mans Rullgard 2012-12-01 13:19:05 +00:00
parent f0fe245bc3
commit 7fd90119bb
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure vendored
View File

@ -682,9 +682,9 @@ as_o(){
check_as(){ check_as(){
log check_as "$@" log check_as "$@"
cat > $TMPC cat > $TMPS
log_file $TMPC log_file $TMPS
check_cmd $as $CPPFLAGS $ASFLAGS "$@" $AS_C $(as_o $TMPO) $TMPC check_cmd $as $CPPFLAGS $ASFLAGS "$@" $AS_C $(as_o $TMPO) $TMPS
} }
check_inline_asm(){ check_inline_asm(){
@ -693,7 +693,7 @@ check_inline_asm(){
code="$2" code="$2"
shift 2 shift 2
disable $name disable $name
check_as "$@" <<EOF && enable $name check_cc "$@" <<EOF && enable $name
void foo(void){ __asm__ volatile($code); } void foo(void){ __asm__ volatile($code); }
EOF EOF
} }
@ -3266,8 +3266,13 @@ fi
if enabled asm; then if enabled asm; then
as=${gas:=$as} as=${gas:=$as}
check_inline_asm gnu_as '".macro m n\n\\n:.int 0\n.endm\nm x"' || check_as <<EOF && enable gnu_as || \
$nogas "GNU assembler not found, install gas-preprocessor" $nogas "GNU assembler not found, install gas-preprocessor"
.macro m n
\n: .int 0
.endm
m x
EOF
fi fi
check_ldflags -Wl,--as-needed check_ldflags -Wl,--as-needed