fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / i386 / Makefile.cpu

diff --git a/arch/i386/Makefile.cpu b/arch/i386/Makefile.cpu
index dcd936e..4fe41f6 100644 (file)
--- a/arch/i386/Makefile.cpu
+++ b/arch/i386/Makefile.cpu
@@ -15,7 +15,7 @@ cflags-$(CONFIG_M486)         += -march=i486
 cflags-$(CONFIG_M586)          += -march=i586
 cflags-$(CONFIG_M586TSC)       += -march=i586
 cflags-$(CONFIG_M586MMX)       += -march=pentium-mmx
-cflags-$(CONFIG_M686)          += -march=i686
+cflags-$(CONFIG_M686)          += -march=i686 $(call tune,generic)
 cflags-$(CONFIG_MPENTIUMII)    += -march=i686 $(call tune,pentium2)
 cflags-$(CONFIG_MPENTIUMIII)   += -march=i686 $(call tune,pentium3)
 cflags-$(CONFIG_MPENTIUMM)     += -march=i686 $(call tune,pentium3)
@@ -32,6 +32,7 @@ cflags-$(CONFIG_MWINCHIP2)    += $(call cc-option,-march=winchip2,-march=i586)
 cflags-$(CONFIG_MWINCHIP3D)    += $(call cc-option,-march=winchip2,-march=i586)
 cflags-$(CONFIG_MCYRIXIII)     += $(call cc-option,-march=c3,-march=i486) $(align)-functions=0 $(align)-jumps=0 $(align)-loops=0
 cflags-$(CONFIG_MVIAC3_2)      += $(call cc-option,-march=c3-2,-march=i686)
+cflags-$(CONFIG_MCORE2)                += -march=i686 $(call cc-option,-mtune=core2,$(call cc-option,-mtune=generic,-mtune=i686))
 
 # AMD Elan support
 cflags-$(CONFIG_X86_ELAN)      += -march=i486
@@ -39,3 +40,7 @@ cflags-$(CONFIG_X86_ELAN)     += -march=i486
 # Geode GX1 support
 cflags-$(CONFIG_MGEODEGX1)     += -march=pentium-mmx
 
+# add at the end to overwrite eventual tuning options from earlier
+# cpu entries
+cflags-$(CONFIG_X86_GENERIC)   += $(call tune,generic)
+