Date: Wednesday, June 25, 2014 @ 14:14:48 Author: allan Revision: 215433
upgpkg: gcc 4.9.0-5 fix graphite with isl-0.13 compatibility hack Added: gcc/trunk/gcc-4.9-isl-0.13-hack.patch Modified: gcc/trunk/PKGBUILD -----------------------------+ PKGBUILD | 15 ++++++-- gcc-4.9-isl-0.13-hack.patch | 71 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-06-24 22:02:44 UTC (rev 215432) +++ PKGBUILD 2014-06-25 12:14:48 UTC (rev 215433) @@ -7,7 +7,7 @@ pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') pkgver=4.9.0 _pkgver=4.9 -pkgrel=4 +pkgrel=5 _snapshot=4.9-20140604 pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64') @@ -18,9 +18,11 @@ options=('!emptydirs') source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 - gcc-4.8-filename-output.patch) + gcc-4.8-filename-output.patch + gcc-4.9-isl-0.13-hack.patch) md5sums=('57aa4ff81c56262dc89994853c4d0149' - '40cb437805e2f7a006aa0d0c3098ab0f') + '40cb437805e2f7a006aa0d0c3098ab0f' + 'f26ae06b9cbc8abe86f5ee4dc5737da8') if [ -n "${_snapshot}" ]; then _basedir=gcc-${_snapshot} @@ -47,6 +49,10 @@ # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57653 patch -p0 -i ${srcdir}/gcc-4.8-filename-output.patch + # isl-0.13 support - mostly header includes and a function rename + # (which does not seem right but causes no testsuite failures...) + patch -p1 -i ${srcdir}/gcc-4.9-isl-0.13-hack.patch + mkdir ${srcdir}/gcc-build } @@ -68,7 +74,8 @@ --disable-libunwind-exceptions --enable-clocale=gnu \ --disable-libstdcxx-pch --disable-libssp \ --enable-gnu-unique-object --enable-linker-build-id \ - --enable-cloog-backend=isl --disable-cloog-version-check \ + --enable-cloog-backend=isl \ + --disable-isl-version-check --disable-cloog-version-check \ --enable-lto --enable-plugin --enable-install-libiberty \ --with-linker-hash-style=gnu \ --disable-multilib --disable-werror \ Added: gcc-4.9-isl-0.13-hack.patch =================================================================== --- gcc-4.9-isl-0.13-hack.patch (rev 0) +++ gcc-4.9-isl-0.13-hack.patch 2014-06-25 12:14:48 UTC (rev 215433) @@ -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" +@@ -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>