- rel 3; try to build with isl 0.13; patch from archlinux (thanks qboosh)

diff --git a/gcc-4.9-isl-0.13-hack.patch b/gcc-4.9-isl-0.13-hack.patch
new file mode 100644 (file)
index 0000000..86e2958
--- /dev/null
+++ b/gcc-4.9-isl-0.13-hack.patch
@@ -0,0 +1,71 @@
+diff -Naur gcc-4.9-20140604-old/gcc/graphite-clast-to-gimple.c gcc-4.9-20140604/gcc/graphite-clast-to-gimple.c
+--- gcc-4.9-20140604-old/gcc/graphite-clast-to-gimple.c        2014-03-03 21:39:22.000000000 +1000
++++ gcc-4.9-20140604/gcc/graphite-clast-to-gimple.c    2014-06-25 15:07:57.958697105 +1000
+@@ -28,6 +28,8 @@
+ #include <isl/constraint.h>
+ #include <isl/ilp.h>
+ #include <isl/aff.h>
++#include <isl/deprecated/int.h>
++#include <isl/deprecated/ilp_int.h>
+ #include <cloog/cloog.h>
+ #include <cloog/isl/domain.h>
+ #endif
+diff -Naur gcc-4.9-20140604-old/gcc/graphite-interchange.c gcc-4.9-20140604/gcc/graphite-interchange.c
+--- gcc-4.9-20140604-old/gcc/graphite-interchange.c    2014-01-03 08:23:26.000000000 +1000
++++ gcc-4.9-20140604/gcc/graphite-interchange.c        2014-06-25 15:10:06.882899243 +1000
+@@ -29,6 +29,9 @@
+ #include <isl/map.h>
+ #include <isl/union_map.h>
+ #include <isl/ilp.h>
++#include <isl/deprecated/int.h>
++#include <isl/deprecated/ilp_int.h>
++#include <isl/deprecated/constraint_int.h>
+ #include <cloog/cloog.h>
+ #include <cloog/isl/domain.h>
+ #endif
+diff -Naur gcc-4.9-20140604-old/gcc/graphite-optimize-isl.c gcc-4.9-20140604/gcc/graphite-optimize-isl.c
+--- gcc-4.9-20140604-old/gcc/graphite-optimize-isl.c   2014-01-03 08:23:26.000000000 +1000
++++ gcc-4.9-20140604/gcc/graphite-optimize-isl.c       2014-06-25 15:16:57.038386166 +1000
+@@ -28,6 +28,8 @@
+ #include <isl/band.h>
+ #include <isl/aff.h>
+ #include <isl/options.h>
++#include <isl/deprecated/int.h>
++#include <isl/deprecated/aff_int.h>
+ #endif
+ 
+ #include "system.h"
+@@ -367,7 +367,7 @@ getScheduleForBandList(isl_band_list *Ba
+       {
+         for (i = ScheduleDimensions - 1 ;  i >= 0 ; i--)
+           {
+-            if (isl_band_member_is_zero_distance(Band, i))
++            if (isl_band_member_is_coincident(Band, i))
+               {
+                 isl_map *TileMap;
+                 isl_union_map *TileUMap;
+diff -Naur gcc-4.9-20140604-old/gcc/graphite-poly.c gcc-4.9-20140604/gcc/graphite-poly.c
+--- gcc-4.9-20140604-old/gcc/graphite-poly.c   2014-01-03 08:23:26.000000000 +1000
++++ gcc-4.9-20140604/gcc/graphite-poly.c       2014-06-25 15:18:01.207157796 +1000
+@@ -28,6 +28,8 @@
+ #include <isl/constraint.h>
+ #include <isl/ilp.h>
+ #include <isl/aff.h>
++#include <isl/deprecated/int.h>
++#include <isl/deprecated/ilp_int.h>
+ #include <cloog/cloog.h>
+ #include <cloog/isl/domain.h>
+ #endif
+diff -Naur gcc-4.9-20140604-old/gcc/graphite-sese-to-poly.c gcc-4.9-20140604/gcc/graphite-sese-to-poly.c
+--- gcc-4.9-20140604-old/gcc/graphite-sese-to-poly.c   2014-04-08 20:59:40.000000000 +1000
++++ gcc-4.9-20140604/gcc/graphite-sese-to-poly.c       2014-06-25 15:19:46.575140398 +1000
+@@ -26,6 +26,9 @@
+ #include <isl/union_map.h>
+ #include <isl/constraint.h>
+ #include <isl/aff.h>
++#include <isl/deprecated/int.h>
++#include <isl/deprecated/aff_int.h>
++#include <isl/deprecated/constraint_int.h>
+ #include <cloog/cloog.h>
+ #include <cloog/cloog.h>
+ #include <cloog/isl/domain.h>

diff --git a/gcc.spec b/gcc.spec
index 24c8a5c852c00fd730fa5b3230d622bd829d00e0..a088f7a03f28424a8df93dcf7c43ff5bd9922e15 100644 (file)
--- a/gcc.spec
+++ b/gcc.spec
@@ -98,7 +98,7 @@ Summary(pl.UTF-8):    Kolekcja kompilatorów GNU: kompilator C i pliki współdziel
 Summary(pt_BR.UTF-8):  Coleção dos compiladores GNU: o compilador C e arquivos compartilhados
 Name:          gcc
 Version:       %{major_ver}.%{minor_ver}
-Release:       2
+Release:       3
 Epoch:         6
 License:       GPL v3+
 Group:         Development/Languages
@@ -121,6 +121,7 @@ Patch7:             %{name}-libjava-multilib.patch
 Patch8:                %{name}-enable-java-awt-qt.patch
 Patch10:       %{name}-moresparcs.patch
 Patch11:       %{name}-install-libffi.patch
+Patch12:       gcc-4.9-isl-0.13-hack.patch
 URL:           http://gcc.gnu.org/
 BuildRequires: autoconf >= 2.64
 %{?with_tests:BuildRequires:   autogen}
@@ -158,8 +159,7 @@ BuildRequires:      glibc-devel(sparcv9)
 %endif
 BuildRequires: gmp-c++-devel >= 4.1
 BuildRequires: gmp-devel >= 4.1
-BuildRequires: isl-devel >= 0.10
-BuildRequires: isl-devel < 0.13
+BuildRequires: isl-devel >= 0.13
 BuildRequires: libmpc-devel
 BuildRequires: mpfr-devel >= 2.3.0
 BuildRequires: ppl-devel >= 0.11
@@ -1708,6 +1708,8 @@ Ten pakiet zawiera 32-bitową wersję statycznej biblioteki GNU Atomic.
 %patch11 -p0
 %endif
 
+%patch12 -p1
+
 mv ChangeLog ChangeLog.general
 
 %if %{with java}