From d2371686c217dcb7c10b366483c39c63919327c4 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Mon, 21 Oct 2013 20:58:25 +0000 Subject: [PATCH] Fix parameter name for cpuid on arm BUG=276 TESTED=build bot R=ryanpetrie@google.com Review URL: https://webrtc-codereview.appspot.com/2699004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@820 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- source/cpu_id.cc | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.chromium b/README.chromium index 0dfd28abe..8864a09a8 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 819 +Version: 820 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index b3ae0dab0..e56684bd2 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 819 +#define LIBYUV_VERSION 820 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/cpu_id.cc b/source/cpu_id.cc index fb15f2084..540db9686 100644 --- a/source/cpu_id.cc +++ b/source/cpu_id.cc @@ -64,13 +64,13 @@ int TestOsSaveYmm() { #if defined(_MSC_VER) xcr0 = (uint32)_xgetbv(0); /* min VS2010 SP1 compiler is required */ #else - __asm__ ("xgetbv" : "=a" (xcr0) : "c" (0) : "%edx" ); -#endif + asm volatile ("xgetbv" : "=a" (xcr0) : "c" (0) : "%edx" ); // NOLINT +#endif // defined(_MSC_VER) return((xcr0 & 6) == 6); // Is ymm saved? } #else LIBYUV_API -void CpuId(uint32, uint32, uint32* abcd) { +void CpuId(uint32 eax, uint32 ecx, uint32* cpu_info) { cpu_info[0] = cpu_info[1] = cpu_info[2] = cpu_info[3] = 0; } #endif