Date: Sunday, April 13, 2014 @ 04:17:07 Author: allan Revision: 210250
prepare for gcc-4.9 update Modified: gcc/trunk/PKGBUILD Deleted: gcc/trunk/gcc-4.8-lambda-ICE.patch --------------------------+ PKGBUILD | 38 ++++++++++++++++---------------------- gcc-4.8-lambda-ICE.patch | 35 ----------------------------------- 2 files changed, 16 insertions(+), 57 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-04-12 19:38:15 UTC (rev 210249) +++ PKGBUILD 2014-04-13 02:17:07 UTC (rev 210250) @@ -5,10 +5,10 @@ # NOTE: libtool requires rebuilt with each new gcc version pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') -pkgver=4.8.2 -_pkgver=4.8 -pkgrel=8 -_snapshot=4.8-20140206 +pkgver=4.9.0 +_pkgver=4.9 +pkgrel=0 +_snapshot=4.9.0-RC-20140411 pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -18,11 +18,9 @@ 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-lambda-ICE.patch) -md5sums=('9d35549404a2326540fb88301ebd1977' - '40cb437805e2f7a006aa0d0c3098ab0f' - '6eb6e080dbf7bc6825f53a0aaa6c4ef9') + gcc-4.8-filename-output.patch) +md5sums=('12f7fe4678c6e52ee97cf30819f2377b' + '40cb437805e2f7a006aa0d0c3098ab0f') if [ -n "${_snapshot}" ]; then _basedir=gcc-${_snapshot} @@ -48,14 +46,7 @@ # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57653 patch -p0 -i ${srcdir}/gcc-4.8-filename-output.patch - - # http://gcc.gnu.org/bugzilla//show_bug.cgi?id=56710 - commit 3d1f8279 - patch -p1 -i ${srcdir}/gcc-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 - mkdir ${srcdir}/gcc-build } @@ -113,14 +104,15 @@ make -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared rm ${pkgdir}/${_libdir}/libgcc_eh.a - for lib in libmudflap \ + for lib in libatomic \ + libcilkrts \ + libgfortran \ libgomp \ libitm \ - libatomic \ + libquadmath \ + libsanitizer/{a,l,ub}san \ libstdc++-v3/src \ - libquadmath \ - libgfortran \ - libsanitizer/asan; do + libvtv; do make -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES done @@ -175,11 +167,13 @@ make -C gcc DESTDIR=${pkgdir} install-mkheaders make -C lto-plugin DESTDIR=${pkgdir} install + make -C $CHOST/libcilkrts DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS \ + install-nodist_cilkincludeHEADERS make -C $CHOST/libgomp DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS \ install-nodist_libsubincludeHEADERS make -C $CHOST/libitm DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS - make -C $CHOST/libmudflap DESTDIR=${pkgdir} install-nobase_libsubincludeHEADERS make -C $CHOST/libquadmath DESTDIR=${pkgdir} install-nodist_libsubincludeHEADERS + make -C $CHOST/libsanitizer DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS make -C $CHOST/libsanitizer/asan DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS make -C libiberty DESTDIR=${pkgdir} install Deleted: gcc-4.8-lambda-ICE.patch =================================================================== --- gcc-4.8-lambda-ICE.patch 2014-04-12 19:38:15 UTC (rev 210249) +++ gcc-4.8-lambda-ICE.patch 2014-04-13 02:17:07 UTC (rev 210250) @@ -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 -