From d12940f6ac688083afcd1f0bb30ac7966c8f79bc Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Fri, 9 Nov 2012 19:42:32 +0100 Subject: cc/gcc: fix patches for 4.6.{0,1} Remove the sparc part, as it touches code that does not exist in those versions of gcc (it was added at 4.6.2). Signed-off-by: "Yann E. MORIN" CC: Florian Fainelli diff --git a/patches/gcc/4.6.0/000-gcc-bug-54369.patch b/patches/gcc/4.6.0/000-gcc-bug-54369.patch index b91f0eb..1cdb659 100644 --- a/patches/gcc/4.6.0/000-gcc-bug-54369.patch +++ b/patches/gcc/4.6.0/000-gcc-bug-54369.patch @@ -13,6 +13,9 @@ Modified: branches/gcc-4_6-branch/gcc/ChangeLog branches/gcc-4_6-branch/gcc/config/mips/mips.c branches/gcc-4_6-branch/gcc/config/sparc/sparc.c + +[yann.morin.1998@free.fr: remove the sparc part, it does not apply] + --- --- gcc-4_6-branch/gcc/config/mips/mips.c 2012/09/02 10:36:54 190859 +++ gcc-4_6-branch/gcc/config/mips/mips.c 2012/09/02 10:37:49 190860 @@ -28,18 +31,3 @@ Modified: mips_reorg_process_insns (); if (!TARGET_MIPS16 && TARGET_EXPLICIT_RELOCS ---- gcc-4_6-branch/gcc/config/sparc/sparc.c 2012/09/02 10:36:54 190859 -+++ gcc-4_6-branch/gcc/config/sparc/sparc.c 2012/09/02 10:37:49 190860 -@@ -9456,7 +9456,10 @@ - /* We need to have the (essentially) final form of the insn stream in order - to properly detect the various hazards. Run delay slot scheduling. */ - if (optimize > 0 && flag_delayed_branch) -- dbr_schedule (get_insns ()); -+ { -+ cleanup_barriers (); -+ dbr_schedule (get_insns ()); -+ } - - /* Now look for specific patterns in the insn stream. */ - for (insn = get_insns (); insn; insn = next) - diff --git a/patches/gcc/4.6.1/000-gcc-bug-54369.patch b/patches/gcc/4.6.1/000-gcc-bug-54369.patch index b91f0eb..1cdb659 100644 --- a/patches/gcc/4.6.1/000-gcc-bug-54369.patch +++ b/patches/gcc/4.6.1/000-gcc-bug-54369.patch @@ -13,6 +13,9 @@ Modified: branches/gcc-4_6-branch/gcc/ChangeLog branches/gcc-4_6-branch/gcc/config/mips/mips.c branches/gcc-4_6-branch/gcc/config/sparc/sparc.c + +[yann.morin.1998@free.fr: remove the sparc part, it does not apply] + --- --- gcc-4_6-branch/gcc/config/mips/mips.c 2012/09/02 10:36:54 190859 +++ gcc-4_6-branch/gcc/config/mips/mips.c 2012/09/02 10:37:49 190860 @@ -28,18 +31,3 @@ Modified: mips_reorg_process_insns (); if (!TARGET_MIPS16 && TARGET_EXPLICIT_RELOCS ---- gcc-4_6-branch/gcc/config/sparc/sparc.c 2012/09/02 10:36:54 190859 -+++ gcc-4_6-branch/gcc/config/sparc/sparc.c 2012/09/02 10:37:49 190860 -@@ -9456,7 +9456,10 @@ - /* We need to have the (essentially) final form of the insn stream in order - to properly detect the various hazards. Run delay slot scheduling. */ - if (optimize > 0 && flag_delayed_branch) -- dbr_schedule (get_insns ()); -+ { -+ cleanup_barriers (); -+ dbr_schedule (get_insns ()); -+ } - - /* Now look for specific patterns in the insn stream. */ - for (insn = get_insns (); insn; insn = next) - -- cgit v0.10.2-6-g49f6