Index: arch/ia32/Makefile.inc
===================================================================
--- arch/ia32/Makefile.inc	(revision d43d2f705946ff05da350bbb3b6648898cae3600)
+++ arch/ia32/Makefile.inc	(revision 9371c301116efcd366e21f4bc55ae2528b3fbbec)
@@ -39,14 +39,14 @@
 #
 
-ifndef CPU
-	CPU = pentium4
+ifndef IA32_CPU
+	IA32_CPU = pentium4
 endif
 
-DEFS += -D_CPU=${CPU}
+DEFS += -D_CPU=${IA32_CPU}
 
 ## Accepted CPUs
 #
 
-ifeq ($(CPU),athlon-xp)
+ifeq ($(IA32_CPU),athlon-xp)
 	CFLAGS += -march=athlon-xp -mmmx -msse -m3dnow
 	DEFS += -DCONFIG_FENCES_P3
@@ -54,19 +54,19 @@
 	CONFIG_HT = n
 endif
-ifeq ($(CPU),athlon-mp)
+ifeq ($(IA32_CPU),athlon-mp)
 	CFLAGS += -march=athlon-mp -mmmx -msse -m3dnow
 	DEFS += -DCONFIG_FENCES_P3
 	CONFIG_HT = n
 endif
-ifeq ($(CPU),pentium3)
+ifeq ($(IA32_CPU),pentium3)
 	CFLAGS += -march=pentium3 -mmmx -msse
 	DEFS += -DCONFIG_FENCES_P3
 	CONFIG_HT = n
 endif
-ifeq ($(CPU),prescott)
+ifeq ($(IA32_CPU),prescott)
 	CFLAGS += -march=pentium4 -mfpmath=sse -mmmx -msse -msse2 -msse3
 	DEFS += -DCONFIG_FENCES_P4
 endif
-ifeq ($(CPU),pentium4)
+ifeq ($(IA32_CPU),pentium4)
 	CFLAGS += -march=pentium4 -mfpmath=sse -mmmx -msse -msse2
 	DEFS += -DCONFIG_FENCES_P4