diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 18:54:11 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 18:54:15 +0200 |
commit | f51c3e3a84e6b6fa5d6c2c26387a5bb8fb5580da (patch) | |
tree | 5a69887c47cdb4a598a7b43dcfadbed6083ac9c8 /configure | |
parent | d6efed84b1dac904c86c7fc2f33d170e730efb6c (diff) | |
parent | f4312352fc52cc47c1ba398a33f629d32a737e91 (diff) | |
download | ffmpeg-f51c3e3a84e6b6fa5d6c2c26387a5bb8fb5580da.tar.gz |
Merge commit 'f4312352fc52cc47c1ba398a33f629d32a737e91'
* commit 'f4312352fc52cc47c1ba398a33f629d32a737e91':
configure: Add probe identification of MS armasm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -3394,6 +3394,11 @@ probe_cc(){ _cflags_size="-O2 -Munroll=c:1 $opt_common" _cflags_noopt="-O" _flags_filter=pgi_flags + elif $_cc 2>&1 | grep -q 'Microsoft.*ARM.*Assembler'; then + _type=armasm + _ident=$($_cc | head -n1) + # 4509: "This form of conditional instruction is deprecated" + _flags="-nologo -ignore 4509" elif $_cc 2>&1 | grep -q Microsoft; then _type=msvc _ident=$($cc 2>&1 | head -n1) |