Bump to 9.2.0-4

4 files changed, 12 insertions, 128 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2a9ded61b7bb..2331b3dd4837 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = arm-linux-gnueabihf-gcc-stage1
 	pkgdesc = The GNU Compiler Collection. Stage 1 for toolchain building (arm-linux-gnueabihf)
-	pkgver = 9.1.0
-	pkgrel = 2
+	pkgver = 9.2.0
+	pkgrel = 4
 	url = https://gcc.gnu.org
 	arch = i686
 	arch = x86_64
@@ -9,26 +9,22 @@ pkgbase = arm-linux-gnueabihf-gcc-stage1
 	license = LGPL
 	license = FDL
 	license = custom
-	depends = arm-linux-gnueabihf-binutils>=2.32-2
+	depends = arm-linux-gnueabihf-binutils>=2.33.1-2.1
 	depends = libmpc
 	depends = zlib
 	options = !emptydirs
 	options = !distcc
 	options = !strip
-	source = https://ftp.gnu.org/gnu/gcc/gcc-9.1.0/gcc-9.1.0.tar.xz
-	source = https://ftp.gnu.org/gnu/gcc/gcc-9.1.0/gcc-9.1.0.tar.xz.sig
+	source = https://ftp.gnu.org/gnu/gcc/gcc-9.2.0/gcc-9.2.0.tar.xz
+	source = https://ftp.gnu.org/gnu/gcc/gcc-9.2.0/gcc-9.2.0.tar.xz.sig
 	source = http://isl.gforge.inria.fr/isl-0.21.tar.bz2
-	source = bz90397.patch
-	source = bz90949.patch
 	validpgpkeys = F3691687D867B81B51CE07D9BBE43771487328A9
 	validpgpkeys = 86CFFCA918CF3AF47147588051E8B148A9999C34
 	validpgpkeys = 13975A70E63C361C73AE69EF6EEB81F8981C74C7
 	validpgpkeys = 33C235A34C46AA3FFB293709A328C3A2C3C45C06
-	sha256sums = 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+	sha256sums = ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
 	sha256sums = SKIP
 	sha256sums = d18ca11f8ad1a39ab6d03d3dcb3365ab416720fcb65b42d69f34f51bf0a0e859
-	sha256sums = cc20d05bcc6cb35bf0944b391f0b0380af375f2a8a03ce1cd67835884bc41fac
-	sha256sums = c860819e730faf1621e1286ebe3a0179df6e25182b81a9ca0a3db02633982a14
 
 pkgname = arm-linux-gnueabihf-gcc-stage1
 
diff --git a/PKGBUILD b/PKGBUILD
index 84b4464b8cb4..6e8ef308e381 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,30 +6,26 @@
 
 _target="arm-linux-gnueabihf"
 pkgname=${_target}-gcc-stage1
-pkgver=9.1.0
+pkgver=9.2.0
 _majorver=${pkgver:0:1}
 _islver=0.21
-pkgrel=2
+pkgrel=4
 pkgdesc="The GNU Compiler Collection. Stage 1 for toolchain building (${_target})"
 arch=(i686 x86_64)
 license=(GPL LGPL FDL custom)
 url='https://gcc.gnu.org'
-depends=("${_target}-binutils>=2.32-2" libmpc zlib)
+depends=("${_target}-binutils>=2.33.1-2.1" libmpc zlib)
 options=(!emptydirs !distcc !strip)
 #source=(https://sources.archlinux.org/other/gcc/gcc-${pkgver/+/-}.tar.xz{,.sig}
 source=(https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz{,.sig}
-        http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2
-        bz90397.patch
-        bz90949.patch)
+        http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2)
 validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9  # bpiotrowski@archlinux.org
               86CFFCA918CF3AF47147588051E8B148A9999C34  # evangelos@foutrelis.com
               13975A70E63C361C73AE69EF6EEB81F8981C74C7  # richard.guenther@gmail.com
               33C235A34C46AA3FFB293709A328C3A2C3C45C06) # Jakub Jelinek <jakub@redhat.com>
-sha256sums=('79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0'
+sha256sums=('ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206'
             'SKIP'
-            'd18ca11f8ad1a39ab6d03d3dcb3365ab416720fcb65b42d69f34f51bf0a0e859'
-            'cc20d05bcc6cb35bf0944b391f0b0380af375f2a8a03ce1cd67835884bc41fac'
-            'c860819e730faf1621e1286ebe3a0179df6e25182b81a9ca0a3db02633982a14')
+            'd18ca11f8ad1a39ab6d03d3dcb3365ab416720fcb65b42d69f34f51bf0a0e859')
 
 _svnrev=264010
 _svnurl=svn://gcc.gnu.org/svn/gcc/branches/gcc-${_majorver}-branch
@@ -39,12 +35,6 @@ prepare() {
   [[ ! -d gcc ]] && ln -s gcc-${pkgver/+/-} gcc
   cd gcc
 
-  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90397
-  patch -p0 -i "$srcdir/bz90397.patch"
-
-  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90949
-  patch -p0 -i "$srcdir/bz90949.patch"
-
   # link isl for in-tree build
   ln -s ../isl-${_islver} isl
 
diff --git a/bz90397.patch b/bz90397.patch
deleted file mode 100644
index d41252af50e4..000000000000
--- a/bz90397.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: libstdc++-v3/include/std/variant
-===================================================================
---- libstdc++-v3/include/std/variant	(revision 271082)
-+++ libstdc++-v3/include/std/variant	(revision 271083)
-@@ -1556,7 +1556,8 @@
- #endif
- 
-       template<size_t _Np, typename _Vp>
--	friend constexpr decltype(auto) __detail::__variant::__get(_Vp&& __v);
-+	friend constexpr decltype(auto)
-+	__detail::__variant::__get(_Vp&& __v) noexcept;
- 
-       template<typename _Vp>
- 	friend void* __detail::__variant::__get_storage(_Vp&& __v);
diff --git a/bz90949.patch b/bz90949.patch
deleted file mode 100644
index e545844c5d7e..000000000000
--- a/bz90949.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Index: gcc/testsuite/gcc.c-torture/execute/pr90949.c
-===================================================================
---- gcc/testsuite/gcc.c-torture/execute/pr90949.c	(nonexistent)
-+++ gcc/testsuite/gcc.c-torture/execute/pr90949.c	(revision 272555)
-@@ -0,0 +1,42 @@
-+void __attribute__ ((noipa, noinline)) my_puts (const char *str) { }
-+
-+void __attribute__ ((noipa, noinline)) my_free (void *p) { }
-+
-+
-+struct Node
-+{
-+  struct Node *child;
-+};
-+
-+struct Node space[2] = { };
-+
-+struct Node * __attribute__ ((noipa, noinline)) my_malloc (int bytes)
-+{
-+  return &space[0];
-+}
-+
-+void
-+walk (struct Node *module, int cleanup)
-+{
-+  if (module == 0)
-+    {
-+      return;
-+    }
-+  if (!cleanup)
-+    {
-+      my_puts ("No cleanup");
-+    }
-+  walk (module->child, cleanup);
-+  if (cleanup)
-+    {
-+      my_free (module);
-+    }
-+}
-+
-+int
-+main ()
-+{
-+  struct Node *node = my_malloc (sizeof (struct Node));
-+  node->child = 0;
-+  walk (node, 1);
-+}
-Index: gcc/tree-ssa-copy.c
-===================================================================
---- gcc/tree-ssa-copy.c	(revision 272554)
-+++ gcc/tree-ssa-copy.c	(revision 272555)
-@@ -545,13 +545,12 @@
- 	      duplicate_ssa_name_ptr_info (copy_of[i].value,
- 					   SSA_NAME_PTR_INFO (var));
- 	      /* Points-to information is cfg insensitive,
--		 but alignment info might be cfg sensitive, if it
--		 e.g. is derived from VRP derived non-zero bits.
--		 So, do not copy alignment info if the two SSA_NAMEs
--		 aren't defined in the same basic block.  */
-+		 but [E]VRP might record context sensitive alignment
-+		 info, non-nullness, etc.  So reset context sensitive
-+		 info if the two SSA_NAMEs aren't defined in the same
-+		 basic block.  */
- 	      if (var_bb != copy_of_bb)
--		mark_ptr_info_alignment_unknown
--				(SSA_NAME_PTR_INFO (copy_of[i].value));
-+		reset_flow_sensitive_info (copy_of[i].value);
- 	    }
- 	  else if (!POINTER_TYPE_P (TREE_TYPE (var))
- 		   && SSA_NAME_RANGE_INFO (var)
-Index: gcc/tree-ssanames.c
-===================================================================
---- gcc/tree-ssanames.c	(revision 272554)
-+++ gcc/tree-ssanames.c	(revision 272555)
-@@ -820,7 +820,12 @@
-     {
-       /* points-to info is not flow-sensitive.  */
-       if (SSA_NAME_PTR_INFO (name))
--	mark_ptr_info_alignment_unknown (SSA_NAME_PTR_INFO (name));
-+	{
-+	  /* [E]VRP can derive context sensitive alignment info and
-+	     non-nullness properties.  We must reset both.  */
-+	  mark_ptr_info_alignment_unknown (SSA_NAME_PTR_INFO (name));
-+	  SSA_NAME_PTR_INFO (name)->pt.null = 1;
-+	}
-     }
-   else
-     SSA_NAME_RANGE_INFO (name) = NULL;