X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/e1ac8bd99e01882b7dba40efb83941a1b60f024d..0f2e183f73e2341cb05ba8ff65100b6dcae9b729:/base/dispatch-x86ish.S

diff --git a/base/dispatch-x86ish.S b/base/dispatch-x86ish.S
index 8a4c7b2e..e5a17406 100644
--- a/base/dispatch-x86ish.S
+++ b/base/dispatch-x86ish.S
@@ -67,7 +67,9 @@ FUNC(dispatch_x86ish_cpuid)
   endprologue
 
 	// First, check that this is even a thing, using the complicated
-	// dance with the flags register.
+	// dance with the flags register.  This is unnecessary on AMD64,
+	// which postdates the introduction of `cpuid'.
+#if CPUFAM_X86
 	pushf
 	pop	DX			// current flags in d
 
@@ -86,6 +88,7 @@ FUNC(dispatch_x86ish_cpuid)
 	pop	DX
 	test	edx, EFLAGS_ID
 	jnz	8f
+#endif
 
 	// OK, that seemed to work.
 	cpuid
@@ -108,6 +111,7 @@ FUNC(dispatch_x86ish_cpuid)
 	ret
 
 	// Failed.
+#if CPUFAM_X86
 8:	xor	eax, eax
 	mov	[OUT + 0], eax
 	mov	[OUT + 4], eax
@@ -115,6 +119,9 @@ FUNC(dispatch_x86ish_cpuid)
 	mov	[OUT + 12], eax
 	mov	eax, -1
 	jmp	9b
+#endif
+
+#undef OUT
 ENDFUNC
 
 ///--------------------------------------------------------------------------