From 7cee998532a32b5eb39deb4a6059ecd8fc295f17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Mon, 22 Sep 2014 18:59:58 -0300 Subject: update cross-gcc --- cross/cross-gcc/PKGBUILD | 33 +++++++------- cross/cross-gcc/gcc-4.8-lambda-ICE.patch | 35 -------------- cross/cross-gcc/gcc-4.9-isl-0.13-hack.patch | 71 +++++++++++++++++++++++++++++ 3 files changed, 87 insertions(+), 52 deletions(-) delete mode 100644 cross/cross-gcc/gcc-4.8-lambda-ICE.patch create mode 100644 cross/cross-gcc/gcc-4.9-isl-0.13-hack.patch (limited to 'cross') diff --git a/cross/cross-gcc/PKGBUILD b/cross/cross-gcc/PKGBUILD index 4afa3aab4..57e559e33 100644 --- a/cross/cross-gcc/PKGBUILD +++ b/cross/cross-gcc/PKGBUILD @@ -126,11 +126,10 @@ fi _pkgname=gcc pkgname=$_target-$_pkgname makedepends=('binutils>=2.24' 'libmpc' 'cloog' 'doxygen') -_gccver=4.9.1 -pkgver=4.8.2 -_pkgver=4.8 -pkgrel=10 -_snapshot=4.8-20140306 +pkgver=4.9.1 +_pkgver=4.9 +pkgrel=2 +_snapshot=4.9-20140903 pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -140,12 +139,12 @@ options=('!emptydirs') source=(#ftp://$_pkgname.gnu.org/pub/$_pkgname/releases/$_pkgname-${pkgver}/$_pkgname-${pkgver}.tar.bz2 ftp://$_pkgname.gnu.org/pub/$_pkgname/snapshots/${_snapshot}/$_pkgname-${_snapshot}.tar.bz2 $_pkgname-4.8-filename-output.patch - $_pkgname-4.8-lambda-ICE.patch + $_pkgname-4.9-isl-0.13-hack.patch $_pkgname-xtensa.patch mips-kfreebsd-gnu.patch) -md5sums=('21b4594573d5141afd2109b11037eb2c' +md5sums=('24dfd67139fda4746d2deff18182611d' '40cb437805e2f7a006aa0d0c3098ab0f' - '6eb6e080dbf7bc6825f53a0aaa6c4ef9' + 'f26ae06b9cbc8abe86f5ee4dc5737da8' '81372ee980289a9f6df01dad31c64a63' '43282cddb2080b1180f7b76d3a8a832c') @@ -173,13 +172,10 @@ prepare() { # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57653 patch -p0 -i ${srcdir}/$_pkgname-4.8-filename-output.patch - - # http://gcc.gnu.org/bugzilla//show_bug.cgi?id=56710 - commit 3d1f8279 - patch -p1 -i ${srcdir}/$_pkgname-4.8-lambda-ICE.patch - # installing libiberty headers is broken - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56780#c6 - sed -i 's#@target_header_dir@#libiberty#' libiberty/Makefile.in + # 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}/$_pkgname-4.9-isl-0.13-hack.patch # open-ath9k-htc-firmware patch on xtensa-unknown-elf [[ $_target == xtensa-unknown-elf ]] && patch -p1 -i ${srcdir}/$_pkgname-xtensa.patch @@ -209,7 +205,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 \ --disable-multilib --disable-werror \ @@ -221,7 +218,7 @@ package() { pkgdesc="The GNU Compiler Collection - C and C++ frontends" depends=("$_target-binutils>=2.24" 'libmpc' 'cloog') groups=('cross-devel') - provides=("$_pkgname=$_gccver") + provides=("$_pkgname=$pkgver-$pkgrel") conflicts=("$_pkgname" "$_pkgname-ada" "$_pkgname-fortran" "$_pkgname-go" "$_pkgname-objc") install=$_pkgname.install @@ -238,13 +235,15 @@ package() { make -C lto-plugin DESTDIR=${pkgdir} install make -C libiberty DESTDIR=${pkgdir} install + # install PIC version of libiberty + install -m644 ${srcdir}/$_pkgname-build/libiberty/pic/libiberty.a ${pkgdir}/usr/lib make -C $_pkgname DESTDIR=${pkgdir} install-man install-info make -C libcpp DESTDIR=${pkgdir} install make -C $_pkgname DESTDIR=${pkgdir} install-po - # many packages expect this symlinks + # many packages expect this symlink ln -s $_pkgname ${pkgdir}/usr/bin/cc # POSIX conformance launcher scripts for c89 and c99 diff --git a/cross/cross-gcc/gcc-4.8-lambda-ICE.patch b/cross/cross-gcc/gcc-4.8-lambda-ICE.patch deleted file mode 100644 index cf77a9b35..000000000 --- a/cross/cross-gcc/gcc-4.8-lambda-ICE.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c -index 0b8e2f7..ad1c209 100644 ---- a/gcc/cp/semantics.c -+++ b/gcc/cp/semantics.c -@@ -2719,8 +2719,10 @@ finish_member_declaration (tree decl) - /*friend_p=*/0); - } - } -- /* Enter the DECL into the scope of the class. */ -- else if (pushdecl_class_level (decl)) -+ /* Enter the DECL into the scope of the class, if the class -+ isn't a closure (whose fields are supposed to be unnamed). */ -+ else if (CLASSTYPE_LAMBDA_EXPR (current_class_type) -+ || pushdecl_class_level (decl)) - { - if (TREE_CODE (decl) == USING_DECL) - { -diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-names1.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-names1.C -new file mode 100644 -index 0000000..df2b037 ---- /dev/null -+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-names1.C -@@ -0,0 +1,9 @@ -+// PR c++/56710 -+// { dg-options "-std=c++11 -Wall" } -+ -+int main() -+{ -+ int t = 0; -+ return [&]() -> int {int __t; __t = t; return __t; }(); -+ return [&t]() -> int {int __t; __t = t; return __t; }(); -+} --- -1.8.4.2 - diff --git a/cross/cross-gcc/gcc-4.9-isl-0.13-hack.patch b/cross/cross-gcc/gcc-4.9-isl-0.13-hack.patch new file mode 100644 index 000000000..c2b95d952 --- /dev/null +++ b/cross/cross-gcc/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 + #include + #include ++#include ++#include + #include + #include + #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 + #include + #include ++#include ++#include ++#include + #include + #include + #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 + #include + #include ++#include ++#include + #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 + #include + #include ++#include ++#include + #include + #include + #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 + #include + #include ++#include ++#include ++#include + #include + #include + #include -- cgit v1.2.3