Index: kernel/arch/ia32/Makefile.inc
===================================================================
--- kernel/arch/ia32/Makefile.inc	(revision 934b2e0be99407bebe9e2a8fbb2ebaf1242b8c46)
+++ kernel/arch/ia32/Makefile.inc	(revision 1a48bcd3561973c645144d2b46f10f70895be3be)
@@ -47,5 +47,6 @@
 
 ifeq ($(MACHINE),athlon-xp)
-	CMN2 = -march=athlon-xp -mno-mmx -mno-sse -mno-3dnow
+	FPU_NO_CFLAGS = -mno-mmx -mno-sse -mno-3dnow
+	CMN2 = -march=athlon-xp
 	GCC_CFLAGS += $(CMN2)
 	ICC_CFLAGS += $(CMN2)
@@ -56,5 +57,6 @@
 endif
 ifeq ($(MACHINE),athlon-mp)
-	CMN2 = -march=athlon-mp -mno-mmx -mno-sse -mno-3dnow
+	FPU_NO_CFLAGS = -mno-mmx -mno-sse -mno-3dnow
+	CMN2 = -march=athlon-mp
 	GCC_CFLAGS += $(CMN2)
 	ICC_CFLAGS += $(CMN2)
@@ -64,5 +66,6 @@
 endif
 ifeq ($(MACHINE),pentium3)
-	CMN2 = -march=pentium3 -mno-mmx -mno-sse
+	FPU_NO_CFLAGS = -mno-mmx -mno-sse
+	CMN2 = -march=pentium3
 	GCC_CFLAGS += $(CMN2)
 	ICC_CFLAGS += $(CMN2)
@@ -72,5 +75,6 @@
 endif
 ifeq ($(MACHINE),core)
-	CMN2 = -march=prescott -mno-mmmx -mno-sse -mno-sse2 -mno-sse3
+	FPU_NO_CFLAGS = -mno-mmmx -mno-sse -mno-sse2 -mno-sse3
+	CMN2 = -march=prescott
 	GCC_CFLAGS += $(CMN2)
 	ICC_CFLAGS += $(CMN2)
@@ -79,5 +83,6 @@
 endif
 ifeq ($(MACHINE),pentium4)
-	GCC_CFLAGS += -march=pentium4 -mno-mmx -mno-sse -mno-sse2
+	FPU_NO_CFLAGS = -mno-mmx -mno-sse -mno-sse2
+	GCC_CFLAGS += -march=pentium4
 	ICC_CFLAGS += -march=pentium4
 	SUNCC_CFLAGS += -xarch=sse2