# HG changeset patch # User "Yann E. MORIN" # Date 1352486552 -3600 # Node ID 7da91f9ba3283440600f544da8c7a20fcfccd322 # Parent a8bf927f6e37698de50ab399f6807bd15342ae6b 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 -r a8bf927f6e37 -r 7da91f9ba328 patches/gcc/4.6.0/000-gcc-bug-54369.patch --- a/patches/gcc/4.6.0/000-gcc-bug-54369.patch Tue Nov 06 17:02:06 2012 +0100 +++ b/patches/gcc/4.6.0/000-gcc-bug-54369.patch Fri Nov 09 19:42:32 2012 +0100 @@ -13,6 +13,9 @@ 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 @@ 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 -r a8bf927f6e37 -r 7da91f9ba328 patches/gcc/4.6.1/000-gcc-bug-54369.patch --- a/patches/gcc/4.6.1/000-gcc-bug-54369.patch Tue Nov 06 17:02:06 2012 +0100 +++ b/patches/gcc/4.6.1/000-gcc-bug-54369.patch Fri Nov 09 19:42:32 2012 +0100 @@ -13,6 +13,9 @@ 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 @@ 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) -