Index: kernel/arch/ia32/Makefile.inc
===================================================================
--- kernel/arch/ia32/Makefile.inc	(revision c6e314a78bffc7c64e7095fea28ffc280b031237)
+++ kernel/arch/ia32/Makefile.inc	(revision 380954d90c201dd4b8b68b85e7a23ca34f8581a6)
@@ -36,17 +36,10 @@
 TOOLCHAIN_DIR = /usr/local/i686/bin
 
-## Make some default assumptions
-#
-
-ifndef IA32_CPU
-	IA32_CPU = pentium4
-endif
-
-DEFS += -D_CPU=${IA32_CPU} -D__32_BITS__
+DEFS += -DMACHINE=$(MACHINE) -D__32_BITS__
 
 ## Accepted CPUs
 #
 
-ifeq ($(IA32_CPU),athlon-xp)
+ifeq ($(MACHINE),athlon-xp)
 	CFLAGS += -march=athlon-xp -mmmx -msse -m3dnow
 	DEFS += -DCONFIG_FENCES_P3
@@ -54,19 +47,19 @@
 	CONFIG_HT = n
 endif
-ifeq ($(IA32_CPU),athlon-mp)
+ifeq ($(MACHINE),athlon-mp)
 	CFLAGS += -march=athlon-mp -mmmx -msse -m3dnow
 	DEFS += -DCONFIG_FENCES_P3
 	CONFIG_HT = n
 endif
-ifeq ($(IA32_CPU),pentium3)
+ifeq ($(MACHINE),pentium3)
 	CFLAGS += -march=pentium3 -mmmx -msse
 	DEFS += -DCONFIG_FENCES_P3
 	CONFIG_HT = n
 endif
-ifeq ($(IA32_CPU),prescott)
+ifeq ($(MACHINE),prescott)
 	CFLAGS += -march=pentium4 -mfpmath=sse -mmmx -msse -msse2 -msse3
 	DEFS += -DCONFIG_FENCES_P4
 endif
-ifeq ($(IA32_CPU),pentium4)
+ifeq ($(MACHINE),pentium4)
 	CFLAGS += -march=pentium4 -mfpmath=sse -mmmx -msse -msse2
 	DEFS += -DCONFIG_FENCES_P4