diff options
author | James P. Harvey | 2018-12-16 19:50:20 -0500 |
---|---|---|
committer | James P. Harvey | 2018-12-16 19:50:20 -0500 |
commit | 64f6b20115c632cb4be39801b153d3c15df8ec01 (patch) | |
tree | eaec0dcbc03e23208329e3ace89a873c5c8546b2 | |
parent | b167dc68eaadd459ed6fd75489a0a4e99de269d2 (diff) | |
download | aur-64f6b20115c632cb4be39801b153d3c15df8ec01.tar.gz |
Removed bz87672 patch, because upstream merged it.
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | PKGBUILD | 9 | ||||
-rw-r--r-- | bz87672.patch | 30 |
3 files changed, 2 insertions, 39 deletions
@@ -23,7 +23,6 @@ pkgbase = gcc-git source = http://isl.gforge.inria.fr/isl-0.20.tar.bz2 source = c89 source = c99 - source = bz87672.patch validpgpkeys = F3691687D867B81B51CE07D9BBE43771487328A9 validpgpkeys = 86CFFCA918CF3AF47147588051E8B148A9999C34 validpgpkeys = 13975A70E63C361C73AE69EF6EEB81F8981C74C7 @@ -32,7 +31,6 @@ pkgbase = gcc-git sha256sums = b587e083eb65a8b394e833dea1744f21af3f0e413a448c17536b5549ae42a4c2 sha256sums = de48736f6e4153f03d0a5d38ceb6c6fdb7f054e8f47ddd6af0a3dbf14f27b931 sha256sums = 2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a - sha256sums = 0505bf68d19b0ad7c0e615a4963e4098e2fcbe0f0b3bc6aec47a006b23b72815 pkgname = gcc-git pkgdesc = The GNU Compiler Collection - C and C++ frontends (git version) @@ -27,8 +27,7 @@ options=(!emptydirs) #source=(https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz{,.sig} source=(git+https://gcc.gnu.org/git/gcc.git http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2 - c89 c99 - bz87672.patch) + c89 c99) validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9 # bpiotrowski@archlinux.org 86CFFCA918CF3AF47147588051E8B148A9999C34 # evangelos@foutrelis.com 13975A70E63C361C73AE69EF6EEB81F8981C74C7 # richard.guenther@gmail.com @@ -36,8 +35,7 @@ validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9 # bpiotrowski@archlinux. sha256sums=('SKIP' 'b587e083eb65a8b394e833dea1744f21af3f0e413a448c17536b5549ae42a4c2' 'de48736f6e4153f03d0a5d38ceb6c6fdb7f054e8f47ddd6af0a3dbf14f27b931' - '2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a' - '0505bf68d19b0ad7c0e615a4963e4098e2fcbe0f0b3bc6aec47a006b23b72815') + '2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a') _svnrev=264010 _svnurl=svn://gcc.gnu.org/svn/gcc/branches/gcc-${_majorver}-branch @@ -56,9 +54,6 @@ prepare() { #[[ ! -d gcc ]] && ln -s gcc-${pkgver/+/-} gcc cd gcc - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87672 - patch -p0 -i "$srcdir/bz87672.patch" - # link isl for in-tree build ln -s ../isl-${_islver} isl diff --git a/bz87672.patch b/bz87672.patch deleted file mode 100644 index d8c036831f9f..000000000000 --- a/bz87672.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: gcc/gimple-fold.c -=================================================================== ---- gcc/gimple-fold.c (revision 265240) -+++ gcc/gimple-fold.c (working copy) -@@ -2715,6 +2715,7 @@ gimple_fold_builtin_stxcpy_chk (gimple_stmt_iterat - return false; - - gimple_seq stmts = NULL; -+ len = force_gimple_operand (len, &stmts, true, NULL_TREE); - len = gimple_convert (&stmts, loc, size_type_node, len); - len = gimple_build (&stmts, loc, PLUS_EXPR, size_type_node, len, - build_int_cst (size_type_node, 1)); -Index: gcc/tree-ssa-strlen.c -=================================================================== ---- gcc/tree-ssa-strlen.c (revision 265240) -+++ gcc/tree-ssa-strlen.c (working copy) -@@ -2602,6 +2602,13 @@ handle_builtin_strcat (enum built_in_function bcod - len = force_gimple_operand_gsi (gsi, len, true, NULL_TREE, true, - GSI_SAME_STMT); - } -+ if (objsz) -+ { -+ objsz = fold_build2_loc (loc, MINUS_EXPR, TREE_TYPE (objsz), -+ objsz, unshare_expr (dstlen)); -+ objsz = force_gimple_operand_gsi (gsi, objsz, true, NULL_TREE, true, -+ GSI_SAME_STMT); -+ } - if (endptr) - dst = fold_convert_loc (loc, TREE_TYPE (dst), unshare_expr (endptr)); - else |