Index: kernel/arch/amd64/Makefile.inc
===================================================================
--- kernel/arch/amd64/Makefile.inc	(revision c6e314a78bffc7c64e7095fea28ffc280b031237)
+++ kernel/arch/amd64/Makefile.inc	(revision 41f7564e975bcef427a9a5bcbb0c12c9001f1a58)
@@ -36,18 +36,11 @@
 TOOLCHAIN_DIR = /usr/local/amd64/bin
 
-## Make some default assumptions
-#
-
-ifndef CPU
-	CPU = opteron
-endif
-
 CFLAGS += -fno-unwind-tables -m64 -mcmodel=kernel -mno-red-zone
-DEFS += -D_CPU=${CPU} -D__64_BITS__
+DEFS += -DMACHINE=$(MACHINE) -D__64_BITS__
 
 ## Accepted CPUs
 #
 
-ifeq ($(CPU),opteron)
+ifeq ($(MACHINE),opteron)
 	CFLAGS += -march=opteron
 	DEFS += -DFENCES=p4
Index: kernel/arch/ia32/Makefile.inc
===================================================================
--- kernel/arch/ia32/Makefile.inc	(revision c6e314a78bffc7c64e7095fea28ffc280b031237)
+++ kernel/arch/ia32/Makefile.inc	(revision 41f7564e975bcef427a9a5bcbb0c12c9001f1a58)
@@ -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
Index: kernel/arch/ia64/Makefile.inc
===================================================================
--- kernel/arch/ia64/Makefile.inc	(revision c6e314a78bffc7c64e7095fea28ffc280b031237)
+++ kernel/arch/ia64/Makefile.inc	(revision 41f7564e975bcef427a9a5bcbb0c12c9001f1a58)
@@ -35,7 +35,4 @@
 TARGET = ia64-pc-linux-gnu
 TOOLCHAIN_DIR = /usr/local/ia64/bin
-
-## Make some default assumptions
-#
 
 INIT0_ADDRESS = 0xe000000000400000
Index: kernel/arch/mips32/Makefile.inc
===================================================================
--- kernel/arch/mips32/Makefile.inc	(revision c6e314a78bffc7c64e7095fea28ffc280b031237)
+++ kernel/arch/mips32/Makefile.inc	(revision 41f7564e975bcef427a9a5bcbb0c12c9001f1a58)
@@ -34,11 +34,4 @@
 TOOLCHAIN_DIR = /usr/local/mipsel/bin
 
-## Make some default assumptions
-#
-
-ifndef MIPS_MACHINE
-	MIPS_MACHINE = msim
-endif
-
 KERNEL_LOAD_ADDRESS = 0x80100000
 INIT_ADDRESS = 0x81000000
@@ -47,5 +40,5 @@
 CFLAGS += -mno-abicalls -G 0 -fno-zero-initialized-in-bss
 
-DEFS += -D__32_BITS__ -DMACHINE=${MIPS_MACHINE} -DKERNEL_LOAD_ADDRESS=${KERNEL_LOAD_ADDRESS} -DINIT_ADDRESS=${INIT_ADDRESS} -DINIT_SIZE=${INIT_SIZE}
+DEFS += -D__32_BITS__ -DMACHINE=$(MACHINE) -DKERNEL_LOAD_ADDRESS=${KERNEL_LOAD_ADDRESS} -DINIT_ADDRESS=${INIT_ADDRESS} -DINIT_SIZE=${INIT_SIZE}
 
 ## Compile with hierarchical page tables support.
@@ -64,5 +57,5 @@
 #
 
-ifeq ($(MIPS_MACHINE),indy)
+ifeq ($(MACHINE),indy)
 	# GCC 4.0.1 compiled for mipsEL has problems compiling in 
 	# BigEndian mode with the swl/swr/lwl/lwr instructions.
@@ -78,10 +71,10 @@
 	INIT_SIZE = 0
 endif
-ifeq ($(MIPS_MACHINE),lgxemul)
+ifeq ($(MACHINE),lgxemul)
 	BFD_NAME = elf32-tradlittlemips
 	BFD = binary
 	CFLAGS += -DFB_BIG_ENDIAN -DARCH_HAS_FPU -mips3
 endif
-ifeq ($(MIPS_MACHINE),bgxemul)
+ifeq ($(MACHINE),bgxemul)
 	BFD_NAME = elf32-bigmips
 	BFD = ecoff-bigmips
@@ -91,5 +84,5 @@
 	INIT_ADDRESS = 0x81800000
 endif
-ifeq ($(MIPS_MACHINE),simics)
+ifeq ($(MACHINE),simics)
 	# SIMICS 4kc emulation is broken, although for instructions
 	# that do not bother us
@@ -100,5 +93,5 @@
 	TLBCNT = 16
 endif
-ifeq ($(MIPS_MACHINE),msim)
+ifeq ($(MACHINE),msim)
 	BFD_NAME = elf32-tradlittlemips
 	BFD = binary
Index: kernel/arch/ppc32/Makefile.inc
===================================================================
--- kernel/arch/ppc32/Makefile.inc	(revision c6e314a78bffc7c64e7095fea28ffc280b031237)
+++ kernel/arch/ppc32/Makefile.inc	(revision 41f7564e975bcef427a9a5bcbb0c12c9001f1a58)
@@ -35,7 +35,4 @@
 TARGET = ppc-linux-gnu
 TOOLCHAIN_DIR = /usr/local/ppc/bin
-
-## Make some default assumptions
-#
 
 CFLAGS += -mcpu=powerpc -msoft-float -m32
Index: kernel/arch/ppc64/Makefile.inc
===================================================================
--- kernel/arch/ppc64/Makefile.inc	(revision c6e314a78bffc7c64e7095fea28ffc280b031237)
+++ kernel/arch/ppc64/Makefile.inc	(revision 41f7564e975bcef427a9a5bcbb0c12c9001f1a58)
@@ -36,7 +36,4 @@
 TOOLCHAIN_DIR = /usr/local/ppc64/bin
 
-## Make some default assumptions
-#
-
 CFLAGS += -mcpu=powerpc64 -msoft-float -m64
 AFLAGS += -a64
Index: kernel/arch/sparc64/Makefile.inc
===================================================================
--- kernel/arch/sparc64/Makefile.inc	(revision c6e314a78bffc7c64e7095fea28ffc280b031237)
+++ kernel/arch/sparc64/Makefile.inc	(revision 41f7564e975bcef427a9a5bcbb0c12c9001f1a58)
@@ -35,7 +35,4 @@
 TARGET = sparc64-linux-gnu
 TOOLCHAIN_DIR = /usr/local/sparc64/bin
-
-## Make some default assumptions
-#
 
 CFLAGS += -mcpu=ultrasparc -m64