[PATCH] GCC system.h and Graphite header order

[PATCH] GCC system.h and Graphite header order

[David Edelsohn]

[-- Attachment #1: Type: text/plain, Size: 1217 bytes --]

Graphite relies on the ISL library and includes multiple ISL headers.
The ISL headers refer to identifiers that are poisoned for use in GCC.
The source files for Graphite were organized to include the ISL
headers first, to avoid the identifier poisoning, which breaks some
platforms because GCC header features are disabled.

This patch reorganizes the graphite*.c header file inclusion order to
list ISL header files near the end, just before the graphite header
files on which they rely.  A new macro, USES_ISL, is defined, which
skips the relevant identifier poisoning, similar to logic for Flex and
Bison.

This patch also removes early inclusion of stddef.h for ISL because it
now should be provided by GCC system.h

This has been bootstrapped on powerpc-ibm-aix7.1.0.0

Okay for trunk?

Thanks, David

* system.h: Don't poison calloc and strdup if USES_ISL is defined.
* graphite-dependences.c: Define USES_ISL.  Include ISL header files
after GCC header files and before graphite header files.
* graphite-dependences.c: Same.
* graphite-isl-ast-to-gimple.c: Same.
* graphite-optimize-isl.c: Same.
* graphite-poly.c: Same.
* graphite-scop-detection.c: Same.
* graphite-sese-to-poly.c: Same.
* graphite.c: Same.

[-- Attachment #2: GG --]
[-- Type: application/octet-stream, Size: 9768 bytes --]

Index: system.h
===================================================================
--- system.h	(revision 230704)
+++ system.h	(working copy)
@@ -798,9 +798,12 @@
    compiling gcc, so that the autoconf declaration tests for malloc
    etc don't spuriously fail.  */
 #ifdef IN_GCC
+
+#ifndef USES_ISL
 #undef calloc
 #undef strdup
  #pragma GCC poison calloc strdup
+#endif
 
 #if !defined(FLEX_SCANNER) && !defined(YYBISON)
 #undef malloc
Index: graphite-dependences.c
===================================================================
--- graphite-dependences.c	(revision 230704)
+++ graphite-dependences.c	(working copy)
@@ -19,19 +19,12 @@
 along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
 
+#define USES_ISL
+
 #include "config.h"
 
 #ifdef HAVE_isl
-/* Workaround for GMP 5.1.3 bug, see PR56019.  */
-#include <stddef.h>
 
-#include <isl/constraint.h>
-#include <isl/set.h>
-#include <isl/map.h>
-#include <isl/union_map.h>
-#include <isl/flow.h>
-#include <isl/constraint.h>
-
 #include "system.h"
 #include "coretypes.h"
 #include "backend.h"
@@ -44,6 +37,14 @@
 #include "tree-pass.h"
 #include "cfgloop.h"
 #include "tree-data-ref.h"
+
+#include <isl/constraint.h>
+#include <isl/set.h>
+#include <isl/map.h>
+#include <isl/union_map.h>
+#include <isl/flow.h>
+#include <isl/constraint.h>
+
 #include "graphite-poly.h"
 
 
Index: graphite-isl-ast-to-gimple.c
===================================================================
--- graphite-isl-ast-to-gimple.c	(revision 230704)
+++ graphite-isl-ast-to-gimple.c	(working copy)
@@ -18,28 +18,12 @@
 along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
 
+#define USES_ISL
+
 #include "config.h"
 
 #ifdef HAVE_isl
-/* Workaround for GMP 5.1.3 bug, see PR56019.  */
-#include <stddef.h>
 
-#include <isl/constraint.h>
-#include <isl/set.h>
-#include <isl/union_set.h>
-#include <isl/map.h>
-#include <isl/union_map.h>
-#include <isl/ast_build.h>
-
-/* Since ISL-0.13, the extern is in val_gmp.h.  */
-#if !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus)
-extern "C" {
-#endif
-#include <isl/val_gmp.h>
-#if !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus)
-}
-#endif
-
 #include "system.h"
 #include "coretypes.h"
 #include "backend.h"
@@ -59,19 +43,36 @@
 #include "tree-pass.h"
 #include "cfgloop.h"
 #include "tree-data-ref.h"
-#include "graphite-poly.h"
 #include "tree-ssa-loop-manip.h"
 #include "tree-scalar-evolution.h"
 #include "gimple-ssa.h"
 #include "tree-phinodes.h"
 #include "tree-into-ssa.h"
 #include "ssa-iterators.h"
-#include "graphite-isl-ast-to-gimple.h"
 #include "tree-cfg.h"
 #include "gimple-pretty-print.h"
 #include "cfganal.h"
 #include "value-prof.h"
 
+#include <isl/constraint.h>
+#include <isl/set.h>
+#include <isl/union_set.h>
+#include <isl/map.h>
+#include <isl/union_map.h>
+#include <isl/ast_build.h>
+
+/* Since ISL-0.13, the extern is in val_gmp.h.  */
+#if !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus)
+extern "C" {
+#endif
+#include <isl/val_gmp.h>
+#if !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus)
+}
+#endif
+
+#include "graphite-poly.h"
+#include "graphite-isl-ast-to-gimple.h"
+
 #include <map>
 
 /* We always try to use signed 128 bit types, but fall back to smaller types
Index: graphite-optimize-isl.c
===================================================================
--- graphite-optimize-isl.c	(revision 230704)
+++ graphite-optimize-isl.c	(working copy)
@@ -18,12 +18,26 @@
 along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
 
+#define USES_ISL
+
 #include "config.h"
 
 #ifdef HAVE_isl
-/* Workaround for GMP 5.1.3 bug, see PR56019.  */
-#include <stddef.h>
 
+#include "system.h"
+#include "coretypes.h"
+#include "backend.h"
+#include "cfghooks.h"
+#include "tree.h"
+#include "gimple.h"
+#include "fold-const.h"
+#include "gimple-iterator.h"
+#include "tree-ssa-loop.h"
+#include "cfgloop.h"
+#include "tree-data-ref.h"
+#include "params.h"
+#include "dumpfile.h"
+
 #include <isl/constraint.h>
 #include <isl/set.h>
 #include <isl/union_set.h>
@@ -38,20 +52,7 @@
 #include <isl/schedule_node.h>
 #endif
 
-#include "system.h"
-#include "coretypes.h"
-#include "backend.h"
-#include "cfghooks.h"
-#include "tree.h"
-#include "gimple.h"
-#include "fold-const.h"
-#include "gimple-iterator.h"
-#include "tree-ssa-loop.h"
-#include "cfgloop.h"
-#include "tree-data-ref.h"
 #include "graphite-poly.h"
-#include "params.h"
-#include "dumpfile.h"
 
 #ifdef HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS
 
Index: graphite-poly.c
===================================================================
--- graphite-poly.c	(revision 230704)
+++ graphite-poly.c	(working copy)
@@ -19,12 +19,26 @@
 along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
 
+#define USES_ISL
+
 #include "config.h"
 
 #ifdef HAVE_isl
-/* Workaround for GMP 5.1.3 bug, see PR56019.  */
-#include <stddef.h>
 
+#include "system.h"
+#include "coretypes.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
+#include "cfghooks.h"
+#include "gimple-pretty-print.h"
+#include "diagnostic-core.h"
+#include "fold-const.h"
+#include "gimple-iterator.h"
+#include "tree-ssa-loop.h"
+#include "cfgloop.h"
+#include "tree-data-ref.h"
+
 #include <isl/constraint.h>
 #include <isl/set.h>
 #include <isl/map.h>
@@ -43,19 +57,6 @@
 }
 #endif
 
-#include "system.h"
-#include "coretypes.h"
-#include "backend.h"
-#include "tree.h"
-#include "gimple.h"
-#include "cfghooks.h"
-#include "gimple-pretty-print.h"
-#include "diagnostic-core.h"
-#include "fold-const.h"
-#include "gimple-iterator.h"
-#include "tree-ssa-loop.h"
-#include "cfgloop.h"
-#include "tree-data-ref.h"
 #include "graphite-poly.h"
 
 #define OPENSCOP_MAX_STRING 256
Index: graphite-scop-detection.c
===================================================================
--- graphite-scop-detection.c	(revision 230704)
+++ graphite-scop-detection.c	(working copy)
@@ -19,17 +19,12 @@
 along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
 
+#define USES_ISL
+
 #include "config.h"
 
 #ifdef HAVE_isl
-/* Workaround for GMP 5.1.3 bug, see PR56019.  */
-#include <stddef.h>
 
-#include <isl/constraint.h>
-#include <isl/set.h>
-#include <isl/map.h>
-#include <isl/union_map.h>
-
 #include "system.h"
 #include "coretypes.h"
 #include "backend.h"
@@ -51,11 +46,17 @@
 #include "tree-data-ref.h"
 #include "tree-scalar-evolution.h"
 #include "tree-pass.h"
-#include "graphite-poly.h"
 #include "tree-ssa-propagate.h"
-#include "graphite-scop-detection.h"
 #include "gimple-pretty-print.h"
 
+#include <isl/constraint.h>
+#include <isl/set.h>
+#include <isl/map.h>
+#include <isl/union_map.h>
+
+#include "graphite-poly.h"
+#include "graphite-scop-detection.h"
+
 class debug_printer
 {
 private:
Index: graphite-sese-to-poly.c
===================================================================
--- graphite-sese-to-poly.c	(revision 230704)
+++ graphite-sese-to-poly.c	(working copy)
@@ -18,29 +18,12 @@
 along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
 
+#define USES_ISL
+
 #include "config.h"
 
 #ifdef HAVE_isl
-/* Workaround for GMP 5.1.3 bug, see PR56019.  */
-#include <stddef.h>
 
-#include <isl/constraint.h>
-#include <isl/set.h>
-#include <isl/map.h>
-#include <isl/union_map.h>
-#include <isl/constraint.h>
-#include <isl/aff.h>
-#include <isl/val.h>
-
-/* Since ISL-0.13, the extern is in val_gmp.h.  */
-#if !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus)
-extern "C" {
-#endif
-#include <isl/val_gmp.h>
-#if !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus)
-}
-#endif
-
 #include "system.h"
 #include "coretypes.h"
 #include "backend.h"
@@ -63,8 +46,26 @@
 #include "tree-data-ref.h"
 #include "tree-scalar-evolution.h"
 #include "domwalk.h"
+#include "tree-ssa-propagate.h"
+
+#include <isl/constraint.h>
+#include <isl/set.h>
+#include <isl/map.h>
+#include <isl/union_map.h>
+#include <isl/constraint.h>
+#include <isl/aff.h>
+#include <isl/val.h>
+
+/* Since ISL-0.13, the extern is in val_gmp.h.  */
+#if !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus)
+extern "C" {
+#endif
+#include <isl/val_gmp.h>
+#if !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus)
+}
+#endif
+
 #include "graphite-poly.h"
-#include "tree-ssa-propagate.h"
 #include "graphite-sese-to-poly.h"
 
 /* Assigns to RES the value of the INTEGER_CST T.  */
Index: graphite.c
===================================================================
--- graphite.c	(revision 230704)
+++ graphite.c	(working copy)
@@ -27,19 +27,9 @@
    The wiki page http://gcc.gnu.org/wiki/Graphite contains pointers to
    the related work.  */
 
-#include "config.h"
+#define USES_ISL
 
-#ifdef HAVE_isl
-/* Workaround for GMP 5.1.3 bug, see PR56019.  */
-#include <stddef.h>
-
-#include <isl/constraint.h>
-#include <isl/set.h>
-#include <isl/map.h>
-#include <isl/options.h>
-#include <isl/union_map.h>
-#endif
-
+#include "config.h"
 #include "system.h"
 #include "coretypes.h"
 #include "backend.h"
@@ -59,10 +49,17 @@
 #include "tree-ssa-loop.h"
 #include "tree-data-ref.h"
 #include "tree-scalar-evolution.h"
-#include "graphite-poly.h"
 #include "dbgcnt.h"
 #include "tree-parloops.h"
 #include "tree-cfgcleanup.h"
+
+#include <isl/constraint.h>
+#include <isl/set.h>
+#include <isl/map.h>
+#include <isl/options.h>
+#include <isl/union_map.h>
+
+#include "graphite-poly.h"
 #include "graphite-scop-detection.h"
 #include "graphite-isl-ast-to-gimple.h"
 #include "graphite-sese-to-poly.h"

Re: [PATCH] GCC system.h and Graphite header order

[Sebastian Pop]

On Sat, Nov 21, 2015 at 4:03 PM, David Edelsohn <dje.gcc@gmail.com> wrote:
> Graphite relies on the ISL library and includes multiple ISL headers.
> The ISL headers refer to identifiers that are poisoned for use in GCC.
> The source files for Graphite were organized to include the ISL
> headers first, to avoid the identifier poisoning, which breaks some
> platforms because GCC header features are disabled.
>
> This patch reorganizes the graphite*.c header file inclusion order to
> list ISL header files near the end, just before the graphite header
> files on which they rely.  A new macro, USES_ISL, is defined, which
> skips the relevant identifier poisoning, similar to logic for Flex and
> Bison.
>
> This patch also removes early inclusion of stddef.h for ISL because it
> now should be provided by GCC system.h
>
> This has been bootstrapped on powerpc-ibm-aix7.1.0.0
>
> Okay for trunk?
>
> Thanks, David
>
> * system.h: Don't poison calloc and strdup if USES_ISL is defined.
> * graphite-dependences.c: Define USES_ISL.  Include ISL header files
> after GCC header files and before graphite header files.
> * graphite-dependences.c: Same.
> * graphite-isl-ast-to-gimple.c: Same.
> * graphite-optimize-isl.c: Same.
> * graphite-poly.c: Same.
> * graphite-scop-detection.c: Same.
> * graphite-sese-to-poly.c: Same.
> * graphite.c: Same.

The patch looks good to me.  Thanks David for fixing this.

Sebastian

Re: [PATCH] GCC system.h and Graphite header order

[Richard Biener]

On Sun, Nov 22, 2015 at 4:13 AM, Sebastian Pop <sebpop@gmail.com> wrote:
> On Sat, Nov 21, 2015 at 4:03 PM, David Edelsohn <dje.gcc@gmail.com> wrote:
>> Graphite relies on the ISL library and includes multiple ISL headers.
>> The ISL headers refer to identifiers that are poisoned for use in GCC.
>> The source files for Graphite were organized to include the ISL
>> headers first, to avoid the identifier poisoning, which breaks some
>> platforms because GCC header features are disabled.
>>
>> This patch reorganizes the graphite*.c header file inclusion order to
>> list ISL header files near the end, just before the graphite header
>> files on which they rely.  A new macro, USES_ISL, is defined, which
>> skips the relevant identifier poisoning, similar to logic for Flex and
>> Bison.
>>
>> This patch also removes early inclusion of stddef.h for ISL because it
>> now should be provided by GCC system.h
>>
>> This has been bootstrapped on powerpc-ibm-aix7.1.0.0
>>
>> Okay for trunk?
>>
>> Thanks, David
>>
>> * system.h: Don't poison calloc and strdup if USES_ISL is defined.
>> * graphite-dependences.c: Define USES_ISL.  Include ISL header files
>> after GCC header files and before graphite header files.
>> * graphite-dependences.c: Same.
>> * graphite-isl-ast-to-gimple.c: Same.
>> * graphite-optimize-isl.c: Same.
>> * graphite-poly.c: Same.
>> * graphite-scop-detection.c: Same.
>> * graphite-sese-to-poly.c: Same.
>> * graphite.c: Same.
>
> The patch looks good to me.  Thanks David for fixing this.

Note that if we run into more problems like this instead of guarding
the poisoning we may as well move the include of the ISL headers
to system.h guarded by USES_ISL.

Richard.

> Sebastian

Re: [PATCH] GCC system.h and Graphite header order

[Alan Lawrence]

I note doc/install.texi says that gcc uses "ISL Library version 0.15,
0.14, 0.13, or 0.12.2". This patch breaks the build with 0.12.2 (a
subset of errors below), but seems fine with 0.14. I haven't tested
0.13. Do we want to update install.texi ?

Cheers, Alan


In file included from
/work/alalaw01/build-aarch64-none-elf/host-tools/include/isl/list.h:13:0,
                 from
/work/alalaw01/build-aarch64-none-elf/host-tools/include/isl/aff_type.h:4,
                 from
/work/alalaw01/build-aarch64-none-elf/host-tools/include/isl/local_space.h:4,
                 from
/work/alalaw01/build-aarch64-none-elf/host-tools/include/isl/constraint.h:13,
                 from /work/alalaw01/src/gcc/gcc/graphite-optimize-isl.c:41:
/work/alalaw01/build-aarch64-none-elf/host-tools/include/isl/ctx.h:108:8:
error: attempt to use poisoned "malloc"
        malloc(size)))
        ^
/work/alalaw01/build-aarch64-none-elf/host-tools/include/isl/ctx.h:112:8:
error: attempt to use poisoned "realloc"
        realloc(ptr,size)))
        ^
/usr/include/c++/4.8/bits/locale_facets.h:2566:44: error: macro
"isdigit" passed 2 arguments, but takes just 1
     isdigit(_CharT __c, const locale& __loc)
                                            ^
/usr/include/c++/4.8/bits/locale_facets.h:2572:44: error: macro
"ispunct" passed 2 arguments, but takes just 1
     ispunct(_CharT __c, const locale& __loc)
                                            ^
/usr/include/c++/4.8/bits/locale_facets.h:2578:45: error: macro
"isxdigit" passed 2 arguments, but takes just 1
     isxdigit(_CharT __c, const locale& __loc)
                                             ^
/usr/include/c++/4.8/bits/locale_facets.h:2584:44: error: macro
"isalnum" passed 2 arguments, but takes just 1
     isalnum(_CharT __c, const locale& __loc)
                                            ^
/usr/include/c++/4.8/bits/locale_facets.h:2590:44: error: macro
"isgraph" passed 2 arguments, but takes just 1
     isgraph(_CharT __c, const locale& __loc)
                                            ^
/usr/include/c++/4.8/bits/locale_facets.h:2596:44: error: macro
"toupper" passed 2 arguments, but takes just 1
     toupper(_CharT __c, const locale& __loc)
                                            ^
/usr/include/c++/4.8/bits/locale_facets.h:2602:44: error: macro
"tolower" passed 2 arguments, but takes just 1
     tolower(_CharT __c, const locale& __loc)

In file included from /usr/include/c++/4.8/bits/basic_ios.h:37:0,
                 from /usr/include/c++/4.8/ios:44,
                 from /usr/include/c++/4.8/ostream:38,
                 from /usr/include/c++/4.8/iostream:39,
                 from
/work/alalaw01/build-aarch64-none-elf/host-tools/include/isl/int.h:17,
                 from
/work/alalaw01/build-aarch64-none-elf/host-tools/include/isl/ctx.h:16,
                 from
/work/alalaw01/build-aarch64-none-elf/host-tools/include/isl/list.h:13,
                 from
/work/alalaw01/build-aarch64-none-elf/host-tools/include/isl/aff_type.h:4,
                 from
/work/alalaw01/build-aarch64-none-elf/host-tools/include/isl/local_space.h:4,
                 from
/work/alalaw01/build-aarch64-none-elf/host-tools/include/isl/constraint.h:13,
                 from /work/alalaw01/src/gcc/gcc/graphite-scop-detection.c:52:
/usr/include/c++/4.8/bits/locale_facets.h:2530:5: error:
‘std::isspace’ declared as an ‘inline’ variable
     isspace(_CharT __c, const locale& __loc)
     ^
/usr/include/c++/4.8/bits/locale_facets.h:2530:5: error: template
declaration of ‘bool std::isspace’
/usr/include/c++/4.8/bits/locale_facets.h:2531:7: error: expected
primary-expression before ‘return’
     { return use_facet<ctype<_CharT> >(__loc).is(ctype_base::space, __c); }
       ^
/usr/include/c++/4.8/bits/locale_facets.h:2531:7: error: expected ‘}’
before ‘return’
/usr/include/c++/4.8/bits/locale_facets.h:2536:5: error: ‘isprint’
declared as an ‘inline’ variable
     isprint(_CharT __c, const locale& __loc)
     ^
/usr/include/c++/4.8/bits/locale_facets.h:2536:5: error: template
declaration of ‘bool isprint’
/usr/include/c++/4.8/bits/locale_facets.h:2537:7: error: expected
primary-expression before ‘return’
     { return use_facet<ctype<_CharT> >(__loc).is(ctype_base::print, __c); }
       ^
/usr/include/c++/4.8/bits/locale_facets.h:2537:7: error: expected ‘}’
before ‘return’
/usr/include/c++/4.8/bits/locale_facets.h:2537:75: error: expected
declaration before ‘}’ token
     { return use_facet<ctype<_CharT> >(__loc).is(ctype_base::print, __c); }

Re: [PATCH] GCC system.h and Graphite header order

[Thomas Schwinge]

[-- Attachment #1: Type: text/plain, Size: 5136 bytes --]

Hi!

On Tue, 24 Nov 2015 10:32:12 +0000, Alan Lawrence <alan.lawrence@arm.com> wrote:
> I note doc/install.texi says that gcc uses "ISL Library version 0.15,
> 0.14, 0.13, or 0.12.2". This patch breaks the build with 0.12.2 (a
> subset of errors below)

<https://gcc.gnu.org/PR68540> has been filed.  I set you guys on CC.

> but seems fine with 0.14. I haven't tested
> 0.13. Do we want to update install.texi ?

I have a slight preference to keep ISL 0.12.2 supported, but can adapt to
a newer version, if necessary.

> In file included from
> /work/alalaw01/build-aarch64-none-elf/host-tools/include/isl/list.h:13:0,
>                  from
> /work/alalaw01/build-aarch64-none-elf/host-tools/include/isl/aff_type.h:4,
>                  from
> /work/alalaw01/build-aarch64-none-elf/host-tools/include/isl/local_space.h:4,
>                  from
> /work/alalaw01/build-aarch64-none-elf/host-tools/include/isl/constraint.h:13,
>                  from /work/alalaw01/src/gcc/gcc/graphite-optimize-isl.c:41:
> /work/alalaw01/build-aarch64-none-elf/host-tools/include/isl/ctx.h:108:8:
> error: attempt to use poisoned "malloc"
>         malloc(size)))
>         ^
> /work/alalaw01/build-aarch64-none-elf/host-tools/include/isl/ctx.h:112:8:
> error: attempt to use poisoned "realloc"
>         realloc(ptr,size)))
>         ^
> /usr/include/c++/4.8/bits/locale_facets.h:2566:44: error: macro
> "isdigit" passed 2 arguments, but takes just 1
>      isdigit(_CharT __c, const locale& __loc)
>                                             ^
> /usr/include/c++/4.8/bits/locale_facets.h:2572:44: error: macro
> "ispunct" passed 2 arguments, but takes just 1
>      ispunct(_CharT __c, const locale& __loc)
>                                             ^
> /usr/include/c++/4.8/bits/locale_facets.h:2578:45: error: macro
> "isxdigit" passed 2 arguments, but takes just 1
>      isxdigit(_CharT __c, const locale& __loc)
>                                              ^
> /usr/include/c++/4.8/bits/locale_facets.h:2584:44: error: macro
> "isalnum" passed 2 arguments, but takes just 1
>      isalnum(_CharT __c, const locale& __loc)
>                                             ^
> /usr/include/c++/4.8/bits/locale_facets.h:2590:44: error: macro
> "isgraph" passed 2 arguments, but takes just 1
>      isgraph(_CharT __c, const locale& __loc)
>                                             ^
> /usr/include/c++/4.8/bits/locale_facets.h:2596:44: error: macro
> "toupper" passed 2 arguments, but takes just 1
>      toupper(_CharT __c, const locale& __loc)
>                                             ^
> /usr/include/c++/4.8/bits/locale_facets.h:2602:44: error: macro
> "tolower" passed 2 arguments, but takes just 1
>      tolower(_CharT __c, const locale& __loc)
> 
> In file included from /usr/include/c++/4.8/bits/basic_ios.h:37:0,
>                  from /usr/include/c++/4.8/ios:44,
>                  from /usr/include/c++/4.8/ostream:38,
>                  from /usr/include/c++/4.8/iostream:39,
>                  from
> /work/alalaw01/build-aarch64-none-elf/host-tools/include/isl/int.h:17,
>                  from
> /work/alalaw01/build-aarch64-none-elf/host-tools/include/isl/ctx.h:16,
>                  from
> /work/alalaw01/build-aarch64-none-elf/host-tools/include/isl/list.h:13,
>                  from
> /work/alalaw01/build-aarch64-none-elf/host-tools/include/isl/aff_type.h:4,
>                  from
> /work/alalaw01/build-aarch64-none-elf/host-tools/include/isl/local_space.h:4,
>                  from
> /work/alalaw01/build-aarch64-none-elf/host-tools/include/isl/constraint.h:13,
>                  from /work/alalaw01/src/gcc/gcc/graphite-scop-detection.c:52:
> /usr/include/c++/4.8/bits/locale_facets.h:2530:5: error:
> ‘std::isspace’ declared as an ‘inline’ variable
>      isspace(_CharT __c, const locale& __loc)
>      ^
> /usr/include/c++/4.8/bits/locale_facets.h:2530:5: error: template
> declaration of ‘bool std::isspace’
> /usr/include/c++/4.8/bits/locale_facets.h:2531:7: error: expected
> primary-expression before ‘return’
>      { return use_facet<ctype<_CharT> >(__loc).is(ctype_base::space, __c); }
>        ^
> /usr/include/c++/4.8/bits/locale_facets.h:2531:7: error: expected ‘}’
> before ‘return’
> /usr/include/c++/4.8/bits/locale_facets.h:2536:5: error: ‘isprint’
> declared as an ‘inline’ variable
>      isprint(_CharT __c, const locale& __loc)
>      ^
> /usr/include/c++/4.8/bits/locale_facets.h:2536:5: error: template
> declaration of ‘bool isprint’
> /usr/include/c++/4.8/bits/locale_facets.h:2537:7: error: expected
> primary-expression before ‘return’
>      { return use_facet<ctype<_CharT> >(__loc).is(ctype_base::print, __c); }
>        ^
> /usr/include/c++/4.8/bits/locale_facets.h:2537:7: error: expected ‘}’
> before ‘return’
> /usr/include/c++/4.8/bits/locale_facets.h:2537:75: error: expected
> declaration before ‘}’ token
>      { return use_facet<ctype<_CharT> >(__loc).is(ctype_base::print, __c); }


Grüße
 Thomas

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 472 bytes --]

Re: [PATCH] GCC system.h and Graphite header order

[David Edelsohn]

On Fri, Nov 27, 2015 at 11:24 AM, Thomas Schwinge
<thomas@codesourcery.com> wrote:
> Hi!
>
> On Tue, 24 Nov 2015 10:32:12 +0000, Alan Lawrence <alan.lawrence@arm.com> wrote:
>> I note doc/install.texi says that gcc uses "ISL Library version 0.15,
>> 0.14, 0.13, or 0.12.2". This patch breaks the build with 0.12.2 (a
>> subset of errors below)
>
> <https://gcc.gnu.org/PR68540> has been filed.  I set you guys on CC.
>
>> but seems fine with 0.14. I haven't tested
>> 0.13. Do we want to update install.texi ?
>
> I have a slight preference to keep ISL 0.12.2 supported, but can adapt to
> a newer version, if necessary.

I updated the install document yesterday.

I don't object to support for ISL 0.12.2, but someone has to implement
an appropriate header file incantation for the Graphite source files
WITHOUT reordering it again nor including ISL header files first --
before system.h.  Some GCC header files must be included first in GCC
source files.

Thanks, David

Re: [PATCH] GCC system.h and Graphite header order

[Thomas Schwinge]

Hi!

On Fri, 27 Nov 2015 11:51:11 -0500, David Edelsohn <dje.gcc@gmail.com> wrote:
> On Fri, Nov 27, 2015 at 11:24 AM, Thomas Schwinge
> <thomas@codesourcery.com> wrote:
> > On Tue, 24 Nov 2015 10:32:12 +0000, Alan Lawrence <alan.lawrence@arm.com> wrote:
> >> I note doc/install.texi says that gcc uses "ISL Library version 0.15,
> >> 0.14, 0.13, or 0.12.2". This patch breaks the build with 0.12.2 (a
> >> subset of errors below)
> >
> > <https://gcc.gnu.org/PR68540> has been filed.  I set you guys on CC.
> >
> >> but seems fine with 0.14. I haven't tested
> >> 0.13. Do we want to update install.texi ?
> >
> > I have a slight preference to keep ISL 0.12.2 supported, but can adapt to
> > a newer version, if necessary.
> 
> I updated the install document yesterday.
> 
> I don't object to support for ISL 0.12.2, but someone has to implement
> an appropriate header file incantation for the Graphite source files
> WITHOUT reordering it again nor including ISL header files first --
> before system.h.  Some GCC header files must be included first in GCC
> source files.

I'm not too much interested in "living in the past", so I went the easier
route, installed ISL 0.15 packages.


Grüße
 Thomas