Index: kernel/arch/ia32/Makefile.inc
===================================================================
--- kernel/arch/ia32/Makefile.inc	(revision f651e80e2ba6968d9e184dd8ca7fa6e5b779caaf)
+++ kernel/arch/ia32/Makefile.inc	(revision ff50f4028ac28f68255e99ff510cd765ca0cff13)
@@ -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
Index: kernel/arch/ia32xen/Makefile.inc
===================================================================
--- kernel/arch/ia32xen/Makefile.inc	(revision f651e80e2ba6968d9e184dd8ca7fa6e5b779caaf)
+++ kernel/arch/ia32xen/Makefile.inc	(revision ff50f4028ac28f68255e99ff510cd765ca0cff13)
@@ -51,7 +51,5 @@
 
 ifeq ($(MACHINE),athlon-xp)
-	CMN2 = -march=athlon-xp -mmmx -msse -m3dnow
-	GCC_CFLAGS += $(CMN2)
-	ICC_CFLAGS += $(CMN2)
+	CMN2 = -march=athlon-xp
 	SUNCC_CFLAGS += -xarch=ssea
 	DEFS += -DCONFIG_FENCES_P3
@@ -60,32 +58,29 @@
 endif
 ifeq ($(MACHINE),athlon-mp)
-	CMN2 = -march=athlon-mp -mmmx -msse -m3dnow
-	GCC_CFLAGS += $(CMN2)
-	ICC_CFLAGS += $(CMN2)
-	SUNCC_CFLAGS += -xarch=ssea
+	CMN2 = -march=athlon-mp
+	SUNCC_CFLAGS += xarch=ssea
 	DEFS += -DCONFIG_FENCES_P3
 	CONFIG_HT = n
 endif
 ifeq ($(MACHINE),pentium3)
-	CMN2 = -march=pentium3 -mmmx -msse
-	GCC_CFLAGS += $(CMN2)
-	ICC_CFLAGS += $(CMN2)
+	CMN2 = -march=pentium3
 	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)
-	CMN2 = -march=prescott -mfpmath=sse -mmmx -msse -msse2 -msse3
-	GCC_CFLAGS += $(CMN2)
-	ICC_CFLAGS += $(CMN2)
+	CMN2 = -march=prescott
 	SUNCC_CFLAGS += -xarch=sse3
 	DEFS += -DCONFIG_FENCES_P4
 endif
-ifeq ($(MACHINE),pentium4)
-	GCC_CFLAGS += -march=pentium4 -mfpmath=sse -mmmx -msse -msse2
-	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