Index: kernel/arch/ia32/Makefile.inc
===================================================================
--- kernel/arch/ia32/Makefile.inc	(revision f2451459eff17f8a5c730a385925d2af36865089)
+++ kernel/arch/ia32/Makefile.inc	(revision b1747a566f73b656e2bbf679b8136ecb0a61b9b4)
@@ -51,8 +51,5 @@
 
 ifeq ($(MACHINE),athlon-xp)
-	FPU_NO_CFLAGS = -mno-mmx -mno-sse -mno-3dnow
 	CMN2 = -march=athlon-xp
-	GCC_CFLAGS += $(CMN2)
-	ICC_CFLAGS += $(CMN2)
 	SUNCC_CFLAGS += -xarch=ssea
 	DEFS += -DCONFIG_FENCES_P3
@@ -61,8 +58,5 @@
 endif
 ifeq ($(MACHINE),athlon-mp)
-	FPU_NO_CFLAGS = -mno-mmx -mno-sse -mno-3dnow
 	CMN2 = -march=athlon-mp
-	GCC_CFLAGS += $(CMN2)
-	ICC_CFLAGS += $(CMN2)
 	SUNCC_CFLAGS += xarch=ssea
 	DEFS += -DCONFIG_FENCES_P3
@@ -70,27 +64,23 @@
 endif
 ifeq ($(MACHINE),pentium3)
-	FPU_NO_CFLAGS = -mno-mmx -mno-sse
 	CMN2 = -march=pentium3
-	GCC_CFLAGS += $(CMN2)
-	ICC_CFLAGS += $(CMN2)
 	SUNCC_CFLAGS += -xarch=sse
 	DEFS += -DCONFIG_FENCES_P3
 	CONFIG_HT = n
 endif
+ifeq ($(MACHINE),pentium4)
+	CMN2 = -march=pentium4
+	SUNCC_CFLAGS += -xarch=sse2
+	DEFS += -DCONFIG_FENCES_P4
+endif
 ifeq ($(MACHINE),core)
-	FPU_NO_CFLAGS = -mno-mmx -mno-sse -mno-sse2 -mno-sse3
 	CMN2 = -march=prescott
-	GCC_CFLAGS += $(CMN2)
-	ICC_CFLAGS += $(CMN2)
 	SUNCC_CFLAGS += -xarch=sse3
 	DEFS += -DCONFIG_FENCES_P4
 endif
-ifeq ($(MACHINE),pentium4)
-	FPU_NO_CFLAGS = -mno-mmx -mno-sse -mno-sse2
-	GCC_CFLAGS += -march=pentium4
-	ICC_CFLAGS += -march=pentium4
-	SUNCC_CFLAGS += -xarch=sse2
-	DEFS += -DCONFIG_FENCES_P4
-endif
+
+FPU_NO_CFLAGS = -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow
+GCC_CFLAGS += $(CMN2)
+ICC_CFLAGS += $(CMN2)
 
 ## Own configuration directives