Merge pull request #443 from idunham/fix

Workaround PIC limitations in cpuid.
2014-08-29 13:31:06 +08:00 · 2014-08-29 13:31:06 +08:00 · 868f8a8756
parent 2702323f7d db7e6366cd
commit 868f8a8756
1 changed files with 8 additions and 1 deletions
--- a/cpuid_x86.c
+++ b/cpuid_x86.c
@ -59,9 +59,16 @@
 void cpuid(int op, int *eax, int *ebx, int *ecx, int *edx);
 #else
 static inline void cpuid(int op, int *eax, int *ebx, int *ecx, int *edx){
+#if defined(__i386__) && defined(__PIC__)
+  __asm__ __volatile__
+    ("mov %%ebx, %%edi;"
+     "cpuid;"
+     "xchgl %%ebx, %%edi;"
+     : "=a" (*eax), "=D" (*ebx), "=c" (*ecx), "=d" (*edx) : "a" (op) : "cc");
+#else
  __asm__ __volatile__
    ("cpuid": "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=d" (*edx) : "a" (op) : "cc");
-
+#endif
 }
 #endif