Modified cpuid for 32-bit x86 to avoid a gcc issue (not finding a register).

1 files changed, 20 insertions, 1 deletions

diff --git a/lib/accelerated/x86.h b/lib/accelerated/x86.h
index 8886516f4e..df411dfa39 100644
--- a/lib/accelerated/x86.h
+++ b/lib/accelerated/x86.h
@@ -5,8 +5,27 @@
 # define cpuid __cpuid
 
 #else
-#define cpuid(func,ax,bx,cx,dx)\
+
+# ifdef ASM_X86_64
+
+#  define cpuid(func,ax,bx,cx,dx)\
   __asm__ __volatile__ ("cpuid":\
   "=a" (ax), "=b" (bx), "=c" (cx), "=d" (dx) : "a" (func));
 
+# else
+/* some GCC versions complain on the version above */
+#  define cpuid(func, a, b, c, d) g_cpuid(func, &a, &b, &c, &d)
+
+inline static void g_cpuid(uint32_t func, unsigned int *ax, unsigned int *bx, unsigned int *cx, unsigned int* dx)
+{
+    asm volatile ("pushl %%ebx\n"
+                  "cpuid\n" 
+                  "movl %%ebx, %1\n"
+                  "popl %%ebx\n"
+                  :"=a" (*ax), "=r"(*bx), "=c"(*cx), "=d"(*cx)
+                  :"a"(func)
+                  :"cc");
+}
+# endif
+
 #endif