[PATCH v4 2/2] include: Define __cpuid(ex) as intrinsics when _MSC_VER is defined.

[Rémi Bernon]

From: Rémi Bernon

---
 include/msvcrt/intrin.h | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/include/msvcrt/intrin.h b/include/msvcrt/intrin.h
index 7981e2798ba..5f9f6832353 100644
--- a/include/msvcrt/intrin.h
+++ b/include/msvcrt/intrin.h
@@ -15,15 +15,32 @@
 extern "C" {
 #endif

+#ifndef __has_builtin
+# define __has_builtin(x) 0
+#endif
+
 #if defined(__i386__) || (defined(__x86_64__) && !defined(__arm64ec__))
+
+#if defined(_MSC_VER) && (!defined(__has_builtin) || __has_builtin(__cpuidex))
+void __cpuidex(int info[4], int ax, int cx);
+#pragma intrinsic(__cpuidex)
+#else
 static inline void __cpuidex(int info[4], int ax, int cx)
 {
   __asm__ ("cpuid" : "=a"(info[0]), "=b" (info[1]), "=c"(info[2]), "=d"(info[3]) : "a"(ax), "c"(cx));
 }
+#endif /* _MSC_VER */
+
+#if defined(_MSC_VER) && (!defined(__has_builtin) || __has_builtin(__cpuid))
+void __cpuid(int info[4], int ax);
+#pragma intrinsic(__cpuid)
+#else
 static inline void __cpuid(int info[4], int ax)
 {
     return __cpuidex(info, ax, 0);
 }
+#endif /* _MSC_VER */
+
 #endif

#if defined(__aarch64__) || defined(__arm64ec__)