From 63df62bec55573900e68883dfc553ba617d895e5 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 25 May 2012 18:17:59 +0200
Subject: [PATCH] 4.7.0-6

---
 .gitignore          |  1 +
 gcc.spec            | 20 +++++++++++++++++---
 gcc47-pr53438.patch | 21 +++++++++++++++++++++
 sources             |  2 +-
 4 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 gcc47-pr53438.patch

diff --git a/.gitignore b/.gitignore
index 4218997..cbbab3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@
 /gcc-4.7.0-20120502.tar.bz2
 /gcc-4.7.0-20120504.tar.bz2
 /gcc-4.7.0-20120507.tar.bz2
+/gcc-4.7.0-20120525.tar.bz2
diff --git a/gcc.spec b/gcc.spec
index 86423de..47005da 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -1,9 +1,9 @@
-%global DATE 20120507
-%global SVNREV 187244
+%global DATE 20120525
+%global SVNREV 187884
 %global gcc_version 4.7.0
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 5
+%global gcc_release 6
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64 ppc ppc64 alpha
@@ -174,6 +174,7 @@ Patch12: gcc47-libstdc++-docs.patch
 Patch13: gcc47-no-add-needed.patch
 Patch14: gcc47-ppl-0.10.patch
 Patch15: gcc47-libitm-fno-exceptions.patch
+Patch16: gcc47-pr53438.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 Patch1001: fastjar-0.97-len1.patch
@@ -675,6 +676,7 @@ package or when debugging this package.
 %patch14 -p0 -b .ppl-0.10~
 %endif
 %patch15 -p0 -b .libitm-fno-exceptions~
+%patch16 -p0 -b .pr53438~
 
 %if 0%{?_enable_debug_packages}
 cat > split-debuginfo.sh <<\EOF
@@ -2641,6 +2643,18 @@ fi
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/plugin
 
 %changelog
+* Fri May 25 2012 Jakub Jelinek <jakub@redhat.com> 4.7.0-6
+- update from the 4.7 branch
+  - PRs ada/52362, ada/52494, bootstrap/53183, c++/53209, c++/53301,
+	c/53418, debug/52727, fortran/53310, fortran/53389, libstdc++/52700,
+	middle-end/51071, middle-end/52584, middle-end/53460,
+	rtl-optimization/52804, target/46098, target/53256, target/53272,
+	target/53358, target/53385, target/53416, target/53435, target/53448,
+	tree-optimization/53364, tree-optimization/53366,
+	tree-optimization/53408, tree-optimization/53409,
+	tree-optimization/53410, tree-optimization/53436,
+	tree-optimization/53465
+
 * Mon May  7 2012 Jakub Jelinek <jakub@redhat.com> 4.7.0-5
 - update from the 4.7 branch
   - PRs fortran/53111, fortran/53255, target/48496, target/52999,
diff --git a/gcc47-pr53438.patch b/gcc47-pr53438.patch
new file mode 100644
index 0000000..fe83526
--- /dev/null
+++ b/gcc47-pr53438.patch
@@ -0,0 +1,21 @@
+2012-05-23  Richard Guenther  <rguenther@suse.de>
+
+	PR tree-optimization/53438
+	* tree-sra.c (analyze_access_subtree): Correct bitfield exclusion.
+
+--- gcc/tree-sra.c	(revision 187804)
++++ gcc/tree-sra.c	(revision 187805)
+@@ -2096,9 +2096,12 @@ analyze_access_subtree (struct access *r
+ 	  && (TREE_CODE (root->type) != INTEGER_TYPE
+ 	      || TYPE_PRECISION (root->type) != root->size)
+ 	  /* But leave bitfield accesses alone.  */
+-	  && (root->offset % BITS_PER_UNIT) == 0)
++	  && (TREE_CODE (root->expr) != COMPONENT_REF
++	      || !DECL_BIT_FIELD (TREE_OPERAND (root->expr, 1))))
+ 	{
+ 	  tree rt = root->type;
++	  gcc_assert ((root->offset % BITS_PER_UNIT) == 0
++		      && (root->size % BITS_PER_UNIT) == 0);
+ 	  root->type = build_nonstandard_integer_type (root->size,
+ 						       TYPE_UNSIGNED (rt));
+ 	  root->expr = build_ref_for_offset (UNKNOWN_LOCATION,
diff --git a/sources b/sources
index c49e8e1..098aad7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-69869f6e9a7d19e25022e10bacd90a2f  gcc-4.7.0-20120507.tar.bz2
+55b6806c2c1e691da95df77cf68ca465  gcc-4.7.0-20120525.tar.bz2