Merge commit '60a21b3d81c1a11cf5a08950eadd4e84ca2e597c'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 11:20:12 +0000 (13:20 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 11:20:12 +0000 (13:20 +0200)
* commit '60a21b3d81c1a11cf5a08950eadd4e84ca2e597c':
  configure: Check for _M_ARMT to detect thumb when using MSVC

Conflicts:
configure

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

diff --cc 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