unsigned int _eax,_ebx,_ecx,_edx;
unsigned int level = 0;
- /* Test gcc inline asm for x86 */
-#if defined (__x86_64__) || defined (_M_X64)
+ /* Test gcc inline asm for x86. Note that we CANNOT plainly use __x86_64__
+ * to correspond to a 64-bit environment without also checking that __ILP32__
+ * is NOT set, since x32 uses __x86_64__.
+ */
+#if (defined(__x86_64__) && !defined(__ILP32__))
__asm__("push %%rbx \n\t"
"cpuid \n\t"
"movl %%ebx, %1 \n\t"
"pop %%rbx \n\t"
: "=a"(_eax), "=r"(_ebx), "=c"(_ecx), "=d"(_edx) : "0"(level));
-#else
+#elif (defined(__x86_64__) && defined(__ILP32__)) || defined(__i386__)
__asm__("push %%ebx \n\t"
"cpuid \n\t"
"movl %%ebx, %1 \n\t"
"pop %%ebx \n\t"
: "=a"(_eax), "=r"(_ebx), "=c"(_ecx), "=d"(_edx) : "0"(level));
+#else
+# error Cannot detect whether this is a 32-bit or 64-bit x86 build.
#endif
return 0;