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>

diff --cc configure
index 52ac6a885b942201409247774739b0998ebf1e3a,88c167f7bc354c1a77a00515513727281da3a5b5..bd9d61f67bba36858602c1aa73d5fde39a2f2b6c
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -4758,10 -3996,8 +4758,12 @@@ elif enabled alpha; the
  
  elif enabled arm; then
  
 -    check_cpp_condition stddef.h "defined __thumb__" && enable_weak thumb
+     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
 +
      enabled thumb && check_cflags -mthumb || check_cflags -marm
  
      if     check_cpp_condition stddef.h "defined __ARM_PCS_VFP"; then