Index: source/cpu_id.cc |
diff --git a/source/cpu_id.cc b/source/cpu_id.cc |
index 8d2c3a495739abe6849023755f98597e9e1377e0..d64d9d565729d8b371794440d961b92747e75a1f 100644 |
--- a/source/cpu_id.cc |
+++ b/source/cpu_id.cc |
@@ -10,12 +10,12 @@ |
#include "libyuv/cpu_id.h" |
-#if defined(_MSC_VER) && !defined(__clang__) |
+#if defined(_MSC_VER) |
#include <intrin.h> // For __cpuidex() |
#endif |
#if !defined(__pnacl__) && !defined(__CLR_VER) && \ |
!defined(__native_client__) && (defined(_M_IX86) || defined(_M_X64)) && \ |
- defined(_MSC_VER) && !defined(__clang__) && (_MSC_FULL_VER >= 160040219) |
+ defined(_MSC_VER) && (_MSC_FULL_VER >= 160040219) |
#include <immintrin.h> // For _xgetbv() |
#endif |
@@ -48,7 +48,7 @@ extern "C" { |
!defined(__pnacl__) && !defined(__CLR_VER) |
LIBYUV_API |
void CpuId(uint32 info_eax, uint32 info_ecx, uint32* cpu_info) { |
-#if defined(_MSC_VER) && !defined(__clang__) |
+#if defined(_MSC_VER) |
// Visual C version uses intrinsic or inline x86 assembly. |
#if (_MSC_FULL_VER >= 160040219) |
__cpuidex((int*)(cpu_info), info_eax, info_ecx); |
@@ -71,7 +71,7 @@ void CpuId(uint32 info_eax, uint32 info_ecx, uint32* cpu_info) { |
} |
#endif |
// GCC version uses inline x86 assembly. |
-#else // defined(_MSC_VER) && !defined(__clang__) |
+#else // defined(_MSC_VER) |
uint32 info_ebx, info_edx; |
asm volatile ( |
#if defined( __i386__) && defined(__PIC__) |
@@ -89,7 +89,7 @@ void CpuId(uint32 info_eax, uint32 info_ecx, uint32* cpu_info) { |
cpu_info[1] = info_ebx; |
cpu_info[2] = info_ecx; |
cpu_info[3] = info_edx; |
-#endif // defined(_MSC_VER) && !defined(__clang__) |
+#endif // defined(_MSC_VER) |
} |
#else // (defined(_M_IX86) || defined(_M_X64) ... |
LIBYUV_API |