I just committed the attached patch to fix the gcc bootstrap problem reported by Gerald.

At the moment my bootstrap already passed the point where it previously failed, but did not yet complete. I committed it is very likely to be both correct and to unbreak the build. I will report back after my bootstrap succeeded.

Tobias
>From 75af30d234e53414c664c907dfd003b907574fe3 Mon Sep 17 00:00:00 2001
From: grosser <grosser@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 29 Jun 2014 17:51:01 +0000
Subject: [PATCH] Add missing HAVE_cloog guards

        * graphite-isl-ast-to-gimple.c: Add missing guards.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@212125 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog                    | 4 ++++
 gcc/graphite-isl-ast-to-gimple.c | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7c34af8..22b99b5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-29  Tobias Grosser <tob...@grosser.es>
+
+	* graphite-isl-ast-to-gimple.c: Add missing guards.
+
 2014-06-29  Roman Gareev  <gareevro...@gmail.com>
 
 	* Makefile.in:
diff --git a/gcc/graphite-isl-ast-to-gimple.c b/gcc/graphite-isl-ast-to-gimple.c
index 6437474..8ba7b75 100644
--- a/gcc/graphite-isl-ast-to-gimple.c
+++ b/gcc/graphite-isl-ast-to-gimple.c
@@ -20,10 +20,12 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 
+#ifdef HAVE_cloog
 #include <isl/set.h>
 #include <isl/map.h>
 #include <isl/union_map.h>
 #include <isl/ast_build.h>
+#endif
 
 #include "system.h"
 #include "coretypes.h"
@@ -41,6 +43,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-data-ref.h"
 #include "sese.h"
 
+#ifdef HAVE_cloog
 #include "graphite-poly.h"
 #include "graphite-isl-ast-to-gimple.h"
 
@@ -131,3 +134,4 @@ graphite_regenerate_ast_isl (scop_p scop)
   timevar_pop (TV_GRAPHITE_CODE_GEN);
   return !graphite_regenerate_error;
 }
+#endif
-- 
1.8.3.2

Reply via email to