summaryrefslogtreecommitdiffstats
path: root/unix/tclUnixCompat.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2022-03-11 12:10:24 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2022-03-11 12:10:24 (GMT)
commit3eba98913e01126f1d8215c1bf6dbca778a273cb (patch)
treef3efac29bb1656f68f7b78485a25b8c22dac16b5 /unix/tclUnixCompat.c
parent500e2ceb70e7a57505c5d12828ed6a1145736ae9 (diff)
parent4d7a8ad5822f483b50234b719fd70d98816f7ff6 (diff)
downloadtcl-3eba98913e01126f1d8215c1bf6dbca778a273cb.zip
tcl-3eba98913e01126f1d8215c1bf6dbca778a273cb.tar.gz
tcl-3eba98913e01126f1d8215c1bf6dbca778a273cb.tar.bz2
Merge 8.6
Diffstat (limited to 'unix/tclUnixCompat.c')
-rw-r--r--unix/tclUnixCompat.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/unix/tclUnixCompat.c b/unix/tclUnixCompat.c
index 9e43c01..7bd840a 100644
--- a/unix/tclUnixCompat.c
+++ b/unix/tclUnixCompat.c
@@ -994,20 +994,19 @@ TclWinCPUID(
int status = TCL_ERROR;
/* See: <http://en.wikipedia.org/wiki/CPUID> */
-#if defined(HAVE_CPUID)
#if defined(__x86_64__) || defined(_M_AMD64) || defined (_M_X64)
__asm__ __volatile__("movq %%rbx, %%rsi \n\t" /* save %rbx */
"cpuid \n\t"
"xchgq %%rsi, %%rbx \n\t" /* restore the old %rbx */
: "=a"(regsPtr[0]), "=S"(regsPtr[1]), "=c"(regsPtr[2]), "=d"(regsPtr[3])
: "a"(index));
-#else
+ status = TCL_OK;
+#elif defined(__i386__) || defined(_M_IX86)
__asm__ __volatile__("mov %%ebx, %%esi \n\t" /* save %ebx */
"cpuid \n\t"
"xchg %%esi, %%ebx \n\t" /* restore the old %ebx */
: "=a"(regsPtr[0]), "=S"(regsPtr[1]), "=c"(regsPtr[2]), "=d"(regsPtr[3])
: "a"(index));
-#endif
status = TCL_OK;
#else
(void)index;