Index: kernel/arch/amd64/Makefile.inc
===================================================================
--- kernel/arch/amd64/Makefile.inc	(revision 1515522110c67f91ca381c60a6723f751634a16b)
+++ kernel/arch/amd64/Makefile.inc	(revision 1c6b3a21d2eba83ec0ca710845ee3a0c33cf353b)
@@ -47,5 +47,5 @@
 #
 
-ifeq ($(MACHINE),opteron)
+ifeq ($(PROCESSOR),opteron)
 	CMN2 := -march=opteron
 	GCC_CFLAGS += $(CMN2)
Index: kernel/arch/ia32/Makefile.inc
===================================================================
--- kernel/arch/ia32/Makefile.inc	(revision 1515522110c67f91ca381c60a6723f751634a16b)
+++ kernel/arch/ia32/Makefile.inc	(revision 1c6b3a21d2eba83ec0ca710845ee3a0c33cf353b)
@@ -46,21 +46,21 @@
 #
 
-ifeq ($(MACHINE),athlon_xp)
+ifeq ($(PROCESSOR),athlon_xp)
 	CMN2 = -march=athlon-xp
 	SUNCC_CFLAGS += -xarch=ssea
 endif
-ifeq ($(MACHINE),athlon_mp)
+ifeq ($(PROCESSOR),athlon_mp)
 	CMN2 = -march=athlon-mp
 	SUNCC_CFLAGS += xarch=ssea
 endif
-ifeq ($(MACHINE),pentium3)
+ifeq ($(PROCESSOR),pentium3)
 	CMN2 = -march=pentium3
 	SUNCC_CFLAGS += -xarch=sse
 endif
-ifeq ($(MACHINE),pentium4)
+ifeq ($(PROCESSOR),pentium4)
 	CMN2 = -march=pentium4
 	SUNCC_CFLAGS += -xarch=sse2
 endif
-ifeq ($(MACHINE),core)
+ifeq ($(PROCESSOR),core)
 	CMN2 = -march=prescott
 	SUNCC_CFLAGS += -xarch=sse3
Index: kernel/arch/sparc64/Makefile.inc
===================================================================
--- kernel/arch/sparc64/Makefile.inc	(revision 1515522110c67f91ca381c60a6723f751634a16b)
+++ kernel/arch/sparc64/Makefile.inc	(revision 1c6b3a21d2eba83ec0ca710845ee3a0c33cf353b)
@@ -43,9 +43,9 @@
 DEFS += -D__64_BITS__
 
-ifeq ($(MACHINE),us)
+ifeq ($(PROCESSOR),us)
 	DEFS += -DUS
 endif
 
-ifeq ($(MACHINE),us3)
+ifeq ($(PROCESSOR),us3)
 	DEFS += -DUS3
 endif