[oe] [PATCH] gcc-4.6: drop/update few patches from gcc-4_6-branch-linaro-backports.inc

[Martin Jansa]

* they need to be rebased after
  http://git.openembedded.org/cgit.cgi/openembedded-core/commit/?id=ed7deecb9503420fbf8071445e077c32beda8dc4

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 .../gcc-4.6/linaro/gcc-4.6-linaro-r106741.patch    |    4 ++--
 .../gcc-4.6/linaro/gcc-4.6-linaro-r106742.patch    |    9 ++++-----
 .../gcc/gcc-4_6-branch-linaro-backports.inc        |    2 --
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106741.patch b/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106741.patch
index 84f6f64..f76914f 100644
--- a/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106741.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106741.patch
@@ -188,8 +188,8 @@
  	{
  	  /* Try to simplify the expression further.  */
  	  rtx tor = simplify_gen_binary (IOR, mode, XEXP (x, 0), XEXP (x, 1));
--	  temp = combine_simplify_rtx (tor, mode, in_dest);
-+	  temp = combine_simplify_rtx (tor, mode, in_dest, 0);
+-	  temp = combine_simplify_rtx (tor, VOIDmode, in_dest);
++	  temp = combine_simplify_rtx (tor, VOIDmode, in_dest, 0);
  
  	  /* If we could, great.  If not, do not go ahead with the IOR
  	     replacement, since PLUS appears in many special purpose
diff --git a/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106742.patch b/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106742.patch
index d14f06c..836b76f 100644
--- a/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106742.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106742.patch
@@ -1582,15 +1582,14 @@
 === modified file 'gcc/config/arm/predicates.md'
 --- old/gcc/config/arm/predicates.md	2011-04-07 10:52:12 +0000
 +++ new/gcc/config/arm/predicates.md	2011-05-03 15:14:56 +0000
-@@ -683,3 +683,7 @@
-    } 
-   return true; 
- })
+@@ -686,3 +686,7 @@
+ 
+ (define_special_predicate "add_operator"
+ 			 (match_code "plus"))
 +
 +(define_special_predicate "neon_struct_operand"
 +  (and (match_code "mem")
 +       (match_test "TARGET_32BIT && neon_vector_mem_operand (op, 2)")))
-
 === modified file 'gcc/doc/tm.texi'
 --- old/gcc/doc/tm.texi	2011-01-22 19:35:10 +0000
 +++ new/gcc/doc/tm.texi	2011-05-03 15:17:25 +0000
diff --git a/meta-oe/recipes-devtools/gcc/gcc-4_6-branch-linaro-backports.inc b/meta-oe/recipes-devtools/gcc/gcc-4_6-branch-linaro-backports.inc
index 86dceab..e256e15 100644
--- a/meta-oe/recipes-devtools/gcc/gcc-4_6-branch-linaro-backports.inc
+++ b/meta-oe/recipes-devtools/gcc/gcc-4_6-branch-linaro-backports.inc
@@ -21,11 +21,9 @@ file://linaro/gcc-4.6-linaro-r106755.patch \
 file://linaro/gcc-4.6-linaro-r106759.patch \
 file://linaro/gcc-4.6-linaro-r106761.patch \
 file://linaro/gcc-4.6-linaro-r106762.patch \
-file://linaro/gcc-4.6-linaro-r106763.patch \
 file://linaro/gcc-4.6-linaro-r106764.patch \
 file://linaro/gcc-4.6-linaro-r106766.patch \
 file://linaro/gcc-4.6-linaro-r106768.patch \
-file://linaro/gcc-4.6-linaro-r106769.patch \
 file://linaro/gcc-4.6-linaro-r106770.patch \
 file://linaro/gcc-4.6-linaro-r106771.patch \
 file://linaro/gcc-4.6-linaro-r106772.patch \
-- 
1.7.6.1