On 29/06/2014 19:31, Gerald Pfeifer wrote:
I'm pretty it's the following that causes bootstrap to fail for me:
2014-06-29 Roman Gareev <gareevro...@gmail.com>
* Makefile.in:
Add the compilation of graphite-isl-ast-to-gimple.o.
* common.opt:
Add new switch fgraphite-code-generator=[isl|cloog].
* flag-types.h:
Add new enum fgraphite_generator.
* graphite-isl-ast-to-gimple.c: New.
* graphite-isl-ast-to-gimple.h: New.
* graphite.c (graphite_transform_loops):
Add choice of Graphite code generator,
which depends on flag_graphite_code_gen.
testsuite/gcc.dg/graphite/isl-codegen-loop-dumping.c:
New testcase that checks that the dump is generated.
As follows:
/scratch2/tmp/gerald/gcc-HEAD/gcc/graphite-isl-ast-to-gimple.c:23:10:
fatal error: 'isl/set.h' file not found
#include <isl/set.h>
^
I do not have ISL installed on that machine and I don't want to use
graphite on that machine.
PR 61650 - [4.10] Bootstrap failure due to dependency on ISL.
Hi Gerald,
sorry for the breakage. This seems to be caused by forgotten include
guards. I attached a patch (not bootstrapped yet), that should fix the
issue. I will start a gcc (non-graphite) bootstrap to see if it works
and will commit it immediately after.
Please report back if it fixes the bootstrap for you.
Cheers,
Tobias
>From 2910e41368c3895a7a023133a1fcb87772b838a8 Mon Sep 17 00:00:00 2001
From: Tobias Grosser <tob...@grosser.es>
Date: Sun, 29 Jun 2014 19:34:30 +0200
Subject: [PATCH] Fix gcc bootstrap
gcc/
* graphite-isl-ast-to-gimple.c: Add cloog include guards.
---
gcc/graphite-isl-ast-to-gimple.c | 4 ++++
1 file changed, 4 insertions(+)
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
