summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-02 06:48:07 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-02 06:48:07 (GMT)
commit01629880872bc498a4e334c657838500bcc55498 (patch)
treefde9de00707597cae4b3e8f87beef3c2f0c7c465
parent4457676798e94230b3296a67ab9caed2dc95e8d5 (diff)
parent5e828c28cc7244829ffceb976231939bd5141e5b (diff)
downloadtcl-01629880872bc498a4e334c657838500bcc55498.zip
tcl-01629880872bc498a4e334c657838500bcc55498.tar.gz
tcl-01629880872bc498a4e334c657838500bcc55498.tar.bz2
TclWinCPUID now respects -fPIC compilation on 32-bit Linux
-rw-r--r--unix/tclUnixCompat.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/unix/tclUnixCompat.c b/unix/tclUnixCompat.c
index 22573e4..09c8691 100644
--- a/unix/tclUnixCompat.c
+++ b/unix/tclUnixCompat.c
@@ -821,8 +821,13 @@ TclWinCPUID(
int status = TCL_ERROR;
#ifdef HAVE_CPUID
- __asm__ __volatile__ ("cpuid":\
- "=a" (regsPtr[0]), "=b" (regsPtr[1]), "=c" (regsPtr[2]), "=d" (regsPtr[3]) : "a" (index));
+ __asm__ __volatile__("pushl %%ebx \n\t" /* save %ebx */
+ "cpuid \n\t"
+ "movl %%ebx, %1 \n\t" /* save what cpuid just put in %ebx */
+ "popl %%ebx \n\t" /* restore the old %ebx */
+ : "=a"(regsPtr[0]), "=r"(regsPtr[1]), "=c"(regsPtr[2]), "=d"(regsPtr[3])
+ : "a"(index)
+ : "cc");
status = TCL_OK;
#endif
return status;