rpms/kernel/FC-4 kernel-2.6.spec, 1.1399, 1.1400 linux-2.6.10-x86-tune-p4.patch, 1.2, 1.3

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv18062

Modified Files:
	kernel-2.6.spec linux-2.6.10-x86-tune-p4.patch 
Log Message:
Fix compilation with older gcc. (#164041)




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1399
retrieving revision 1.1400
diff -u -r1.1399 -r1.1400
--- kernel-2.6.spec	15 Jul 2005 20:17:13 -0000	1.1399
+++ kernel-2.6.spec	28 Jul 2005 07:30:03 -0000	1.1400
@@ -1270,6 +1270,9 @@
 %endif
 
 %changelog
+* Thu Jul 28 2005 Dave Jones <davej at redhat.com>
+- Fix compilation with older gcc. (#164041)
+
 * Fri Jul 15 2005 Dave Jones <davej at redhat.com>
 - Enable the DC395x driver. (#151010)
 

linux-2.6.10-x86-tune-p4.patch:
 linux-2.6.10/arch/i386/Makefile   |    2 +-
 linux-2.6.12/arch/x86_64/Makefile |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

Index: linux-2.6.10-x86-tune-p4.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6.10-x86-tune-p4.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6.10-x86-tune-p4.patch	22 Mar 2005 07:00:21 -0000	1.2
+++ linux-2.6.10-x86-tune-p4.patch	28 Jul 2005 07:30:15 -0000	1.3
@@ -6,7 +6,20 @@
  cflags-$(CONFIG_M586TSC)	+= -march=i586
  cflags-$(CONFIG_M586MMX)	+= $(call cc-option,-march=pentium-mmx,-march=i586)
 -cflags-$(CONFIG_M686)		+= -march=i686
-+cflags-$(CONFIG_M686)		+= -march=i686 -mtune=pentium4
++cflags-$(CONFIG_M686)		+= -march=i686 $(call cc-option,-mtune=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)
+--- linux-2.6.12/arch/x86_64/Makefile~	2005-07-05 19:48:18.000000000 -0400
++++ linux-2.6.12/arch/x86_64/Makefile	2005-07-05 19:49:06.000000000 -0400
+@@ -39,9 +39,7 @@ LDFLAGS_vmlinux :=
+ 
+ CHECKFLAGS      += -D__x86_64__ -m64
+ 
+-cflags-$(CONFIG_MK8) += $(call cc-option,-march=k8)
+-cflags-$(CONFIG_MPSC) += $(call cc-option,-march=nocona)
+-CFLAGS += $(cflags-y)
++CFLAGS += -march=k8 -mtune=nocona
+ 
+ CFLAGS += -mno-red-zone
+ CFLAGS += -mcmodel=kernel