From c9a9905764ba04031fa2484895eb89e4a21de4fd Mon Sep 17 00:00:00 2001
From: "changjun.yang" <changjun.yang@intel.com>
Date: Fri, 26 Apr 2013 21:00:24 +0800
Subject: [PATCH] Add cpu detection for Android x86

Change-Id: I3fe24001cda08d7322b630f65c5e3fad881f8036
---
 vpx_ports/x86.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/vpx_ports/x86.h b/vpx_ports/x86.h
index f1cf626..a51cd2e 100644
--- a/vpx_ports/x86.h
+++ b/vpx_ports/x86.h
@@ -33,7 +33,7 @@ typedef enum {
   VPX_CPU_LAST
 }  vpx_cpu_t;
 
-#if defined(__GNUC__) && __GNUC__
+#if defined(__GNUC__) && __GNUC__ || defined(__ANDROID__)
 #if ARCH_X86_64
 #define cpuid(func,ax,bx,cx,dx)\
   __asm__ __volatile__ (\
@@ -49,7 +49,7 @@ typedef enum {
                         : "=a" (ax), "=D" (bx), "=c" (cx), "=d" (dx) \
                         : "a" (func));
 #endif
-#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC) /* end __GNUC__ or __ANDROID__*/
 #if ARCH_X86_64
 #define cpuid(func,ax,bx,cx,dx)\
   asm volatile (\
@@ -69,7 +69,7 @@ typedef enum {
                 : "=a" (ax), "=D" (bx), "=c" (cx), "=d" (dx) \
                 : "a" (func));
 #endif
-#else
+#else /* end __SUNPRO__ */
 #if ARCH_X86_64
 void __cpuid(int CPUInfo[4], int info_type);
 #pragma intrinsic(__cpuid)
@@ -86,7 +86,7 @@ void __cpuid(int CPUInfo[4], int info_type);
   __asm mov c, ecx\
   __asm mov d, edx
 #endif
-#endif
+#endif /* end others */
 
 #define HAS_MMX   0x01
 #define HAS_SSE   0x02
-- 
2.7.4