From: Michael Niedermayer Date: Mon, 27 Jul 2015 11:20:12 +0000 (+0200) Subject: Merge commit '60a21b3d81c1a11cf5a08950eadd4e84ca2e597c' X-Git-Tag: n2.8~718 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=d06ea6e5ce51165c7c81677ab6827612173bf4f7 Merge commit '60a21b3d81c1a11cf5a08950eadd4e84ca2e597c' * commit '60a21b3d81c1a11cf5a08950eadd4e84ca2e597c': configure: Check for _M_ARMT to detect thumb when using MSVC Conflicts: configure Merged-by: Michael Niedermayer --- d06ea6e5ce51165c7c81677ab6827612173bf4f7 diff --cc configure index 52ac6a885b,88c167f7bc..bd9d61f67b --- a/configure +++ b/configure @@@ -4758,10 -3996,8 +4758,12 @@@ elif enabled alpha; the elif enabled arm; then + enabled msvc && check_cpp_condition stddef.h "defined _M_ARMT" && enable thumb - check_cpp_condition stddef.h "defined __thumb__" && enable_weak thumb ++ + check_cpp_condition stddef.h "defined __thumb__" && check_cc <