diff options
| -rw-r--r-- | .SRCINFO | 42 | ||||
| -rw-r--r-- | PKGBUILD | 17 | ||||
| -rw-r--r-- | gcc-4.9-isl-0.13-hack.patch | 71 |
3 files changed, 105 insertions, 25 deletions
@@ -1,6 +1,6 @@ pkgbase = gcc-multilib-x32 pkgdesc = The GNU Compiler Collection for multilib with x32 ABI support - pkgver = 4.9.0_4 + pkgver = 4.9.0_5 pkgrel = 1 url = http://gcc.gnu.org arch = x86_64 @@ -20,19 +20,21 @@ pkgbase = gcc-multilib-x32 options = !emptydirs source = ftp://gcc.gnu.org/pub/gcc/snapshots/4.9-20140604/gcc-4.9-20140604.tar.bz2 source = gcc-4.8-filename-output.patch + source = gcc-4.9-isl-0.13-hack.patch md5sums = 57aa4ff81c56262dc89994853c4d0149 md5sums = 40cb437805e2f7a006aa0d0c3098ab0f + md5sums = f26ae06b9cbc8abe86f5ee4dc5737da8 pkgname = gcc-multilib-x32 pkgdesc = The GNU Compiler Collection - C and C++ frontends for multilib with x32 ABI support install = gcc.install groups = x32-devel - depends = gcc-libs-multilib-x32=4.9.0_4-1 + depends = gcc-libs-multilib-x32=4.9.0_5-1 depends = binutils>=2.24 depends = libmpc depends = cloog - provides = gcc=4.9.0-4 - provides = gcc-multilib=4.9.0-4 + provides = gcc=4.9.0-5 + provides = gcc-multilib=4.9.0-5 conflicts = gcc conflicts = gcc-x32-seed conflicts = gcc-multilib @@ -42,10 +44,10 @@ pkgname = gcc-libs-multilib-x32 pkgdesc = Runtime libraries shipped by GCC for multilib with x32 ABI support install = gcc-libs.install depends = glibc>=2.19 - depends = lib32-gcc-libs=4.9.0-4 - depends = libx32-gcc-libs=4.9.0_4-1 - provides = gcc-libs=4.9.0-4 - provides = gcc-libs-multilib=4.9.0-4 + depends = lib32-gcc-libs=4.9.0-5 + depends = libx32-gcc-libs=4.9.0_5-1 + provides = gcc-libs=4.9.0-5 + provides = gcc-libs-multilib=4.9.0-5 conflicts = gcc-libs options = !emptydirs @@ -57,26 +59,26 @@ pkgname = libx32-gcc-libs pkgname = gcc-fortran-multilib-x32 pkgdesc = Fortran front-end for GCC for multilib with x32 ABI support install = gcc-fortran.install - depends = gcc-multilib-x32=4.9.0_4-1 - provides = gcc-fortran=4.9.0-4 - provides = gcc-fortran-multilib=4.9.0-4 + depends = gcc-multilib-x32=4.9.0_5-1 + provides = gcc-fortran=4.9.0-5 + provides = gcc-fortran-multilib=4.9.0-5 conflicts = gcc-fortran options = staticlibs options = !emptydirs pkgname = gcc-objc-multilib-x32 pkgdesc = Objective-C front-end for GCC for multilib with x32 ABI support - depends = gcc-multilib-x32=4.9.0_4-1 - provides = gcc-objc=4.9.0-4 - provides = gcc-objc-multilib=4.9.0-4 + depends = gcc-multilib-x32=4.9.0_5-1 + provides = gcc-objc=4.9.0-5 + provides = gcc-objc-multilib=4.9.0-5 conflicts = gcc-objc pkgname = gcc-ada-multilib-x32 pkgdesc = Ada front-end for GCC (GNAT) for multilib with x32 ABI support install = gcc-ada.install - depends = gcc-multilib-x32=4.9.0_4-1 - provides = gcc-ada=4.9.0-4 - provides = gcc-ada-multilib=4.9.0-4 + depends = gcc-multilib-x32=4.9.0_5-1 + provides = gcc-ada=4.9.0-5 + provides = gcc-ada-multilib=4.9.0-5 conflicts = gcc-ada options = staticlibs options = !emptydirs @@ -84,9 +86,9 @@ pkgname = gcc-ada-multilib-x32 pkgname = gcc-go-multilib-x32 pkgdesc = Go front-end for GCC for multilib with x32 ABI support install = gcc-go.install - depends = gcc-multilib-x32=4.9.0_4-1 - provides = gcc-go=4.9.0-4 - provides = gcc-go-multilib=4.9.0-4 + depends = gcc-multilib-x32=4.9.0_5-1 + provides = gcc-go=4.9.0-5 + provides = gcc-go-multilib=4.9.0-5 conflicts = gcc-go options = staticlibs options = !emptydirs @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 112777 2014-06-06 22:12:36Z heftig $ +# $Id: PKGBUILD 113647 2014-06-26 20:09:32Z heftig $ # Maintainer: Fantix King <fantix.king@gmail.com> # Upstream Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> @@ -8,7 +8,7 @@ pkgname='gcc-multilib-x32' true && pkgname=('gcc-multilib-x32' 'gcc-libs-multilib-x32' 'libx32-gcc-libs' 'gcc-fortran-multilib-x32' 'gcc-objc-multilib-x32' 'gcc-ada-multilib-x32' 'gcc-go-multilib-x32') -pkgver=4.9.0_4 +pkgver=4.9.0_5 _pkgver=4.9 pkgrel=1 _snapshot=4.9-20140604 @@ -22,9 +22,11 @@ checkdepends=('dejagnu' 'inetutils') 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} @@ -58,6 +60,10 @@ prepare() { # 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 } @@ -79,7 +85,8 @@ build() { --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 \ --enable-multilib --disable-werror \ diff --git a/gcc-4.9-isl-0.13-hack.patch b/gcc-4.9-isl-0.13-hack.patch new file mode 100644 index 000000000000..c2b95d9526ab --- /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" +@@ -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> |