Merge pull request #5 from Dridi/master

Fix the i686 build with hardening

Author: yaoj

common/util.c

@@ -45,7 +45,6 @@
 #include <signal.h>
 #include <stdarg.h>
 #include <errno.h>
-#include <cpuid.h>
 #include "include/types.h"
 #include "include/util.h"
 #include "include/perf.h"
@@ -315,6 +314,34 @@ cyc2ns(uint64_t cyc)
 	return (ns);
 }
 
+/* ARGSUSED */
+static void
+cpuid(unsigned int *eax, unsigned int *ebx, unsigned int *ecx,
+	unsigned int *edx)
+{
+#if __x86_64
+	__asm volatile(
+	    "cpuid\n\t"
+	    :"=a" (*eax),
+	    "=b" (*ebx),
+	    "=c" (*ecx),
+	    "=d" (*edx)
+	    :"a" (*eax));
+#else
+	__asm volatile(
+	    "push %%ebx\n\t"
+	    "cpuid\n\t"
+	    "mov %%ebx, (%4)\n\t"
+	    "pop %%ebx"
+	    :"=a" (*eax),
+	    "=c" (*ecx),
+	    "=d" (*edx)
+	    :"0" (*eax),
+	    "S" (ebx)
+	    :"memory");
+#endif
+}
+
 /*
  * Get the CPU type.
  */
@@ -326,7 +353,9 @@ cpu_type_get(void)
 	cpu_type_t type = CPU_UNSUP;
 	char vendor[16];
 
-	__cpuid(0, eax, ebx, ecx, edx);
+	eax = 0;
+	cpuid(&eax, &ebx, &ecx, &edx);
+
 	(void) strncpy(&vendor[0], (char *)(&ebx), 4);
 	(void) strncpy(&vendor[4], (char *)(&ecx), 4);
 	(void) strncpy(&vendor[8], (char *)(&edx), 4);
@@ -336,7 +365,9 @@ cpu_type_get(void)
 		return (CPU_UNSUP);
 	}
 
-	__cpuid(1, eax, ebx, ecx, edx);
+	eax = 1;
+	cpuid(&eax, &ebx, &ecx, &edx);
+
 	family = CPU_FAMILY(eax);
 	model = CPU_MODEL(eax);
 	ext_model = CPU_EXT_MODEL(eax);