Upstream patch allows using current master again. Problem with 81512c36 reported upstream gcc.gnu.org/bugzilla/show_bug.cgi?id=87672 and fixed in bz87672.patch.

3 files changed, 72 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ed7d0a51b5b0..9ca9cd7ceafe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gcc-git
 	pkgdesc = The GNU Compiler Collection (git version)
-	pkgver = 9.0.0.r164385.7961f40be4b
-	pkgrel = 2
+	pkgver = 9.0.0.r164869.68a32e54c7f
+	pkgrel = 1
 	url = http://gcc.gnu.org
 	arch = x86_64
 	license = GPL
@@ -19,10 +19,11 @@ pkgbase = gcc-git
 	makedepends = python
 	makedepends = git
 	options = !emptydirs
-	source = git+https://gcc.gnu.org/git/gcc.git#commit=7961f40be4b4a5d9c8531e6f78ecf330411d5d9f
+	source = git+https://gcc.gnu.org/git/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
@@ -31,16 +32,17 @@ 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)
 	groups = base-devel
-	depends = gcc-libs=9.0.0.r164385.7961f40be4b-2
+	depends = gcc-libs=9.0.0.r164869.68a32e54c7f-1
 	depends = binutils>=2.28
 	depends = libmpc
 	optdepends = lib32-gcc-libs: for generating code for 32-bit ABI
-	provides = gcc-multilib=9.0.0.r164385.7961f40be4b-2
-	provides = gcc=9.0.0.r164385.7961f40be4b-2
+	provides = gcc-multilib=9.0.0.r164869.68a32e54c7f-1
+	provides = gcc=9.0.0.r164869.68a32e54c7f-1
 	conflicts = gcc
 	options = !emptydirs
 	options = staticlibs
@@ -49,47 +51,47 @@ pkgname = gcc-libs-git
 	pkgdesc = Runtime libraries shipped by GCC (git version)
 	groups = base
 	depends = glibc>=2.27
-	provides = gcc-libs-multilib=9.0.0.r164385.7961f40be4b-2
-	provides = libgo.so=9.0.0.r164385.7961f40be4b-2
-	provides = libgfortran.so=9.0.0.r164385.7961f40be4b-2
-	provides = libubsan.so=9.0.0.r164385.7961f40be4b-2
-	provides = libasan.so=9.0.0.r164385.7961f40be4b-2
-	provides = libtsan.so=9.0.0.r164385.7961f40be4b-2
-	provides = liblsan.so=9.0.0.r164385.7961f40be4b-2
-	provides = gcc-libs=9.0.0.r164385.7961f40be4b-2
+	provides = gcc-libs-multilib=9.0.0.r164869.68a32e54c7f-1
+	provides = libgo.so=9.0.0.r164869.68a32e54c7f-1
+	provides = libgfortran.so=9.0.0.r164869.68a32e54c7f-1
+	provides = libubsan.so=9.0.0.r164869.68a32e54c7f-1
+	provides = libasan.so=9.0.0.r164869.68a32e54c7f-1
+	provides = libtsan.so=9.0.0.r164869.68a32e54c7f-1
+	provides = liblsan.so=9.0.0.r164869.68a32e54c7f-1
+	provides = gcc-libs=9.0.0.r164869.68a32e54c7f-1
 	conflicts = gcc-libs
 	options = !emptydirs
 	options = !strip
 
 pkgname = gcc-fortran-git
 	pkgdesc = Fortran front-end for GCC (git version)
-	depends = gcc=9.0.0.r164385.7961f40be4b-2
-	provides = gcc-fortran-multilib=9.0.0.r164385.7961f40be4b-2
-	provides = gcc-fortran=9.0.0.r164385.7961f40be4b-2
+	depends = gcc=9.0.0.r164869.68a32e54c7f-1
+	provides = gcc-fortran-multilib=9.0.0.r164869.68a32e54c7f-1
+	provides = gcc-fortran=9.0.0.r164869.68a32e54c7f-1
 	conflicts = gcc-fortran
 
 pkgname = gcc-objc-git
 	pkgdesc = Objective-C front-end for GCC (git version)
-	depends = gcc=9.0.0.r164385.7961f40be4b-2
-	provides = gcc-objc-multilib=9.0.0.r164385.7961f40be4b-2
-	provides = gcc-objc=9.0.0.r164385.7961f40be4b-2
+	depends = gcc=9.0.0.r164869.68a32e54c7f-1
+	provides = gcc-objc-multilib=9.0.0.r164869.68a32e54c7f-1
+	provides = gcc-objc=9.0.0.r164869.68a32e54c7f-1
 	conflicts = gcc-objc
 
 pkgname = gcc-ada-git
 	pkgdesc = Ada front-end for GCC (GNAT) (git version)
-	depends = gcc=9.0.0.r164385.7961f40be4b-2
-	provides = gcc-ada-multilib=9.0.0.r164385.7961f40be4b-2
-	provides = gcc-ada=9.0.0.r164385.7961f40be4b-2
+	depends = gcc=9.0.0.r164869.68a32e54c7f-1
+	provides = gcc-ada-multilib=9.0.0.r164869.68a32e54c7f-1
+	provides = gcc-ada=9.0.0.r164869.68a32e54c7f-1
 	conflicts = gcc-ada
 	options = !emptydirs
 	options = staticlibs
 
 pkgname = gcc-go-git
 	pkgdesc = Go front-end for GCC (git version)
-	depends = gcc=9.0.0.r164385.7961f40be4b-2
+	depends = gcc=9.0.0.r164869.68a32e54c7f-1
 	provides = go=1.10.1
 	provides = gcc-go-multilib
-	provides = gcc-go=9.0.0.r164385.7961f40be4b-2
+	provides = gcc-go=9.0.0.r164869.68a32e54c7f-1
 	conflicts = go
 	conflicts = gcc-go
 
@@ -97,11 +99,11 @@ pkgname = lib32-gcc-libs-gitb
 	pkgdesc = 32-bit runtime libraries shipped by GCC (git version)
 	groups = multilib-devel
 	depends = lib32-glibc>=2.27
-	provides = libgo.so=9.0.0.r164385.7961f40be4b-2
-	provides = libgfortran.so=9.0.0.r164385.7961f40be4b-2
-	provides = libubsan.so=9.0.0.r164385.7961f40be4b-2
-	provides = libasan.so=9.0.0.r164385.7961f40be4b-2
-	provides = lib32-gcc-libs=9.0.0.r164385.7961f40be4b-2
+	provides = libgo.so=9.0.0.r164869.68a32e54c7f-1
+	provides = libgfortran.so=9.0.0.r164869.68a32e54c7f-1
+	provides = libubsan.so=9.0.0.r164869.68a32e54c7f-1
+	provides = libasan.so=9.0.0.r164869.68a32e54c7f-1
+	provides = lib32-gcc-libs=9.0.0.r164869.68a32e54c7f-1
 	conflicts = lib32-gcc-libs
 	options = !emptydirs
 	options = !strip
diff --git a/PKGBUILD b/PKGBUILD
index 8f318b86c744..8c6b3e8470f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,12 +11,12 @@
 # NOTE: libtool requires rebuilt with each new gcc version
 
 pkgname=(gcc-git gcc-libs-git gcc-fortran-git gcc-objc-git gcc-ada-git gcc-go-git lib32-gcc-libs-gitb)
-pkgver=9.0.0.r164385.7961f40be4b
+pkgver=9.0.0.r164869.68a32e54c7f
 _majorver=${pkgver:0:1}
 #this is set after pkgver() runs!  (Thanks makepkg!)
 _basever=${pkgver%%.r*}
 _islver=0.20
-pkgrel=2
+pkgrel=1
 pkgdesc='The GNU Compiler Collection (git version)'
 arch=(x86_64)
 license=(GPL LGPL FDL custom)
@@ -25,9 +25,10 @@ makedepends=(binutils libmpc gcc-ada doxygen lib32-glibc lib32-gcc-libs python g
 checkdepends=(dejagnu inetutils)
 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#commit=7961f40be4b4a5d9c8531e6f78ecf330411d5d9f
+source=(git+https://gcc.gnu.org/git/gcc.git
         http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2
-        c89 c99)
+        c89 c99
+        bz87672.patch)
 validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9  # bpiotrowski@archlinux.org
               86CFFCA918CF3AF47147588051E8B148A9999C34  # evangelos@foutrelis.com
               13975A70E63C361C73AE69EF6EEB81F8981C74C7  # richard.guenther@gmail.com
@@ -35,7 +36,8 @@ validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9  # bpiotrowski@archlinux.
 sha256sums=('SKIP'
             'b587e083eb65a8b394e833dea1744f21af3f0e413a448c17536b5549ae42a4c2'
             'de48736f6e4153f03d0a5d38ceb6c6fdb7f054e8f47ddd6af0a3dbf14f27b931'
-            '2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a')
+            '2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a'
+            '0505bf68d19b0ad7c0e615a4963e4098e2fcbe0f0b3bc6aec47a006b23b72815')
 
 _svnrev=264010
 _svnurl=svn://gcc.gnu.org/svn/gcc/branches/gcc-${_majorver}-branch
@@ -54,6 +56,9 @@ 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
new file mode 100644
index 000000000000..d8c036831f9f
--- /dev/null
+++ b/bz87672.patch
@@ -0,0 +1,30 @@
+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