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>
configure

index 52ac6a8..bd9d61f 100755 (executable)
--- 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