From: Mark Huang Date: Tue, 6 Feb 2007 21:04:35 +0000 (+0000) Subject: - merge revision 1.8 X-Git-Tag: planetlab-4_0-rc1~6 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=58f0cc9d82047ec60b5b803e45abfbf991c5e7be;p=linux-2.6.git - merge revision 1.8 - enable compiling under gcc4 without warnings --- diff --git a/arch/i386/Makefile b/arch/i386/Makefile index 4d22f78e0..efec8dc7d 100644 --- a/arch/i386/Makefile +++ b/arch/i386/Makefile @@ -33,8 +33,7 @@ cflags-$(CONFIG_M486) += -march=i486 cflags-$(CONFIG_M586) += -march=i586 cflags-$(CONFIG_M586TSC) += -march=i586 cflags-$(CONFIG_M586MMX) += $(call cc-option,-march=pentium-mmx,-march=i586) -#cflags-$(CONFIG_M686) += -march=i686 -mtune=pentium4 -cflags-$(CONFIG_M686) += -march=i686 -mcpu=pentium4 +cflags-$(CONFIG_M686) += -march=i686 $(call cc-option,-mtune=pentium4,-mcpu=pentium4) cflags-$(CONFIG_MPENTIUMII) += -march=i686 $(call cc-option,-mtune=pentium2) cflags-$(CONFIG_MPENTIUMIII) += -march=i686 $(call cc-option,-mtune=pentium3) cflags-$(CONFIG_MPENTIUMM) += -march=i686 $(call cc-option,-mtune=pentium3)