gcc/patches/gcc46-ppl-0.10.patch

   1 diff -Nur gcc-4.6.0-vanilla/configure gcc-4.6.0/configure
   2 --- gcc-4.6.0-vanilla/configure 2011-03-16 19:27:36.000000000 +0100
   3 +++ gcc-4.6.0/configure 2011-04-07 21:41:50.876254183 +0200
   4 @@ -5776,7 +5776,7 @@
   5      saved_CFLAGS="$CFLAGS"
   6      CFLAGS="$CFLAGS $pplinc $gmpinc"
   7      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.11 (revision 0 or later) of PPL" >&5
   8 -$as_echo_n "checking for version 0.11 (revision 0 or later) of PPL... " >&6; }
   9 +$as_echo_n "checking for version 0.10 (revision 0 or later) of PPL... " >&6; }
  10      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  11  /* end confdefs.h.  */
  12  #include "ppl_c.h"
  13 @@ -5784,7 +5784,7 @@
  14  main ()
  15  {
  16
  17 -    #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 11
  18 +    #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 10
  19      choke me
  20      #endif
  21
  22 diff -Nur gcc-4.6.0-vanilla/configure.ac gcc-4.6.0/configure.ac
  23 --- gcc-4.6.0-vanilla/configure.ac      2011-03-16 19:27:36.000000000 +0100
  24 +++ gcc-4.6.0/configure.ac      2011-04-07 21:41:04.254292244 +0200
  25 @@ -1688,9 +1688,9 @@
  26    if test "$enable_ppl_version_check" != no; then
  27      saved_CFLAGS="$CFLAGS"
  28      CFLAGS="$CFLAGS $pplinc $gmpinc"
  29 -    AC_MSG_CHECKING([for version 0.11 (revision 0 or later) of PPL])
  30 +    AC_MSG_CHECKING([for version 0.10 (revision 0 or later) of PPL])
  31      AC_TRY_COMPILE([#include "ppl_c.h"],[
  32 -    #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 11
  33 +    #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 10
  34      choke me
  35      #endif
  36      ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); ppllibs= ; pplinc= ; with_ppl=no ])
  37 diff -Nur gcc-4.6.0-vanilla/gcc/doc/install.texi gcc-4.6.0/gcc/doc/install.texi
  38 --- gcc-4.6.0-vanilla/gcc/doc/install.texi      2011-03-21 13:13:26.000000000 +0100
  39 +++ gcc-4.6.0/gcc/doc/install.texi      2011-04-07 21:40:12.957333674 +0200
  40 @@ -362,7 +362,7 @@
  41  distribution is found in a subdirectory of your GCC sources named
  42  @file{mpc}, it will be built together with GCC@.
  43
  44 -@item Parma Polyhedra Library (PPL) version 0.11
  45 +@item Parma Polyhedra Library (PPL) version 0.10
  46
  47  Necessary to build GCC with the Graphite loop optimizations.
  48  It can be downloaded from @uref{http://www.cs.unipr.it/ppl/Download/}.
  49 diff -Nur gcc-4.6.0-vanilla/gcc/graphite-ppl.c gcc-4.6.0/gcc/graphite-ppl.c
  50 --- gcc-4.6.0-vanilla/gcc/graphite-ppl.c        2011-01-25 07:46:43.000000000 +0100
  51 +++ gcc-4.6.0/gcc/graphite-ppl.c        2011-04-07 21:40:12.958333672 +0200
  52 @@ -521,6 +521,15 @@
  53  bool
  54  ppl_powerset_is_empty (ppl_Pointset_Powerset_C_Polyhedron_t ps)
  55  {
  56 +#if PPL_VERSION_MAJOR == 0 && PPL_VERSION_MINOR < 11
  57 +  /* On PPL 0.10,
  58 +     ppl_Pointset_Powerset_C_Polyhedron_contains_integer_point (ps)
  59 +     takes too long on some cases and so we call _is_empty instead.  */
  60 +  return ppl_Pointset_Powerset_C_Polyhedron_is_empty (ps);
  61 +
  62 +#else
  63 +  /* On PPL 0.11 or later, we can check for integer feasibility using
  64 +     the PIP solver.  */
  65    ppl_PIP_Problem_t pip;
  66    ppl_dimension_type d;
  67    ppl_const_Constraint_System_t pcs;
  68 @@ -561,6 +570,7 @@
  69    ppl_delete_Pointset_Powerset_C_Polyhedron_iterator (end);
  70
  71    return !has_integer_solutions;
  72 +#endif
  73  }
  74
  75  #endif
  76 diff -Nur gcc-4.6.0-vanilla/gcc/testsuite/gcc.dg/graphite/interchange-11.c gcc-4.6.0/gcc/testsuite/gcc.dg/graphite/interchange-11.c
  77 --- gcc-4.6.0-vanilla/gcc/testsuite/gcc.dg/graphite/interchange-11.c    2011-01-25 07:45:54.000000000 +0100
  78 +++ gcc-4.6.0/gcc/testsuite/gcc.dg/graphite/interchange-11.c    2011-04-07 21:40:12.974333658 +0200
  79 @@ -46,5 +46,5 @@
  80    return 0;
  81  }
  82
  83 -/* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" } } */
  84 +/* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" { xfail *-*-* } } } */
  85  /* { dg-final { cleanup-tree-dump "graphite" } } */
  86 diff -Nur gcc-4.6.0-vanilla/gcc/testsuite/gcc.dg/graphite/interchange-13.c gcc-4.6.0/gcc/testsuite/gcc.dg/graphite/interchange-13.c
  87 --- gcc-4.6.0-vanilla/gcc/testsuite/gcc.dg/graphite/interchange-13.c    2011-01-25 07:45:54.000000000 +0100
  88 +++ gcc-4.6.0/gcc/testsuite/gcc.dg/graphite/interchange-13.c    2011-04-07 21:40:12.975333657 +0200
  89 @@ -50,5 +50,5 @@
  90  }
  91
  92
  93 -/* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" } } */
  94 +/* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" { xfail *-*-* } } } */
  95  /* { dg-final { cleanup-tree-dump "graphite" } } */
  96 diff -Nur gcc-4.6.0-vanilla/gcc/testsuite/gcc.dg/graphite/interchange-1.c gcc-4.6.0/gcc/testsuite/gcc.dg/graphite/interchange-1.c
  97 --- gcc-4.6.0-vanilla/gcc/testsuite/gcc.dg/graphite/interchange-1.c     2011-01-25 07:45:54.000000000 +0100
  98 +++ gcc-4.6.0/gcc/testsuite/gcc.dg/graphite/interchange-1.c     2011-04-07 21:40:12.975333657 +0200
  99 @@ -49,5 +49,5 @@
 100    return 0;
 101  }
 102
 103 -/* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" } } */
 104 +/* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" { xfail *-*-* } } } */
 105  /* { dg-final { cleanup-tree-dump "graphite" } } */
 106 diff -Nur gcc-4.6.0-vanilla/gcc/testsuite/gfortran.dg/graphite/interchange-3.f90 gcc-4.6.0/gcc/testsuite/gfortran.dg/graphite/interchange-3.f90
 107 --- gcc-4.6.0-vanilla/gcc/testsuite/gfortran.dg/graphite/interchange-3.f90      2011-01-25 07:47:34.000000000 +0100
 108 +++ gcc-4.6.0/gcc/testsuite/gfortran.dg/graphite/interchange-3.f90      2011-04-07 21:40:12.976333657 +0200
 109 @@ -24,5 +24,5 @@
 110
 111  end Program FOO
 112
 113 -! { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" } }
 114 +! { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" { xfail *-*-* } } }
 115  ! { dg-final { cleanup-tree-dump "graphite" } }