[cross-gcc] Fix fuzz levels on gcc47-ppl-0.10.patch.

David Howells dhowells at fedoraproject.org
Thu Mar 22 23:27:06 UTC 2012


commit 05aa8ac86b152ee25018ed499af895dd98989783
Author: David Howells <dhowells at redhat.com>
Date:   Thu Mar 22 23:26:06 2012 +0000

    Fix fuzz levels on gcc47-ppl-0.10.patch.

 cross-gcc.spec       |    5 +++-
 gcc47-ppl-0.10.patch |   56 +++++++++++++++++++++++++-------------------------
 2 files changed, 32 insertions(+), 29 deletions(-)
---
diff --git a/cross-gcc.spec b/cross-gcc.spec
index 45e20ae..72ca1cd 100644
--- a/cross-gcc.spec
+++ b/cross-gcc.spec
@@ -51,7 +51,7 @@
 
 # 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.11.2
+%global gcc_release 0.11.3
 
 Summary: Cross C compiler
 Name: cross-gcc
@@ -615,6 +615,9 @@ rm -rf %{buildroot}
 %do_files xtensa-linux-gnu	%{build_xtensa}
 
 %changelog
+* Thu Mar 22 2012 David Howells <dhowells at redhat.com> - 4.7.0-0.11.3
+- Fix gcc47-ppl-0.10.patch fuzz.
+
 * Thu Mar 22 2012 David Howells <dhowells at redhat.com> - 4.7.0-0.11.2
 - Initial import of cross-binutils [BZ 766166].
 
diff --git a/gcc47-ppl-0.10.patch b/gcc47-ppl-0.10.patch
index d43f34f..c9b3fdc 100644
--- a/gcc47-ppl-0.10.patch
+++ b/gcc47-ppl-0.10.patch
@@ -10,20 +10,20 @@ gcc/
 	* graphite-ppl.c (ppl_powerset_is_empty): Remove now dead code under
 	#if PPL_VERSION_MINOR < 11.
 
---- gcc/doc/install.texi	(revision 169207)
-+++ gcc/doc/install.texi	(revision 169206)
-@@ -332,7 +332,7 @@ and @option{--with-mpc-include}.  Altern
- distribution is found in a subdirectory of your GCC sources named
- @file{mpc}, it will be built together with GCC at .
+--- gcc/doc/install.texi	2012-03-02 09:37:30.000000000 +0000
++++ gcc/doc/install.texi	2012-03-22 23:13:43.122575084 +0000
+@@ -362,7 +362,7 @@
+ @option{--with-mpc} configure option should be used.  See also
+ @option{--with-mpc-lib} and @option{--with-mpc-include}.
  
 - at item Parma Polyhedra Library (PPL) version 0.11
 + at item Parma Polyhedra Library (PPL) version 0.10
  
  Necessary to build GCC with the Graphite loop optimizations.
  It can be downloaded from @uref{http://www.cs.unipr.it/ppl/Download/}.
---- gcc/graphite-ppl.c	(revision 169207)
-+++ gcc/graphite-ppl.c	(revision 169206)
-@@ -521,6 +521,15 @@ debug_gmp_value (mpz_t val)
+--- gcc/graphite-ppl.c	2011-01-25 06:46:43.000000000 +0000
++++ gcc/graphite-ppl.c	2012-03-22 23:13:43.123575072 +0000
+@@ -521,6 +521,15 @@
  bool
  ppl_powerset_is_empty (ppl_Pointset_Powerset_C_Polyhedron_t ps)
  {
@@ -39,7 +39,7 @@ gcc/
    ppl_PIP_Problem_t pip;
    ppl_dimension_type d;
    ppl_const_Constraint_System_t pcs;
-@@ -561,6 +570,7 @@ ppl_powerset_is_empty (ppl_Pointset_Powe
+@@ -561,6 +570,7 @@
    ppl_delete_Pointset_Powerset_C_Polyhedron_iterator (end);
  
    return !has_integer_solutions;
@@ -47,9 +47,9 @@ gcc/
  }
  
  #endif
---- configure.ac	(revision 169207)
-+++ configure.ac	(revision 169206)
-@@ -1688,9 +1688,9 @@ if test "x$with_ppl" != xno; then
+--- configure.ac	2012-02-02 10:20:32.000000000 +0000
++++ configure.ac	2012-03-22 23:13:43.124575062 +0000
+@@ -1568,9 +1568,9 @@
    if test "$enable_ppl_version_check" != no; then
      saved_CFLAGS="$CFLAGS"
      CFLAGS="$CFLAGS $pplinc $gmpinc"
@@ -61,9 +61,9 @@ gcc/
      choke me
      #endif
      ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); ppllibs= ; pplinc= ; with_ppl=no ])
---- configure	(revision 169207)
-+++ configure	(revision 169206)
-@@ -5775,8 +5775,8 @@ fi
+--- configure	2012-02-02 10:20:32.000000000 +0000
++++ configure	2012-03-22 23:13:43.130574990 +0000
+@@ -5681,8 +5681,8 @@
    if test "$enable_ppl_version_check" != no; then
      saved_CFLAGS="$CFLAGS"
      CFLAGS="$CFLAGS $pplinc $gmpinc"
@@ -74,7 +74,7 @@ gcc/
      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include "ppl_c.h"
-@@ -5784,7 +5784,7 @@ int
+@@ -5690,7 +5690,7 @@
  main ()
  {
  
@@ -83,36 +83,36 @@ gcc/
      choke me
      #endif
  
---- gcc/testsuite/gcc.dg/graphite/interchange-11.c.jj	2011-01-28 09:38:11.000000000 +0100
-+++ gcc/testsuite/gcc.dg/graphite/interchange-11.c	2011-01-28 11:06:56.461429848 +0100
-@@ -46,5 +46,5 @@ main (void)
+--- gcc/testsuite/gcc.dg/graphite/interchange-11.c	2011-01-25 06:45:54.000000000 +0000
++++ gcc/testsuite/gcc.dg/graphite/interchange-11.c	2012-03-22 23:13:43.131574978 +0000
+@@ -46,5 +46,5 @@
    return 0;
  }
  
 -/* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" } } */
 +/* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" { xfail *-*-* } } } */
  /* { dg-final { cleanup-tree-dump "graphite" } } */
---- gcc/testsuite/gcc.dg/graphite/interchange-13.c.jj	2011-01-28 09:38:12.000000000 +0100
-+++ gcc/testsuite/gcc.dg/graphite/interchange-13.c	2011-01-28 11:07:08.182429223 +0100
-@@ -50,5 +50,5 @@ main (void)
+--- gcc/testsuite/gcc.dg/graphite/interchange-13.c	2011-01-25 06:45:54.000000000 +0000
++++ gcc/testsuite/gcc.dg/graphite/interchange-13.c	2012-03-22 23:13:43.131574978 +0000
+@@ -50,5 +50,5 @@
  }
  
  
 -/* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" } } */
 +/* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" { xfail *-*-* } } } */
  /* { dg-final { cleanup-tree-dump "graphite" } } */
---- gcc/testsuite/gcc.dg/graphite/interchange-1.c.jj	2011-01-28 09:38:13.000000000 +0100
-+++ gcc/testsuite/gcc.dg/graphite/interchange-1.c	2011-01-28 11:06:42.160429193 +0100
-@@ -49,5 +49,5 @@ main (void)
+--- gcc/testsuite/gcc.dg/graphite/interchange-1.c	2011-01-25 06:45:54.000000000 +0000
++++ gcc/testsuite/gcc.dg/graphite/interchange-1.c	2012-03-22 23:13:43.131574978 +0000
+@@ -49,5 +49,5 @@
    return 0;
  }
  
 -/* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" } } */
 +/* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" { xfail *-*-* } } } */
  /* { dg-final { cleanup-tree-dump "graphite" } } */
---- gcc/testsuite/gfortran.dg/graphite/interchange-3.f90.jj	2011-01-28 09:38:05.000000000 +0100
-+++ gcc/testsuite/gfortran.dg/graphite/interchange-3.f90	2011-01-28 11:07:46.313420441 +0100
-@@ -24,5 +24,5 @@ Program FOO
+--- gcc/testsuite/gfortran.dg/graphite/interchange-3.f90	2011-01-25 06:47:34.000000000 +0000
++++ gcc/testsuite/gfortran.dg/graphite/interchange-3.f90	2012-03-22 23:13:43.133574956 +0000
+@@ -24,5 +24,5 @@
  
  end Program FOO
  


More information about the scm-commits mailing list