Merge commit 'f4312352fc52cc47c1ba398a33f629d32a737e91'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Aug 2014 16:54:11 +0000 (18:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Aug 2014 16:54:15 +0000 (18:54 +0200)
* commit 'f4312352fc52cc47c1ba398a33f629d32a737e91':
  configure: Add probe identification of MS armasm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure

diff --cc configure
+++ b/configure
@@@ -3392,8 -2881,13 +3392,13 @@@ probe_cc()
          opt_common='-alias=ansi -Mdse -Mlre -Mpre'
          _cflags_speed="-O3 -Mautoinline -Munroll=c:4 $opt_common"
          _cflags_size="-O2 -Munroll=c:1 $opt_common"
 -        _cflags_noopt="-O1"
 +        _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)