From bf2436747630a03d8cc8f5588f7732f90cb7891a Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Mon, 18 Aug 2014 23:45:59 +0000 Subject: [PATCH] Mingw xgetbv use gcc assembly not visual c. BUG=349 TESTED=c:\mingw64\bin\x86_64-w64-mingw32-c++.exe -m32 -I include source/cpu_id.cc -c -o cpu_id.o R=tpsiaki@google.com Review URL: https://webrtc-codereview.appspot.com/17139004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@1049 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- source/cpu_id.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.chromium b/README.chromium index 63a8825aa..d51a61a96 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1048 +Version: 1049 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 02e0d635c..eadbda35a 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 1048 +#define LIBYUV_VERSION 1049 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/cpu_id.cc b/source/cpu_id.cc index cbec8026b..deb4c4465 100644 --- a/source/cpu_id.cc +++ b/source/cpu_id.cc @@ -97,7 +97,7 @@ int TestOsSaveYmm() { uint32 xcr0 = 0u; #if defined(_MSC_VER) && (_MSC_FULL_VER >= 160040219) xcr0 = (uint32)(_xgetbv(0)); // VS2010 SP1 required. -#elif defined(_M_IX86) +#elif defined(_M_IX86) && defined(_MSC_VER) __asm { xor ecx, ecx // xcr 0 _asm _emit 0x0f _asm _emit 0x01 _asm _emit 0xd0 // For VS2010 and earlier.