[gcc] 4.7.0-0.10

[Jakub Jelinek]

commit e3e70e5e70aa85041c85980952ee507c96f9fccc
Author: Jakub Jelinek <jakub at redhat.com>
Date:   Thu Jan 26 14:17:11 2012 +0100

    4.7.0-0.10

 .gitignore          |    1 +
 gcc.spec            |   26 ++++--
 gcc47-pr47858.patch |   23 ------
 gcc47-pr51957.patch |  206 ---------------------------------------------------
 gcc47-pr51968.patch |   21 -----
 gcc47-pr52006.patch |   43 +++++++++++
 sources             |    2 +-
 7 files changed, 62 insertions(+), 260 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5abe4a6..c85b456 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /gcc-4.7.0-20120117.tar.bz2
 /gcc-4.7.0-20120119.tar.bz2
 /gcc-4.7.0-20120123.tar.bz2
+/gcc-4.7.0-20120126.tar.bz2
diff --git a/gcc.spec b/gcc.spec
index 9564ca0..0150c7b 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -1,9 +1,9 @@
-%global DATE 20120123
-%global SVNREV 183456
+%global DATE 20120126
+%global SVNREV 183558
 %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 0.9
+%global gcc_release 0.10
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64 ppc ppc64 alpha
@@ -175,9 +175,8 @@ Patch13: gcc47-no-add-needed.patch
 Patch14: gcc47-ppl-0.10.patch
 Patch15: gcc47-libitm-fno-exceptions.patch
 Patch16: gcc47-pr51895.patch
-Patch17: gcc47-pr51957.patch
-Patch18: gcc47-pr46590-revert.patch
-Patch19: gcc47-pr51968.patch
+Patch17: gcc47-pr46590-revert.patch
+Patch18: gcc47-pr52006.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 Patch1001: fastjar-0.97-len1.patch
@@ -678,9 +677,8 @@ package or when debugging this package.
 %endif
 %patch15 -p0 -b .libitm-fno-exceptions~
 %patch16 -p0 -b .pr51895~
-%patch17 -p0 -b .pr51957~
-%patch18 -p0 -b .pr46590-revert~
-%patch19 -p0 -b .pr51968~
+%patch17 -p0 -b .pr46590-revert~
+%patch18 -p0 -b .pr52006~
 
 %if 0%{?_enable_debug_packages}
 cat > split-debuginfo.sh <<\EOF
@@ -2641,6 +2639,16 @@ fi
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/plugin
 
 %changelog
+* Thu Jan 26 2012 Jakub Jelinek <jakub at redhat.com> 4.7.0-0.10
+- update from trunk
+  - PRs bootstrap/51985, c++/51223, c++/51812, c++/51917, c++/51928,
+	c++/51930, c++/51973, c++/51992, driver/47249, fortran/51966,
+	fortran/51995, libstdc++/49829, lto/51698, middle-end/45678,
+	middle-end/51986, rtl-optimization/48308, rtl-optimization/48374
+  - fix data-ref handling of non-volatile inline asms (#784242,
+    PR tree-optimization/51987)
+- fix ARM ICE with invalid peephole (#784748, PR target/52006)
+
 * Mon Jan 23 2012 Jakub Jelinek <jakub at redhat.com> 4.7.0-0.9
 - update from trunk
   - PRs ada/46192, c++/51344, c++/51398, c++/51402, c++/51832, c++/51919,
diff --git a/gcc47-pr52006.patch b/gcc47-pr52006.patch
new file mode 100644
index 0000000..67a0e5c
--- /dev/null
+++ b/gcc47-pr52006.patch
@@ -0,0 +1,43 @@
+2012-01-26  Jakub Jelinek  <jakub at redhat.com>
+
+	PR target/52006
+	* config/arm/arm.md (pic_add_dot_plus_eight peephole2): Use
+	arm_general_register_operand predicate for operand 2 instead of
+	register_operand.
+
+	* gcc.target/arm/pr52006.c: New test.
+
+--- gcc/config/arm/arm.md.jj	2012-01-20 12:35:15.000000000 +0100
++++ gcc/config/arm/arm.md	2012-01-26 10:24:13.082570508 +0100
+@@ -5719,7 +5719,8 @@ (define_peephole2
+ 		    (const_int 8)
+ 		    (match_operand 1 "" "")]
+ 		   UNSPEC_PIC_BASE))
+-   (set (match_operand:SI 2 "register_operand" "") (mem:SI (match_dup 0)))]
++   (set (match_operand:SI 2 "arm_general_register_operand" "")
++	(mem:SI (match_dup 0)))]
+   "TARGET_ARM && peep2_reg_dead_p (2, operands[0])"
+   [(set (match_dup 2)
+ 	(mem:SI (unspec:SI [(match_dup 3)
+--- gcc/testsuite/gcc.target/arm/pr52006.c.jj	2012-01-26 10:32:27.989658669 +0100
++++ gcc/testsuite/gcc.target/arm/pr52006.c	2012-01-26 10:32:34.626620068 +0100
+@@ -0,0 +1,19 @@
++/* PR target/52006 */
++/* { dg-do compile } */
++/* { dg-options "-march=armv7-a -mfloat-abi=hard -O2 -fPIC" } */
++
++unsigned long a;
++static int b;
++
++void
++foo (void)
++{
++  asm volatile ("" : "=r" (b));
++}
++
++void
++bar (float f)
++{
++  if (f < b / 100.0)
++    a = 1;
++}
diff --git a/sources b/sources
index db935a4..4227672 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-c616ff4d911b6888dedf1d49df177e73  gcc-4.7.0-20120123.tar.bz2
+d96c83882dc395b8465feb9f86ba999d  gcc-4.7.0-20120126.tar.bz2