Re: Bug#905539: gcc-7 FTBFS with isl 0.20 + gcc-6
tags 905539 patch
thanks
On Sun, 2018-08-05 at 21:37 +0200, Svante Signell wrote:
> On Sun, 2018-08-05 at 20:52 +0200, Helmut Grohne wrote:
> > Source: gcc-7
> > Version: 7.3.0-27
> > Severity: serious
> > Tags: ftbfs
> > User: helmutg@debian.org
> > Usertags: rebootstrap
> >
> > Hi Matthias,
> >
> > I'm not sure whether you're aware already, but I felt that it was
> > best
> > to just document that gcc-7 fails to build against isl 0.20. I
> > tried to
> > check the vcs on whether this is already pending, but since alioth
> > is
> > offline finding the vcs is difficult. Maybe you could also update
> > the
> > Vcs fields. Build log symptom:
> >
> > > ../../src/gcc/graphite-optimize-isl.c: In function
> > > 'isl_schedule_node*
> > > get_schedule_for_node_st(isl_schedule_node*, void*)':
> > > ../../src/gcc/graphite-optimize-isl.c:57:52: error:
> > > 'isl_space_dim' was not
> > > declared in this scope
> > > unsigned dims = isl_space_dim (space, isl_dim_set);
>
> The same happens with gcc-6. I have created a patch that makes gcc-6
> building again, maybe it would suffice for gcc-7 too? However, that
> patch is on another computer, not reachable for me tonight. I can
> submit the patch in a bug report for gcc-6 tomorrow afternoon. OK?
Attached is the patch making both gcc-6 and gcc-7 build properly.
Attached is also the diff for debian/rules.patch. It applies OK on gcc-
6 and with an offset on gcc-7. For gcc-6 I'll file a separate bug with
these patches.
--- a/debian_rules.patch.orig 2018-08-04 21:57:36.000000000 +0200
+++ b/debian/rules.patch 2018-08-05 00:37:20.433243847 +0200
@@ -385,6 +385,7 @@
debian_patches += libgomp-kfreebsd-testsuite
debian_patches += go-testsuite
+debian_patches += isl-includes
# Ada patches needed for both the stable package and snapshot builds
debian_patches += ada-749574
Index: gcc-6-6.4.0/src/gcc/graphite-dependences.c
===================================================================
--- gcc-6-6.4.0.orig/src/gcc/graphite-dependences.c
+++ gcc-6-6.4.0/src/gcc/graphite-dependences.c
@@ -24,6 +24,8 @@ along with GCC; see the file COPYING3.
#include "config.h"
#ifdef HAVE_isl
+#include <isl/id.h>
+#include <isl/space.h>
#include "system.h"
#include "coretypes.h"
Index: gcc-6-6.4.0/src/gcc/graphite-isl-ast-to-gimple.c
===================================================================
--- gcc-6-6.4.0.orig/src/gcc/graphite-isl-ast-to-gimple.c
+++ gcc-6-6.4.0/src/gcc/graphite-isl-ast-to-gimple.c
@@ -23,6 +23,8 @@ along with GCC; see the file COPYING3.
#include "config.h"
#ifdef HAVE_isl
+#include <isl/id.h>
+#include <isl/space.h>
#define INCLUDE_MAP
#include "system.h"
Index: gcc-6-6.4.0/src/gcc/graphite-optimize-isl.c
===================================================================
--- gcc-6-6.4.0.orig/src/gcc/graphite-optimize-isl.c
+++ gcc-6-6.4.0/src/gcc/graphite-optimize-isl.c
@@ -23,6 +23,8 @@ along with GCC; see the file COPYING3.
#include "config.h"
#ifdef HAVE_isl
+#include <isl/id.h>
+#include <isl/space.h>
#include "system.h"
#include "coretypes.h"
Index: gcc-6-6.4.0/src/gcc/graphite-sese-to-poly.c
===================================================================
--- gcc-6-6.4.0.orig/src/gcc/graphite-sese-to-poly.c
+++ gcc-6-6.4.0/src/gcc/graphite-sese-to-poly.c
@@ -23,6 +23,8 @@ along with GCC; see the file COPYING3.
#include "config.h"
#ifdef HAVE_isl
+#include <isl/id.h>
+#include <isl/space.h>
#include "system.h"
#include "coretypes.h"
Reply to: