move patch for 4.3 into proper range

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 6767543..bf5b3c5 100644 (file)
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -144,9 +144,6 @@ Source30: %{pldistro}-%{kversion}-i686-xenU.config
 Patch000: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-%{rpmversion}.bz2
 %endif
 
-%if "%{distroname}" == "f9"
-Patch001: linux-2.6-001-gcc43.patch
-%endif
 Patch010: linux-2.6-010-e1000e.patch
 Patch020: linux-2.6-020-build-id.patch
 Patch030: linux-2.6-030-netns.patch
@@ -185,6 +182,9 @@ Patch630: linux-2.6-630-sched-fix.patch
 Patch640: linux-2.6-640-netlink-audit-hack.patch
 Patch650: linux-2.6-650-hangcheck-reboot.patch
 Patch660: linux-2.6-660-nmi-watchdog-default.patch
+%if "%{distroname}" == "f9"
+Patch670: linux-2.6-670-gcc43.patch
+%endif
 
 # See also the file named 'sources' here for the related checksums
 # NOTE. iwlwifi should be in-kernel starting from 2.6.24
@@ -350,10 +350,6 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 0
 %endif
 
-%if "%{distroname}" == "f9"
-%ApplyPatch 1
-%endif
-
 %ApplyPatch 10
 %ApplyPatch 20
 
@@ -395,6 +391,10 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 640
 %ApplyPatch 650
 %ApplyPatch 660
+%if "%{distroname}" == "f9"
+%ApplyPatch 670
+%endif
+
 
 # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may
 # break with later patches.

diff --git a/linux-2.6-001-gcc43.patch b/linux-2.6-670-gcc43.patch
similarity index 85%
rename from linux-2.6-001-gcc43.patch
rename to linux-2.6-670-gcc43.patch
index 1ff81c5..804c9a4 100644 (file)
--- a/linux-2.6-001-gcc43.patch
+++ b/linux-2.6-670-gcc43.patch
@@ -1,14 +1,12 @@
 see http://www.mail-archive.com/devel@lists.laptop.org/msg10626.html
 --- a/arch/i386/Makefile       2008-09-09 12:15:51.000000000 +0200
 +++ b/arch/i386/Makefile       2008-09-09 12:16:26.000000000 +0200
-@@ -34,7 +34,11 @@ CHECKFLAGS  += -D__i386__
+@@ -34,7 +34,9 @@ CHECKFLAGS   += -D__i386__
  CFLAGS += -pipe -msoft-float -mregparm=3 -freg-struct-return
  
  # prevent gcc from keeping the stack 16 byte aligned
 -CFLAGS += $(call cc-option,-mpreferred-stack-boundary=2)
-+#CFLAGS += $(call cc-option,-mpreferred-stack-boundary=2)
 +CFLAGS += $(call cc-option,-mpreferred-stack-boundary=2,)
-+
 +CFLAGS += $(call cc-option,-fno-tree-scev-cprop,)
 +