On Wed, Jul 1, 2015 at 10:21 PM, Jason Merrill <ja...@redhat.com> wrote: > This document also says that "A workaround until libraries get updated is to > include <cstddef> or <stddef.h> before any headers from that library." > Can you try modifying the graphite* files accordingly?
Right. I forgot to try that. Trying it now, I see that my build gets past the point that it failed, so this does appear to work. I won't be able to finish a proper test until tomorrow, but for now this patch seems to work. Jim
2015-07-01 Jim Wilson <jim.wil...@linaro.org> * graphite-blocking.c (HAVE_isl): Include <stddef.h>. * graphite-dependencies.c, graphite-interchange.c, graphite-isl-ast-to-gimple.c, graphite-optimize-isl.c, graphite-poly.c, graphite-scop-detection.c, graphite-sese-to-poly.c, graphite.c: Likewise. Index: graphite-blocking.c =================================================================== --- graphite-blocking.c (revision 225286) +++ graphite-blocking.c (working copy) @@ -24,6 +24,9 @@ along with GCC; see the file COPYING3. #include "config.h" #ifdef HAVE_isl +/* Workaround for GMP 5.1.3 bug, see PR56019. */ +#include <stddef.h> + #include <isl/set.h> #include <isl/map.h> #include <isl/union_map.h> Index: graphite-dependences.c =================================================================== --- graphite-dependences.c (revision 225286) +++ graphite-dependences.c (working copy) @@ -22,6 +22,9 @@ along with GCC; see the file COPYING3. #include "config.h" #ifdef HAVE_isl +/* Workaround for GMP 5.1.3 bug, see PR56019. */ +#include <stddef.h> + #include <isl/set.h> #include <isl/map.h> #include <isl/union_map.h> Index: graphite-interchange.c =================================================================== --- graphite-interchange.c (revision 225286) +++ graphite-interchange.c (working copy) @@ -24,6 +24,9 @@ along with GCC; see the file COPYING3. #include "config.h" #ifdef HAVE_isl +/* Workaround for GMP 5.1.3 bug, see PR56019. */ +#include <stddef.h> + #include <isl/aff.h> #include <isl/set.h> #include <isl/map.h> Index: graphite-isl-ast-to-gimple.c =================================================================== --- graphite-isl-ast-to-gimple.c (revision 225286) +++ graphite-isl-ast-to-gimple.c (working copy) @@ -21,6 +21,9 @@ along with GCC; see the file COPYING3. #include "config.h" #ifdef HAVE_isl +/* Workaround for GMP 5.1.3 bug, see PR56019. */ +#include <stddef.h> + #include <isl/set.h> #include <isl/map.h> #include <isl/union_map.h> Index: graphite-optimize-isl.c =================================================================== --- graphite-optimize-isl.c (revision 225286) +++ graphite-optimize-isl.c (working copy) @@ -21,6 +21,9 @@ along with GCC; see the file COPYING3. #include "config.h" #ifdef HAVE_isl +/* Workaround for GMP 5.1.3 bug, see PR56019. */ +#include <stddef.h> + #include <isl/set.h> #include <isl/map.h> #include <isl/union_map.h> Index: graphite-poly.c =================================================================== --- graphite-poly.c (revision 225286) +++ graphite-poly.c (working copy) @@ -22,6 +22,9 @@ along with GCC; see the file COPYING3. #include "config.h" #ifdef HAVE_isl +/* Workaround for GMP 5.1.3 bug, see PR56019. */ +#include <stddef.h> + #include <isl/set.h> #include <isl/map.h> #include <isl/union_map.h> Index: graphite-scop-detection.c =================================================================== --- graphite-scop-detection.c (revision 225286) +++ graphite-scop-detection.c (working copy) @@ -22,6 +22,9 @@ along with GCC; see the file COPYING3. #include "config.h" #ifdef HAVE_isl +/* Workaround for GMP 5.1.3 bug, see PR56019. */ +#include <stddef.h> + #include <isl/set.h> #include <isl/map.h> #include <isl/union_map.h> Index: graphite-sese-to-poly.c =================================================================== --- graphite-sese-to-poly.c (revision 225286) +++ graphite-sese-to-poly.c (working copy) @@ -21,6 +21,9 @@ along with GCC; see the file COPYING3. #include "config.h" #ifdef HAVE_isl +/* Workaround for GMP 5.1.3 bug, see PR56019. */ +#include <stddef.h> + #include <isl/set.h> #include <isl/map.h> #include <isl/union_map.h> Index: graphite.c =================================================================== --- graphite.c (revision 225286) +++ graphite.c (working copy) @@ -35,6 +35,9 @@ along with GCC; see the file COPYING3. #include "config.h" #ifdef HAVE_isl +/* Workaround for GMP 5.1.3 bug, see PR56019. */ +#include <stddef.h> + #include <isl/set.h> #include <isl/map.h> #include <isl/options.h>
