Merge commit '60a21b3d81c1a11cf5a08950eadd4e84ca2e597c'

* commit '60a21b3d81c1a11cf5a08950eadd4e84ca2e597c':
  configure: Check for _M_ARMT to detect thumb when using MSVC

Conflicts:
	configure

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

1 files changed, 2 insertions, 0 deletions

diff --git a/configure b/configure
index 52ac6a885b..bd9d61f67b 100755
--- a/configure
+++ b/configure
@@ -4758,6 +4758,8 @@ elif enabled alpha; then
 
 elif enabled arm; then
 
+    enabled msvc && check_cpp_condition stddef.h "defined _M_ARMT" && enable thumb
+
     check_cpp_condition stddef.h "defined __thumb__" && check_cc <<EOF && enable_weak thumb
 float func(float a, float b){ return a+b; }
 EOF