[tor-commits] [tor-browser/tor-browser-31.1.1esr-4.x-1] Bug 1010972 - Don't use MSVC assembly on mingw. r=jesup

[mikeperry at torproject.org]

commit 907c46f4c33704486b126236974548bb6b7720bc
Author: Jacek Caban <jacek at codeweavers.com>
Date:   Thu May 15 17:24:49 2014 +0200

    Bug 1010972 - Don't use MSVC assembly on mingw. r=jesup
---
 media/libyuv/source/cpu_id.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media/libyuv/source/cpu_id.cc b/media/libyuv/source/cpu_id.cc
index 84a362e..dec3abf 100644
--- a/media/libyuv/source/cpu_id.cc
+++ b/media/libyuv/source/cpu_id.cc
@@ -97,7 +97,7 @@ int TestOsSaveYmm() {
   uint32 xcr0 = 0u;
 #if defined(_MSC_VER) && defined(_XCR_XFEATURE_ENABLED_MASK)
   xcr0 = (uint32)(_xgetbv(_XCR_XFEATURE_ENABLED_MASK));
-#elif defined(_M_IX86)
+#elif defined(_MSC_VER) && defined(_M_IX86)
   __asm {
     xor        ecx, ecx    // xcr 0
     _asm _emit 0x0f _asm _emit 0x01 _asm _emit 0xd0  // For VS2010 and earlier.