diff options
| author | Tobias Burnus <burnus@net-b.de> | 2014-12-01 20:07:37 +0100 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2014-12-01 20:07:37 +0100 |
| commit | 797d88589e5ccb5bf5c1143aa728e517387fa87a (patch) | |
| tree | be3a2b7a117e5b375f803f3e1ae52c2afe3068f4 /gcc/graphite-poly.c | |
| parent | 81ba15f10524cc46bf2afbe4fc07f783315c6d94 (diff) | |
| download | gcc-797d88589e5ccb5bf5c1143aa728e517387fa87a.zip gcc-797d88589e5ccb5bf5c1143aa728e517387fa87a.tar.gz gcc-797d88589e5ccb5bf5c1143aa728e517387fa87a.tar.bz2 | |
re PR middle-end/64017 (Support ISL 0.14.0 (to fix ICE with gfortran.dg/graphite/pr42393.f90))
2014-12-01 Tobias Burnus <burnus@net-b.de>
Jack Howarth <howarth@bromo.med.uc.edu>
PR middle-end/64017
* configure.ac
* (ac_has_isl_schedule_constraints_compute_schedule):
New check.
* doc/install.texi (ISL): Permit ISL 0.14.
* graphite-optimize-isl.c (getScheduleForBandList,
* optimize_isl):
Conditionally use ISL 0.13+ functions.
* graphite-interchange.c: Make 'extern "C"' conditional.
* graphite-isl-ast-to-gimple.c: Ditto.
* graphite-poly.c: Ditto.
* graphite-sese-to-poly.c: Ditto.
* config.in: Regenerate.
* gcc/configure: Regenerate.
Co-Authored-By: Jack Howarth <howarth@bromo.med.uc.edu>
From-SVN: r218247
Diffstat (limited to 'gcc/graphite-poly.c')
| -rw-r--r-- | gcc/graphite-poly.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gcc/graphite-poly.c b/gcc/graphite-poly.c index 77ccc3d..fa313df 100644 --- a/gcc/graphite-poly.c +++ b/gcc/graphite-poly.c @@ -29,11 +29,13 @@ along with GCC; see the file COPYING3. If not see #include <isl/ilp.h> #include <isl/aff.h> #include <isl/val.h> -#if defined(__cplusplus) + +/* Since ISL-0.13, the extern is in val_gmp.h. */ +#if !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus) extern "C" { #endif #include <isl/val_gmp.h> -#if defined(__cplusplus) +#if !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus) } #endif #endif |