From 95f1b6d4157b93249cd6dd2a92b4116fabcff1f7 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Fri, 7 Sep 2012 10:31:58 +0000
Subject: [PATCH] gcc: add upstream fixes for GCC bug 54494

See: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54494 for more infos.

SVN-Revision: 33329
---
 .../4.7-linaro/002-gcc-bug-54494.patch        | 37 +++++++++++++++++++
 .../gcc/patches/4.7.0/002-gcc-bug-54494.patch | 37 +++++++++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100644 toolchain/gcc/patches/4.7-linaro/002-gcc-bug-54494.patch
 create mode 100644 toolchain/gcc/patches/4.7.0/002-gcc-bug-54494.patch

diff --git a/toolchain/gcc/patches/4.7-linaro/002-gcc-bug-54494.patch b/toolchain/gcc/patches/4.7-linaro/002-gcc-bug-54494.patch
new file mode 100644
index 0000000000..ce4ae770f0
--- /dev/null
+++ b/toolchain/gcc/patches/4.7-linaro/002-gcc-bug-54494.patch
@@ -0,0 +1,37 @@
+URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=191025
+Log:
+2012-09-06  Andrew Pinski  <apinski@cavium.com>
+
+        PR tree-opt/54494
+        * tree-inline.c (remap_gimple_op_r): Copy TREE_SIDE_EFFECTS also.
+2012-09-06  Andrew Pinski  <apinski@cavium.com>
+
+        PR tree-opt/54494
+        * gcc.dg/tree-ssa/strlen-1.c: New testcase.
+
+
+Added:
+    branches/gcc-4_7-branch/gcc/testsuite/gcc.dg/tree-ssa/strlen-1.c
+      - copied unchanged from r191014,
+trunk/gcc/testsuite/gcc.dg/tree-ssa/strlen-1.c
+Modified:
+    branches/gcc-4_7-branch/   (props changed)
+    branches/gcc-4_7-branch/gcc/ChangeLog
+    branches/gcc-4_7-branch/gcc/testsuite/ChangeLog
+    branches/gcc-4_7-branch/gcc/tree-inline.c
+
+Propchange: branches/gcc-4_7-branch/
+            ('svn:mergeinfo' modified)
+
+---
+--- gcc-4_7-branch/gcc/tree-inline.c	2012/09/06 13:47:33	191024
++++ gcc-4_7-branch/gcc/tree-inline.c	2012/09/06 13:51:37	191025
+@@ -871,6 +871,7 @@
+ 			     ptr, TREE_OPERAND (*tp, 1));
+ 	  TREE_THIS_NOTRAP (*tp) = TREE_THIS_NOTRAP (old);
+ 	  TREE_THIS_VOLATILE (*tp) = TREE_THIS_VOLATILE (old);
++	  TREE_SIDE_EFFECTS (*tp) = TREE_SIDE_EFFECTS (old);
+ 	  TREE_NO_WARNING (*tp) = TREE_NO_WARNING (old);
+ 	  *walk_subtrees = 0;
+ 	  return NULL;
+
diff --git a/toolchain/gcc/patches/4.7.0/002-gcc-bug-54494.patch b/toolchain/gcc/patches/4.7.0/002-gcc-bug-54494.patch
new file mode 100644
index 0000000000..ce4ae770f0
--- /dev/null
+++ b/toolchain/gcc/patches/4.7.0/002-gcc-bug-54494.patch
@@ -0,0 +1,37 @@
+URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=191025
+Log:
+2012-09-06  Andrew Pinski  <apinski@cavium.com>
+
+        PR tree-opt/54494
+        * tree-inline.c (remap_gimple_op_r): Copy TREE_SIDE_EFFECTS also.
+2012-09-06  Andrew Pinski  <apinski@cavium.com>
+
+        PR tree-opt/54494
+        * gcc.dg/tree-ssa/strlen-1.c: New testcase.
+
+
+Added:
+    branches/gcc-4_7-branch/gcc/testsuite/gcc.dg/tree-ssa/strlen-1.c
+      - copied unchanged from r191014,
+trunk/gcc/testsuite/gcc.dg/tree-ssa/strlen-1.c
+Modified:
+    branches/gcc-4_7-branch/   (props changed)
+    branches/gcc-4_7-branch/gcc/ChangeLog
+    branches/gcc-4_7-branch/gcc/testsuite/ChangeLog
+    branches/gcc-4_7-branch/gcc/tree-inline.c
+
+Propchange: branches/gcc-4_7-branch/
+            ('svn:mergeinfo' modified)
+
+---
+--- gcc-4_7-branch/gcc/tree-inline.c	2012/09/06 13:47:33	191024
++++ gcc-4_7-branch/gcc/tree-inline.c	2012/09/06 13:51:37	191025
+@@ -871,6 +871,7 @@
+ 			     ptr, TREE_OPERAND (*tp, 1));
+ 	  TREE_THIS_NOTRAP (*tp) = TREE_THIS_NOTRAP (old);
+ 	  TREE_THIS_VOLATILE (*tp) = TREE_THIS_VOLATILE (old);
++	  TREE_SIDE_EFFECTS (*tp) = TREE_SIDE_EFFECTS (old);
+ 	  TREE_NO_WARNING (*tp) = TREE_NO_WARNING (old);
+ 	  *walk_subtrees = 0;
+ 	  return NULL;
+
-- 
GitLab