From 955fc269882fc5862c49d0bbdc0db965169d6e6c Mon Sep 17 00:00:00 2001
From: "fbarchard@google.com"
 <fbarchard@google.com@16f28f9a-4ce2-e073-06de-1de4eb20be90>
Date: Thu, 18 Apr 2013 20:27:45 +0000
Subject: [PATCH] Cleaner cpuid util BUG=none TEST=none

Review URL: https://webrtc-codereview.appspot.com/1330004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@668 16f28f9a-4ce2-e073-06de-1de4eb20be90
---
 README.chromium          |  2 +-
 include/libyuv/version.h |  2 +-
 util/cpuid.c             | 19 +++++++++++++------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/README.chromium b/README.chromium
index 3d87f9a51..3222769be 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 667
+Version: 668
 License File: LICENSE
 
 Description:
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index c91174421..ee4d59c64 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 667
+#define LIBYUV_VERSION 668
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/util/cpuid.c b/util/cpuid.c
index 751405c5e..0a122c12b 100644
--- a/util/cpuid.c
+++ b/util/cpuid.c
@@ -68,19 +68,26 @@ int main(int argc, const char* argv[]) {
   }
 #endif
   printf("Cpu Flags %x\n", cpu_flags);
+#if defined(__arm__)
   printf("Has ARM %x\n", has_arm);
+  printf("Has NEON %x\n", has_neon);
+#elif defined(__i386__) || defined(__x86_64__) || \
+    defined(_M_IX86) || defined(_M_X64)
+  printf("Has X86 %x\n", has_x86);
+  printf("Has SSE2 %x\n", has_sse2);
+  printf("Has SSSE3 %x\n", has_ssse3);
+  printf("Has SSE4.1 %x\n", has_sse41);
+  printf("Has SSE4.2 %x\n", has_sse42);
   printf("Has AVX %x\n", has_avx);
   printf("Has AVX2 %x\n", has_avx2);
   printf("Has ERMS %x\n", has_erms);
+#else
+  printf("Has ARM %x\n", has_arm);
+  printf("Has X86 %x\n", has_x86);
   printf("Has MIPS %x\n", has_mips);
   printf("Has MIPS DSP %x\n", has_mips_dsp);
   printf("Has MIPS DSPR2 %x\n", has_mips_dspr2);
-  printf("Has NEON %x\n", has_neon);
-  printf("Has SSE2 %x\n", has_sse2);
-  printf("Has SSE4.1 %x\n", has_sse41);
-  printf("Has SSE4.2 %x\n", has_sse42);
-  printf("Has SSSE3 %x\n", has_ssse3);
-  printf("Has X86 %x\n", has_x86);
+#endif
   return 0;
 }