summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-02 06:50:54 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-02 06:50:54 (GMT)
commitab87e428cb91100ed8882b1ab3188ace08a84dcd (patch)
tree5362859f7163fe6a3d7add68da5cea7325f351cf
parent67a898d6e777d135ab218d8a50fe701644f179a6 (diff)
parent01629880872bc498a4e334c657838500bcc55498 (diff)
downloadtcl-ab87e428cb91100ed8882b1ab3188ace08a84dcd.zip
tcl-ab87e428cb91100ed8882b1ab3188ace08a84dcd.tar.gz
tcl-ab87e428cb91100ed8882b1ab3188ace08a84dcd.tar.bz2
TclWinCPUID now respects -fPIC compilation on 32-bit Linux
-rw-r--r--unix/tclUnixCompat.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/unix/tclUnixCompat.c b/unix/tclUnixCompat.c
index 1c42056..5971272 100644
--- a/unix/tclUnixCompat.c
+++ b/unix/tclUnixCompat.c
@@ -991,12 +991,14 @@ TclWinCPUID(
int status = TCL_ERROR;
#ifdef HAVE_CPUID
- /* disabled in emergency -- fails on linux */
-# if 0
- __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
#endif
return status;
}