@@ -116,11 +116,11 @@
     NSSearchPathDirectory, NSSearchPathDomainMask);
 extern NSSearchPathEnumerationState NSGetNextSearchPathEnumeration(
     NSSearchPathEnumerationState, char *);
 #endif
 
-#if defined(OF_X86_64) || defined(OF_X86)
+#if defined(OF_AMD64) || defined(OF_X86)
 struct X86Regs {
 	uint32_t eax, ebx, ecx, edx;
 };
 #endif
 
@@ -288,17 +288,17 @@
 		tmpFSIRI = [[OFIRI alloc] initFileIRIWithPath: @"tmpfs:/"
 						  isDirectory: true];
 }
 #endif
 
-#if defined(OF_X86_64) || defined(OF_X86)
+#if defined(OF_AMD64) || defined(OF_X86)
 static OF_INLINE struct X86Regs OF_CONST_FUNC
 x86CPUID(uint32_t eax, uint32_t ecx)
 {
 	struct X86Regs regs;
 
-# if defined(OF_X86_64) && defined(__GNUC__)
+# if defined(OF_AMD64) && defined(__GNUC__)
 	__asm__ (
 	    "cpuid"
 	    : "=a"(regs.eax), "=b"(regs.ebx), "=c"(regs.ecx), "=d"(regs.edx)
 	    : "a"(eax), "c"(ecx)
 	);
@@ -653,11 +653,11 @@
 #endif
 }
 
 + (OFString *)CPUVendor
 {
-#if (defined(OF_X86_64) || defined(OF_X86)) && defined(__GNUC__)
+#if (defined(OF_AMD64) || defined(OF_X86)) && defined(__GNUC__)
 	struct X86Regs regs = x86CPUID(0, 0);
 	uint32_t buffer[3];
 
 	if (regs.eax == 0)
 		return nil;
@@ -676,11 +676,11 @@
 #endif
 }
 
 + (OFString *)CPUModel
 {
-#if (defined(OF_X86_64) || defined(OF_X86)) && defined(__GNUC__)
+#if (defined(OF_AMD64) || defined(OF_X86)) && defined(__GNUC__)
 	struct X86Regs regs = x86CPUID(0x80000000, 0);
 	uint32_t buffer[12];
 	size_t i;
 
 	if (regs.eax < 0x80000004)
@@ -735,11 +735,11 @@
 #else
 	return nil;
 #endif
 }
 
-#if defined(OF_X86_64) || defined(OF_X86)
+#if defined(OF_AMD64) || defined(OF_X86)
 + (bool)supportsMMX
 {
 	return (x86CPUID(1, 0).edx & (1u << 23));
 }