- branch diff obsolete made 4.9-isl-0.13-hack.patch obsolete

diff --git a/gcc-4.9-isl-0.13-hack.patch b/gcc-4.9-isl-0.13-hack.patch
deleted file mode 100644 (file)
index c2b95d9..0000000
--- a/gcc-4.9-isl-0.13-hack.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-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"
-@@ -373,7 +375,7 @@
-       {
-         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 0f0071ff32bd9c5a0db194ad93718931da778d48..20494f22e44126e30d30cdf426187a57b2b3d178 100644 (file)
--- a/gcc.spec
+++ b/gcc.spec
@@ -118,7 +118,6 @@ Patch1:             %{name}-cloog.patch
 Patch2:                %{name}-nodebug.patch
 Patch3:                %{name}-ada-link.patch
 
 Patch2:                %{name}-nodebug.patch
 Patch3:                %{name}-ada-link.patch
 

-Patch5:                %{name}-4.9-isl-0.13-hack.patch

 Patch6:                %{name}-pr61164.patch
 Patch7:                %{name}-libjava-multilib.patch
 Patch8:                %{name}-enable-java-awt-qt.patch
 Patch6:                %{name}-pr61164.patch
 Patch7:                %{name}-libjava-multilib.patch
 Patch8:                %{name}-enable-java-awt-qt.patch


@@ -1778,7 +1777,6 @@ Ten pakiet zawiera 32-bitową wersję statycznej biblioteki GNU Atomic.
 %patch2 -p1
 %patch3 -p1
 
 %patch2 -p1
 %patch3 -p1
 

-%patch5 -p1

 %patch6 -p1
 %patch7 -p0
 %if %{with qt}
 %patch6 -p1
 %patch7 -p0
 %if %{with qt}