commit d2371686c217dcb7c10b366483c39c63919327c4
author fbarchard@google.com <fbarchard@google.com@16f28f9a-4ce2-e073-06de-1de4eb20be90> Mon Oct 21 20:58:25 2013 +0000
committer fbarchard@google.com <fbarchard@google.com@16f28f9a-4ce2-e073-06de-1de4eb20be90> Mon Oct 21 20:58:25 2013 +0000
tree 9845d08e91abf08eda795debd8109992b8992900
parent 095f33d870bdc68773db05e75484cc2ed1fe7550

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

diff --git a/README.chromium b/README.chromium
index 0dfd28a..8864a09 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
 

include/libyuv/version.h

diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index b3ae0da..e56684b 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

source/cpu_id.cc

diff --git a/source/cpu_id.cc b/source/cpu_id.cc
index fb15f20..540db96 100644
--- a/source/cpu_id.cc
+++ b/source/cpu_id.cc
@@ -64,13 +64,13 @@
 #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