Signed-off-by: Sebastian Pop seb...@gmail.com
---
gcc/graphite-blocking.c| 12 +++-
gcc/graphite-clast-to-gimple.c |9 +
gcc/graphite-cloog-util.c | 11 ++-
gcc/graphite-cloog-util.h |2 --
gcc/graphite-dependences.c | 11 ++-
gcc/graphite-flattening.c | 11 ++-
gcc/graphite-interchange.c | 12 +++-
gcc/graphite-poly.c| 12 +++-
gcc/graphite-poly.h| 40 +++-
gcc/graphite-ppl.c | 11 ++-
gcc/graphite-scop-detection.c | 11 ++-
gcc/graphite-sese-to-poly.c| 10 ++
gcc/graphite.c | 12 +++-
13 files changed, 136 insertions(+), 28 deletions(-)
diff --git a/gcc/graphite-blocking.c b/gcc/graphite-blocking.c
index 967de9d..429b405 100644
--- a/gcc/graphite-blocking.c
+++ b/gcc/graphite-blocking.c
@@ -1,7 +1,7 @@
/* Heuristics and transform for loop blocking and strip mining on
polyhedral representation.
- Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
Contributed by Sebastian Pop sebastian@amd.com and
Pranav Garg pranav.garg2...@gmail.com.
@@ -20,7 +20,17 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
http://www.gnu.org/licenses/. */
+
#include config.h
+
+#ifdef HAVE_cloog
+#include isl/set.h
+#include isl/map.h
+#include isl/union_map.h
+#include cloog/cloog.h
+#include cloog/isl/domain.h
+#endif
+
#include system.h
#include coretypes.h
#include tree-flow.h
diff --git a/gcc/graphite-clast-to-gimple.c b/gcc/graphite-clast-to-gimple.c
index a7d0ddc..bb0f4c8 100644
--- a/gcc/graphite-clast-to-gimple.c
+++ b/gcc/graphite-clast-to-gimple.c
@@ -19,6 +19,15 @@ along with GCC; see the file COPYING3. If not see
http://www.gnu.org/licenses/. */
#include config.h
+
+#ifdef HAVE_cloog
+#include isl/set.h
+#include isl/map.h
+#include isl/union_map.h
+#include cloog/cloog.h
+#include cloog/isl/domain.h
+#endif
+
#include system.h
#include coretypes.h
#include diagnostic-core.h
diff --git a/gcc/graphite-cloog-util.c b/gcc/graphite-cloog-util.c
index 83cfb54..82a49a1 100644
--- a/gcc/graphite-cloog-util.c
+++ b/gcc/graphite-cloog-util.c
@@ -1,5 +1,5 @@
/* Gimple Represented as Polyhedra.
- Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
Contributed by Sebastian Pop sebastian@inria.fr
and Tobias Grosser gros...@fim.uni-passau.de.
@@ -20,6 +20,15 @@ along with GCC; see the file COPYING3. If not see
http://www.gnu.org/licenses/. */
#include config.h
+
+#ifdef HAVE_cloog
+#include isl/set.h
+#include isl/map.h
+#include isl/union_map.h
+#include cloog/cloog.h
+#include cloog/isl/domain.h
+#endif
+
#include system.h
#include coretypes.h
diff --git a/gcc/graphite-cloog-util.h b/gcc/graphite-cloog-util.h
index da26ee9..07894ea 100644
--- a/gcc/graphite-cloog-util.h
+++ b/gcc/graphite-cloog-util.h
@@ -21,8 +21,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GRAPHITE_CLOOG_UTIL_H
#define GRAPHITE_CLOOG_UTIL_H
-#include cloog/cloog.h
-
CloogMatrix *new_Cloog_Matrix_from_ppl_Polyhedron (ppl_const_Polyhedron_t);
CloogDomain *new_Cloog_Domain_from_ppl_Polyhedron (ppl_const_Polyhedron_t,
int, CloogState *);
diff --git a/gcc/graphite-dependences.c b/gcc/graphite-dependences.c
index fb49f16..9ba2731 100644
--- a/gcc/graphite-dependences.c
+++ b/gcc/graphite-dependences.c
@@ -1,5 +1,5 @@
/* Data dependence analysis for Graphite.
- Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
Contributed by Sebastian Pop sebastian@amd.com and
Konrad Trifunovic konrad.trifuno...@inria.fr.
@@ -20,6 +20,15 @@ along with GCC; see the file COPYING3. If not see
http://www.gnu.org/licenses/. */
#include config.h
+
+#ifdef HAVE_cloog
+#include isl/set.h
+#include isl/map.h
+#include isl/union_map.h
+#include cloog/cloog.h
+#include cloog/isl/domain.h
+#endif
+
#include system.h
#include coretypes.h
#include tree-flow.h
diff --git a/gcc/graphite-flattening.c b/gcc/graphite-flattening.c
index ccd0f5f..c58d8a3 100644
--- a/gcc/graphite-flattening.c
+++ b/gcc/graphite-flattening.c
@@ -1,5 +1,5 @@
/* Loop flattening for Graphite.
- Copyright (C) 2010 Free Software Foundation, Inc.
+ Copyright (C) 2010, 2011 Free Software Foundation, Inc.
Contributed by Sebastian Pop sebastian@amd.com.
This file is part of GCC.
@@ -19,6 +19,15 @@ along with GCC; see the file COPYING3. If not see
http://www.gnu.org/licenses/. */
#include config.h
+
+#ifdef HAVE_cloog
+#include isl/set.h
+#include isl/map.h
+#include
