Merge commit 'f4312352fc52cc47c1ba398a33f629d32a737e91'

* commit 'f4312352fc52cc47c1ba398a33f629d32a737e91':
  configure: Add probe identification of MS armasm

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

1 files changed, 5 insertions, 0 deletions

diff --git a/configure b/configure
index 51decd09d9..fc5d7f299b 100755
--- a/configure
+++ b/configure
@@ -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)