windows only: better way to get cpuid data with internal facility of …

…clang/gcc (also silence warning "<mm3dnow.h> header is deprecated", including <intrin.h>)
tcltk · Dec 29, 2024 · b5e13d0 · b5e13d0
1 parent f0a45be
commit b5e13d0
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c
@@ -12,7 +12,9 @@
  */
 
 #include "tclWinInt.h"
-#if defined(HAVE_INTRIN_H)
+#if defined (__clang__) || ((__GNUC__)  && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 8))))
+#   include <cpuid.h>
+#elif defined(HAVE_INTRIN_H)
 #   include <intrin.h>
 #endif
 
@@ -661,7 +663,12 @@ TclWinCPUID(
 {
     int status = TCL_ERROR;
 
-#if defined(HAVE_INTRIN_H) && defined(_WIN64) && defined(HAVE_CPUID)
+#if defined (__clang__) || ((__GNUC__)  && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 8))))
+
+    __get_cpuid(index, &regsPtr[0], &regsPtr[1], &regsPtr[2], &regsPtr[3]);
+    status = TCL_OK;
+
+#elif defined(HAVE_INTRIN_H) && defined(_WIN64) && defined(HAVE_CPUID)
 
     __cpuid((int *)regsPtr, (int)index);
     status = TCL_OK;