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

 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 667
+Version: 668
 License File: LICENSE
 
 Description:

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

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;
 }