--- tcl8.6.11/win/tclWin32Dll.c.orig	2021-01-20 12:26:59.444272100 -0800
+++ tcl8.6.11/win/tclWin32Dll.c	2021-01-20 12:29:33.443038200 -0800
@@ -667,7 +667,7 @@
     status = TCL_OK;
 
 #elif defined(__GNUC__)
-#   if defined(_WIN64)
+#   if defined(__x86_64__)
     /*
      * Execute the CPUID instruction with the given index, and store results
      * off 'regPtr'.
@@ -696,7 +696,7 @@
 	"%eax", "%ebx", "%ecx", "%edx", "%esi", "%edi", "memory");
     status = TCL_OK;
 
-#   else
+#   elif defined(__i386__)
 
     TCLEXCEPTION_REGISTRATION registration;
 
@@ -783,7 +783,7 @@
 
 #   endif /* !_WIN64 */
 #elif defined(_MSC_VER)
-#   if defined(_WIN64)
+#   if defined(_M_X64)
 
     __cpuid(regsPtr, index);
     status = TCL_OK;