- fix ice on valid code (ice not renaming a vop).

Changed files:
    gcc-pr22037.patch -> 1.1
    gcc.spec -> 1.329

diff --git a/gcc-pr22037.patch b/gcc-pr22037.patch
new file mode 100644 (file)
index 0000000..480d14f
--- /dev/null
+++ b/gcc-pr22037.patch
@@ -0,0 +1,18 @@
+--- gcc/gcc/tree-cfg.c 28 Jun 2005 19:33:20 -0000      2.207
++++ gcc/gcc/tree-cfg.c 4 Jul 2005 10:31:07 -0000
+@@ -1298,10 +1298,12 @@ tree_merge_blocks (basic_block a, basic_
+       tree copy;
+       
+       if (!may_propagate_copy (def, use)
+-        /* Propagating pointers might cause the set of vops for statements
+-           to be changed, and thus require ssa form update.  */
++        /* Propagating pointers and constants might cause the
++           set of vops for statements to be changed, and thus
++           require ssa form update.  */
+         || (is_gimple_reg (def)
+-            && POINTER_TYPE_P (TREE_TYPE (def))))
++            && (POINTER_TYPE_P (TREE_TYPE (def))
++                || TREE_CONSTANT (use))))
+       {
+         gcc_assert (is_gimple_reg (def));
+ 

diff --git a/gcc.spec b/gcc.spec
index 4c9c7428d569920c7969db821104bf81ce682159..40fe9069c0351210963795802c939d449ab0d6c4 100644 (file)
--- a/gcc.spec
+++ b/gcc.spec
@@ -1,7 +1,6 @@
 #
 # TODO:
 #              - http://gcc.gnu.org/PR11203 (inline-asm)
-#              - http://gcc.gnu.org/PR17640 (empty loop not removed after optimization)
 #              - http://gcc.gnu.org/PR20128 (ice with mudflap + profile generate)
 #
 # Conditional build:
@@ -62,6 +61,7 @@ Patch14:      %{name}-pr21704.patch
 Patch15:       %{name}-pr22051.patch
 Patch16:       %{name}-pr22071.patch
 Patch17:       %{name}-pr17640.patch
+Patch18:       %{name}-pr22037.patch
 URL:           http://gcc.gnu.org/
 BuildRequires: autoconf
 %{?with_tests:BuildRequires:   autogen}
@@ -731,6 +731,7 @@ Statyczne biblioteki Obiektowego C.
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 # because we distribute modified version of gcc...
 perl -pi -e 's/(version.*)";/$1 (PLD Linux)";/' gcc/version.c