gcc-4.6.0: Bring in patches from FSF 4.6 branch

This brings in new patches from 4.6 release branch
updates the comment section of existing branch to not
contain patch numbers.

Tested build on qemu for arm ppc mips x86 and x86_64

(From OE-Core rev: 3968f33b6542cf20cf63cf49bfbc033bd2486295)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 158 insertions, 0 deletions

diff --git a/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0400-PR-gcov-profile-49299.patch b/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0400-PR-gcov-profile-49299.patch
new file mode 100644
index 0000000000..ac84e6a823
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0400-PR-gcov-profile-49299.patch
@@ -0,0 +1,158 @@
+From a9093bc0aa135388aec0930c07f021c85c39dd93 Mon Sep 17 00:00:00 2001
+From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Tue, 7 Jun 2011 09:53:17 +0000
+Subject: [PATCH]        PR gcov-profile/49299
+        * value-prof.c (gimple_ic): Don't assume icall has
+        a fallthru edge.
+
+        * gcc.dg/tree-prof/pr49299-1.c: New test.
+        * gcc.dg/tree-prof/pr49299-2.c: New test.
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@174739 138bc75d-0d04-0410-961f-82ee72b054a4
+
+index 629f79a..8ee5730 100644
+new file mode 100644
+index 0000000..dd45baf
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/tree-prof/pr49299-1.c
+@@ -0,0 +1,34 @@
++/* { dg-options "-O2" } */
++
++__attribute__((noreturn)) void (*fn) (void);
++
++volatile int v;
++
++__attribute__((noreturn)) void
++fn0 (void)
++{
++  __builtin_exit (0);
++}
++
++__attribute__((noreturn)) void
++fn1 (void)
++{
++  __builtin_exit (1);
++}
++
++__attribute__((noinline, noclone)) void
++setfn (__attribute__((noreturn)) void (*x) (void))
++{
++  fn = x;
++}
++
++int
++main ()
++{
++  int i;
++  if (v < 1)
++    setfn (fn0);
++  else
++    setfn (fn1);
++  fn ();
++}
+diff --git a/gcc/testsuite/gcc.dg/tree-prof/pr49299-2.c b/gcc/testsuite/gcc.dg/tree-prof/pr49299-2.c
+new file mode 100644
+index 0000000..220c8c8
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/tree-prof/pr49299-2.c
+@@ -0,0 +1,34 @@
++/* { dg-options "-O2" } */
++
++void (*fn) (void);
++
++volatile int v;
++
++__attribute__((noreturn)) void
++fn0 (void)
++{
++  __builtin_exit (0);
++}
++
++void
++fn1 (void)
++{
++}
++
++__attribute__((noinline, noclone)) void
++setfn (void (*x) (void))
++{
++  fn = x;
++}
++
++int
++main ()
++{
++  int i;
++  if (v < 1)
++    setfn (fn0);
++  else
++    setfn (fn1);
++  fn ();
++  return 0;
++}
+diff --git a/gcc/value-prof.c b/gcc/value-prof.c
+index 8491c77..da7c0e5 100644
+--- a/gcc/value-prof.c
++++ b/gcc/value-prof.c
+@@ -1104,9 +1104,9 @@ gimple_ic (gimple icall_stmt, struct cgraph_node *direct_call,
+ {
+   gimple dcall_stmt, load_stmt, cond_stmt;
+   tree tmp0, tmp1, tmpv, tmp;
+-  basic_block cond_bb, dcall_bb, icall_bb, join_bb;
++  basic_block cond_bb, dcall_bb, icall_bb, join_bb = NULL;
+   tree optype = build_pointer_type (void_type_node);
+-  edge e_cd, e_ci, e_di, e_dj, e_ij;
++  edge e_cd, e_ci, e_di, e_dj = NULL, e_ij;
+   gimple_stmt_iterator gsi;
+   int lp_nr;
+ 
+@@ -1153,12 +1153,19 @@ gimple_ic (gimple icall_stmt, struct cgraph_node *direct_call,
+   else
+     {
+       e_ij = find_fallthru_edge (icall_bb->succs);
+-      e_ij->probability = REG_BR_PROB_BASE;
+-      e_ij->count = all - count;
+-      e_ij = single_pred_edge (split_edge (e_ij));
++      /* The indirect call might be noreturn.  */
++      if (e_ij != NULL)
++       {
++         e_ij->probability = REG_BR_PROB_BASE;
++         e_ij->count = all - count;
++         e_ij = single_pred_edge (split_edge (e_ij));
++       }
++    }
++  if (e_ij != NULL)
++    {
++      join_bb = e_ij->dest;
++      join_bb->count = all;
+     }
+-  join_bb = e_ij->dest;
+-  join_bb->count = all;
+ 
+   e_cd->flags = (e_cd->flags & ~EDGE_FALLTHRU) | EDGE_TRUE_VALUE;
+   e_cd->probability = prob;
+@@ -1170,12 +1177,15 @@ gimple_ic (gimple icall_stmt, struct cgraph_node *direct_call,
+ 
+   remove_edge (e_di);
+ 
+-  e_dj = make_edge (dcall_bb, join_bb, EDGE_FALLTHRU);
+-  e_dj->probability = REG_BR_PROB_BASE;
+-  e_dj->count = count;
++  if (e_ij != NULL)
++    {
++      e_dj = make_edge (dcall_bb, join_bb, EDGE_FALLTHRU);
++      e_dj->probability = REG_BR_PROB_BASE;
++      e_dj->count = count;
+ 
+-  e_ij->probability = REG_BR_PROB_BASE;
+-  e_ij->count = all - count;
++      e_ij->probability = REG_BR_PROB_BASE;
++      e_ij->count = all - count;
++    }
+ 
+   /* Insert PHI node for the call result if necessary.  */
+   if (gimple_call_lhs (icall_stmt)
+-- 
+1.7.0.4
+