Fix build with ISL 0.20

Signed-off-by: Alexey Neyman <stilor@att.net>

10 files changed, 137 insertions, 20 deletions

diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index 48ec5562..74fbb70a 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -11,8 +11,10 @@
 ## select ISL_REQUIRE_0_15_or_later if ISL_NEEDED && GCC_7_or_later
 # GCC6 requires ISL 0.14+ (it says 0.14-0.16, but accepts newer ISL as well)
 ## select ISL_REQUIRE_0_14_or_later if ISL_NEEDED && GCC_6_or_later
-# GCC5 requires ISL 0.12+ (again, it says 0.12-0.16, but also accepts newer ISL)
+# GCC5 requires ISL 0.12+ (again, it says 0.12-0.16, but also accepts newer ISL up to 0.18;
+# fails to compile with 0.19+)
 ## select ISL_REQUIRE_0_12_or_later if ISL_NEEDED && GCC_5_or_later
+## select ISL_REQUIRE_0_18_or_older if ISL_NEEDED && GCC_5_or_later && !GCC_6_or_later
 # GCC4.9 requires ISL 0.10..0.15
 # GCC4.8 requires ISL 0.10..0.14
 ## select ISL_REQUIRE_0_10_or_later if ISL_NEEDED && GCC_4_8_or_later
diff --git a/packages/gcc-linaro/6.4-2018.05/0028-isl-0.20.patch b/packages/gcc-linaro/6.4-2018.05/0028-isl-0.20.patch
new file mode 100644
index 00000000..f253eab9
--- /dev/null
+++ b/packages/gcc-linaro/6.4-2018.05/0028-isl-0.20.patch
@@ -0,0 +1,26 @@
+commit 9fabe086c9f5c3896297f7f35491d785ba6f49a0
+Author: Alexey Neyman <stilor@att.net>
+Date:   Mon Sep 24 22:50:11 2018 -0700
+
+    Fix build with ISL 0.20
+    
+            * gcc/graphite.h: Include <isl/id.h> and <isl/space.h>; these
+            headers are no longer pulled in by <isl/val.h>.
+    
+    Signed-off-by: Alexey Neyman <stilor@att.net>
+
+---
+ gcc/graphite.h |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/gcc/graphite.h
++++ b/gcc/graphite.h
+@@ -26,6 +26,8 @@
+ #include <isl/options.h>
+ #include <isl/ctx.h>
+ #include <isl/val_gmp.h>
++#include <isl/id.h>
++#include <isl/space.h>
+ #include <isl/set.h>
+ #include <isl/union_set.h>
+ #include <isl/map.h>
diff --git a/packages/gcc-linaro/7.3-2018.05/0020-isl-0.20.patch b/packages/gcc-linaro/7.3-2018.05/0020-isl-0.20.patch
new file mode 100644
index 00000000..3e14966d
--- /dev/null
+++ b/packages/gcc-linaro/7.3-2018.05/0020-isl-0.20.patch
@@ -0,0 +1,26 @@
+commit 9fabe086c9f5c3896297f7f35491d785ba6f49a0
+Author: Alexey Neyman <stilor@att.net>
+Date:   Mon Sep 24 22:50:11 2018 -0700
+
+    Fix build with ISL 0.20
+    
+            * gcc/graphite.h: Include <isl/id.h> and <isl/space.h>; these
+            headers are no longer pulled in by <isl/val.h>.
+    
+    Signed-off-by: Alexey Neyman <stilor@att.net>
+
+---
+ gcc/graphite.h |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/gcc/graphite.h
++++ b/gcc/graphite.h
+@@ -26,6 +26,8 @@
+ #include <isl/options.h>
+ #include <isl/ctx.h>
+ #include <isl/val.h>
++#include <isl/id.h>
++#include <isl/space.h>
+ #include <isl/set.h>
+ #include <isl/union_set.h>
+ #include <isl/map.h>
diff --git a/packages/gcc/5.5.0/0034-xtensa-fix-PR-target-65416.patch b/packages/gcc/5.5.0/0034-xtensa-fix-PR-target-65416.patch
index 69da4044..31356a0a 100644
--- a/packages/gcc/5.5.0/0034-xtensa-fix-PR-target-65416.patch
+++ b/packages/gcc/5.5.0/0034-xtensa-fix-PR-target-65416.patch
@@ -22,11 +22,9 @@ gcc/
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@261755 138bc75d-0d04-0410-961f-82ee72b054a4
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gcc/config/xtensa/xtensa.md | 46 +++++++++++++++++++++++++++++++++++++++++++++
+ gcc/config/xtensa/xtensa.md |   46 ++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 46 insertions(+)
 
-diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md
-index a4228da2bb44..61c963a02037 100644
 --- a/gcc/config/xtensa/xtensa.md
 +++ b/gcc/config/xtensa/xtensa.md
 @@ -38,6 +38,7 @@
@@ -96,6 +94,3 @@ index a4228da2bb44..61c963a02037 100644
  (define_insn "trap"
    [(trap_if (const_int 1) (const_int 0))]
    ""
--- 
-2.11.0
-
diff --git a/packages/gcc/6.4.0/0034-xtensa-fix-PR-target-65416.patch b/packages/gcc/6.4.0/0032-xtensa-fix-PR-target-65416.patch
index e3529757..14fd30f7 100644
--- a/packages/gcc/6.4.0/0034-xtensa-fix-PR-target-65416.patch
+++ b/packages/gcc/6.4.0/0032-xtensa-fix-PR-target-65416.patch
@@ -22,11 +22,9 @@ gcc/
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@261755 138bc75d-0d04-0410-961f-82ee72b054a4
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gcc/config/xtensa/xtensa.md | 46 +++++++++++++++++++++++++++++++++++++++++++++
+ gcc/config/xtensa/xtensa.md |   46 ++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 46 insertions(+)
 
-diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md
-index fcdb6c8ecadf..6b27e2ba76f9 100644
 --- a/gcc/config/xtensa/xtensa.md
 +++ b/gcc/config/xtensa/xtensa.md
 @@ -38,6 +38,7 @@
@@ -96,6 +94,3 @@ index fcdb6c8ecadf..6b27e2ba76f9 100644
  (define_insn "trap"
    [(trap_if (const_int 1) (const_int 0))]
    ""
--- 
-2.11.0
-
diff --git a/packages/gcc/6.4.0/0033-isl-0.20.patch b/packages/gcc/6.4.0/0033-isl-0.20.patch
new file mode 100644
index 00000000..f253eab9
--- /dev/null
+++ b/packages/gcc/6.4.0/0033-isl-0.20.patch
@@ -0,0 +1,26 @@
+commit 9fabe086c9f5c3896297f7f35491d785ba6f49a0
+Author: Alexey Neyman <stilor@att.net>
+Date:   Mon Sep 24 22:50:11 2018 -0700
+
+    Fix build with ISL 0.20
+    
+            * gcc/graphite.h: Include <isl/id.h> and <isl/space.h>; these
+            headers are no longer pulled in by <isl/val.h>.
+    
+    Signed-off-by: Alexey Neyman <stilor@att.net>
+
+---
+ gcc/graphite.h |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/gcc/graphite.h
++++ b/gcc/graphite.h
+@@ -26,6 +26,8 @@
+ #include <isl/options.h>
+ #include <isl/ctx.h>
+ #include <isl/val_gmp.h>
++#include <isl/id.h>
++#include <isl/space.h>
+ #include <isl/set.h>
+ #include <isl/union_set.h>
+ #include <isl/map.h>
diff --git a/packages/gcc/7.3.0/0022-xtensa-fix-PR-target-65416.patch b/packages/gcc/7.3.0/0022-xtensa-fix-PR-target-65416.patch
index 721df329..37dc7f81 100644
--- a/packages/gcc/7.3.0/0022-xtensa-fix-PR-target-65416.patch
+++ b/packages/gcc/7.3.0/0022-xtensa-fix-PR-target-65416.patch
@@ -22,11 +22,9 @@ gcc/
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@261755 138bc75d-0d04-0410-961f-82ee72b054a4
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gcc/config/xtensa/xtensa.md | 46 +++++++++++++++++++++++++++++++++++++++++++++
+ gcc/config/xtensa/xtensa.md |   46 ++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 46 insertions(+)
 
-diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md
-index d5596e25d828..0eba10b742cd 100644
 --- a/gcc/config/xtensa/xtensa.md
 +++ b/gcc/config/xtensa/xtensa.md
 @@ -38,6 +38,7 @@
@@ -96,6 +94,3 @@ index d5596e25d828..0eba10b742cd 100644
  (define_insn "trap"
    [(trap_if (const_int 1) (const_int 0))]
    ""
--- 
-2.11.0
-
diff --git a/packages/gcc/7.3.0/0023-isl-0.20.patch b/packages/gcc/7.3.0/0023-isl-0.20.patch
new file mode 100644
index 00000000..3e14966d
--- /dev/null
+++ b/packages/gcc/7.3.0/0023-isl-0.20.patch
@@ -0,0 +1,26 @@
+commit 9fabe086c9f5c3896297f7f35491d785ba6f49a0
+Author: Alexey Neyman <stilor@att.net>
+Date:   Mon Sep 24 22:50:11 2018 -0700
+
+    Fix build with ISL 0.20
+    
+            * gcc/graphite.h: Include <isl/id.h> and <isl/space.h>; these
+            headers are no longer pulled in by <isl/val.h>.
+    
+    Signed-off-by: Alexey Neyman <stilor@att.net>
+
+---
+ gcc/graphite.h |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/gcc/graphite.h
++++ b/gcc/graphite.h
+@@ -26,6 +26,8 @@
+ #include <isl/options.h>
+ #include <isl/ctx.h>
+ #include <isl/val.h>
++#include <isl/id.h>
++#include <isl/space.h>
+ #include <isl/set.h>
+ #include <isl/union_set.h>
+ #include <isl/map.h>
diff --git a/packages/gcc/8.2.0/0019-isl-0.20.patch b/packages/gcc/8.2.0/0019-isl-0.20.patch
new file mode 100644
index 00000000..3e14966d
--- /dev/null
+++ b/packages/gcc/8.2.0/0019-isl-0.20.patch
@@ -0,0 +1,26 @@
+commit 9fabe086c9f5c3896297f7f35491d785ba6f49a0
+Author: Alexey Neyman <stilor@att.net>
+Date:   Mon Sep 24 22:50:11 2018 -0700
+
+    Fix build with ISL 0.20
+    
+            * gcc/graphite.h: Include <isl/id.h> and <isl/space.h>; these
+            headers are no longer pulled in by <isl/val.h>.
+    
+    Signed-off-by: Alexey Neyman <stilor@att.net>
+
+---
+ gcc/graphite.h |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/gcc/graphite.h
++++ b/gcc/graphite.h
+@@ -26,6 +26,8 @@
+ #include <isl/options.h>
+ #include <isl/ctx.h>
+ #include <isl/val.h>
++#include <isl/id.h>
++#include <isl/space.h>
+ #include <isl/set.h>
+ #include <isl/union_set.h>
+ #include <isl/map.h>
diff --git a/packages/isl/package.desc b/packages/isl/package.desc
index 727bd303..3e1e9ca3 100644
--- a/packages/isl/package.desc
+++ b/packages/isl/package.desc
@@ -1,5 +1,5 @@
 repository='git git://repo.or.cz/isl.git'
 bootstrap='./autogen.sh'
 mirrors='http://isl.gforge.inria.fr'
-milestones='0.12 0.13 0.14 0.15'
+milestones='0.12 0.13 0.14 0.15 0.18'
 archive_formats='.tar.xz .tar.bz2 .tar.gz'