diff options
| -rw-r--r-- | .SRCINFO | 42 | ||||
| -rw-r--r-- | PKGBUILD | 18 | ||||
| -rw-r--r-- | gcc-4.9-tree-ssa-threadedge.patch | 38 |
3 files changed, 28 insertions, 70 deletions
@@ -1,6 +1,6 @@ pkgbase = gcc-multilib-x32 pkgdesc = The GNU Compiler Collection for multilib with x32 ABI support - pkgver = 4.9.0_2 + pkgver = 4.9.0_3 pkgrel = 1 url = http://gcc.gnu.org arch = x86_64 @@ -18,23 +18,21 @@ pkgbase = gcc-multilib-x32 makedepends = lib32-glibc>=2.19 makedepends = libx32-glibc>=2.19 options = !emptydirs - source = ftp://gcc.gnu.org/pub/gcc/snapshots/4.9-20140507/gcc-4.9-20140507.tar.bz2 + source = ftp://gcc.gnu.org/pub/gcc/snapshots/4.9-20140521/gcc-4.9-20140521.tar.bz2 source = gcc-4.8-filename-output.patch - source = gcc-4.9-tree-ssa-threadedge.patch - md5sums = 47dc2b91d2876daff53c20c30164c38f + md5sums = cd3cbe93ebc7207bf65d30e3c9a74a26 md5sums = 40cb437805e2f7a006aa0d0c3098ab0f - md5sums = 311ece7f5446d550e84e28692d2fb823 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_2-1 + depends = gcc-libs-multilib-x32=4.9.0_3-1 depends = binutils>=2.24 depends = libmpc depends = cloog - provides = gcc=4.9.0-2 - provides = gcc-multilib=4.9.0-2 + provides = gcc=4.9.0-3 + provides = gcc-multilib=4.9.0-3 conflicts = gcc conflicts = gcc-x32-seed conflicts = gcc-multilib @@ -44,10 +42,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-2 - depends = libx32-gcc-libs=4.9.0_2-1 - provides = gcc-libs=4.9.0-2 - provides = gcc-libs-multilib=4.9.0-2 + depends = lib32-gcc-libs=4.9.0-3 + depends = libx32-gcc-libs=4.9.0_3-1 + provides = gcc-libs=4.9.0-3 + provides = gcc-libs-multilib=4.9.0-3 conflicts = gcc-libs options = !emptydirs @@ -59,23 +57,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_2-1 - provides = gcc-fortran=4.9.0-2 + depends = gcc-multilib-x32=4.9.0_3-1 + provides = gcc-fortran=4.9.0-3 + provides = gcc-fortran-multilib=4.9.0-3 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_2-1 - provides = gcc-objc=4.9.0-2 + depends = gcc-multilib-x32=4.9.0_3-1 + provides = gcc-objc=4.9.0-3 + provides = gcc-objc-multilib=4.9.0-3 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_2-1 - provides = gcc-ada=4.9.0-2 + depends = gcc-multilib-x32=4.9.0_3-1 + provides = gcc-ada=4.9.0-3 + provides = gcc-ada-multilib=4.9.0-3 conflicts = gcc-ada options = staticlibs options = !emptydirs @@ -83,8 +84,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_2-1 - provides = gcc-go=4.9.0-2 + depends = gcc-multilib-x32=4.9.0_3-1 + provides = gcc-go=4.9.0-3 + provides = gcc-go-multilib=4.9.0-3 conflicts = gcc-go options = staticlibs options = !emptydirs @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 110942 2014-05-10 09:33:56Z lcarlier $ +# $Id: PKGBUILD 111766 2014-05-23 22:38:36Z 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,10 +8,10 @@ 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_2 +pkgver=4.9.0_3 _pkgver=4.9 pkgrel=1 -_snapshot=4.9-20140507 +_snapshot=4.9-20140521 pkgdesc="The GNU Compiler Collection for multilib with x32 ABI support" arch=('x86_64') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -22,12 +22,9 @@ 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.9-tree-ssa-threadedge.patch) -md5sums=('47dc2b91d2876daff53c20c30164c38f' - '40cb437805e2f7a006aa0d0c3098ab0f' - '311ece7f5446d550e84e28692d2fb823') - + gcc-4.8-filename-output.patch) +md5sums=('cd3cbe93ebc7207bf65d30e3c9a74a26' + '40cb437805e2f7a006aa0d0c3098ab0f') if [ -n "${_snapshot}" ]; then _basedir=gcc-${_snapshot} @@ -61,9 +58,6 @@ prepare() { # 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=60902 - patch -p1 -i ${srcdir}/gcc-4.9-tree-ssa-threadedge.patch - mkdir ${srcdir}/gcc-build } diff --git a/gcc-4.9-tree-ssa-threadedge.patch b/gcc-4.9-tree-ssa-threadedge.patch deleted file mode 100644 index 8827427e4d60..000000000000 --- a/gcc-4.9-tree-ssa-threadedge.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- trunk/gcc/tree-ssa-threadedge.c 2014/04/23 17:53:56 209715 -+++ trunk/gcc/tree-ssa-threadedge.c 2014/04/23 18:04:46 209716 -@@ -387,7 +387,34 @@ - && (gimple_code (stmt) != GIMPLE_CALL - || gimple_call_lhs (stmt) == NULL_TREE - || TREE_CODE (gimple_call_lhs (stmt)) != SSA_NAME)) -- continue; -+ { -+ /* STMT might still have DEFS and we need to invalidate any known -+ equivalences for them. -+ -+ Consider if STMT is a GIMPLE_ASM with one or more outputs that -+ feeds a conditional inside a loop. We might derive an equivalence -+ due to the conditional. */ -+ tree op; -+ ssa_op_iter iter; -+ -+ if (backedge_seen) -+ FOR_EACH_SSA_TREE_OPERAND (op, stmt, iter, SSA_OP_DEF) -+ { -+ /* This call only invalidates equivalences created by -+ PHI nodes. This is by design to keep the cost of -+ of invalidation reasonable. */ -+ invalidate_equivalences (op, stack, src_map, dst_map); -+ -+ /* However, conditionals can imply values for real -+ operands as well. And those won't be recorded in the -+ maps. In fact, those equivalences may be recorded totally -+ outside the threading code. We can just create a new -+ temporary NULL equivalence here. */ -+ record_temporary_equivalence (op, NULL_TREE, stack); -+ } -+ -+ continue; -+ } - - /* The result of __builtin_object_size depends on all the arguments - of a phi node. Temporarily using only one edge produces invalid |