From 9940ee9ba00d9d34a49ab274649c6cd68ee2a650 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 9 Sep 2008 12:10:08 +0000 Subject: [PATCH] move patch for 4.3 into proper range --- kernel-2.6.spec | 14 +++++++------- ....6-001-gcc43.patch => linux-2.6-670-gcc43.patch | 4 +--- 2 files changed, 8 insertions(+), 10 deletions(-) rename linux-2.6-001-gcc43.patch => linux-2.6-670-gcc43.patch (85%) diff --git a/kernel-2.6.spec b/kernel-2.6.spec index 6767543aa..bf5b3c5c9 100644 --- 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 1ff81c549..804c9a40d 100644 --- 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,) + -- 2.43.0