Update to 12.2.0-1

2 files changed, 14 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1704ee4c5cc3..f6cf70ee73ef 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = arm-linux-gnueabihf-gcc-stage1
 	pkgdesc = The GNU Compiler Collection. Stage 1 for toolchain building (arm-linux-gnueabihf)
-	pkgver = 12.1.0
+	pkgver = 12.2.0
 	pkgrel = 1
 	url = https://gcc.gnu.org
 	arch = i686
@@ -15,19 +15,17 @@ pkgbase = arm-linux-gnueabihf-gcc-stage1
 	options = !emptydirs
 	options = !distcc
 	options = !strip
-	source = https://sourceware.org/pub/gcc/releases/gcc-12.1.0/gcc-12.1.0.tar.xz
-	source = https://sourceware.org/pub/gcc/releases/gcc-12.1.0/gcc-12.1.0.tar.xz.sig
+	source = https://sourceware.org/pub/gcc/releases/gcc-12.2.0/gcc-12.2.0.tar.xz
+	source = https://sourceware.org/pub/gcc/releases/gcc-12.2.0/gcc-12.2.0.tar.xz.sig
 	source = https://libisl.sourceforge.io/isl-0.24.tar.xz
-	source = 844a5c8ca.patch::https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=844a5c8ca768dc0cc90c1a943756610832d686a8
 	source = gcc-ada-repro.patch
 	validpgpkeys = F3691687D867B81B51CE07D9BBE43771487328A9
 	validpgpkeys = 86CFFCA918CF3AF47147588051E8B148A9999C34
 	validpgpkeys = 13975A70E63C361C73AE69EF6EEB81F8981C74C7
 	validpgpkeys = D3A93CAD751C2AF4F8C7AD516C35B99309B5FA62
-	sha256sums = 62fd634889f31c02b64af2c468f064b47ad1ca78411c45abe6ac4b5f8dd19c7b
+	sha256sums = e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
 	sha256sums = SKIP
 	sha256sums = 043105cc544f416b48736fff8caf077fb0663a717d06b1113f16e391ac99ebad
-	sha256sums = 6dc8d32e76bc6c7c1a24ae527062ec1b4f393c9f7e0e25f6ab4acc98f622a80f
 	sha256sums = 1773f5137f08ac1f48f0f7297e324d5d868d55201c03068670ee4602babdef2f
 
 pkgname = arm-linux-gnueabihf-gcc-stage1
diff --git a/PKGBUILD b/PKGBUILD
index f5eb5b141ad9..8d6c076c372b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
+# Maintainer: Vyacheslav Razykov <v.razykov@gmail.com>
 # Contributor: Alexander 'hatred' Drozdov <adrozdoff@gmail.com>
 # Contributor: toha257 <toha257@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Kevin Mihelich <kevin@archlinuxarm.org>
 # Contributor: Tavian Barnes <tavianator@tavianator.com>
-# Maintainer: Vyacheslav Razykov <v.razykov@gmail.com>
 
 _target="arm-linux-gnueabihf"
 pkgname=${_target}-gcc-stage1
-pkgver=12.1.0
+pkgver=12.2.0
 _majorver=${pkgver%%.*}
 _islver=0.24
 pkgrel=1
@@ -19,16 +19,14 @@ depends=("${_target}-binutils>=2.38-1" libmpc zlib)
 options=(!emptydirs !distcc !strip)
 source=(https://sourceware.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.xz{,.sig}
         https://libisl.sourceforge.io/isl-${_islver}.tar.xz
-        844a5c8ca.patch::'https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=844a5c8ca768dc0cc90c1a943756610832d686a8'
         gcc-ada-repro.patch)
 validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9  # bpiotrowski@archlinux.org
               86CFFCA918CF3AF47147588051E8B148A9999C34  # evangelos@foutrelis.com
               13975A70E63C361C73AE69EF6EEB81F8981C74C7  # richard.guenther@gmail.com
               D3A93CAD751C2AF4F8C7AD516C35B99309B5FA62) # Jakub Jelinek <jakub@redhat.com>
-sha256sums=('62fd634889f31c02b64af2c468f064b47ad1ca78411c45abe6ac4b5f8dd19c7b'
+sha256sums=('e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff'
             'SKIP'
             '043105cc544f416b48736fff8caf077fb0663a717d06b1113f16e391ac99ebad'
-            '6dc8d32e76bc6c7c1a24ae527062ec1b4f393c9f7e0e25f6ab4acc98f622a80f'
             '1773f5137f08ac1f48f0f7297e324d5d868d55201c03068670ee4602babdef2f')
 
 prepare() {
@@ -45,12 +43,9 @@ prepare() {
   sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
 
   # Reproducible gcc-ada
-  patch -Np0 < "$srcdir/gcc-ada-repro.patch"
-
-  # tree-optimization/105562 - avoid uninit diagnostic with better FRE
-  patch -Np1 < "$srcdir/844a5c8ca.patch"
+  patch -Np0 < "${srcdir}"/gcc-ada-repro.patch
 
-  mkdir -p "$srcdir/gcc-build"
+  mkdir -p "${srcdir}"/gcc-build
 }
 
 build() {
@@ -66,7 +61,7 @@ build() {
   CFLAGS="${CFLAGS/ -Werror=format-security/}"
   CXXFLAGS="${CXXFLAGS/ -Werror=format-security/}"
 
-  "$srcdir/gcc/configure" --prefix=/usr \
+  "${srcdir}"/gcc/configure --prefix=/usr \
       --program-prefix=${_target}- \
       --with-local-prefix=/usr/${_target} \
       --with-sysroot=/usr/${_target} \
@@ -112,12 +107,12 @@ build() {
 package() {
   cd gcc-build
 
-  make DESTDIR="$pkgdir" install-gcc install-target-libgcc
+  make DESTDIR="${pkgdir}" install-gcc install-target-libgcc
 
-  rm -rf "$pkgdir/usr/share"
+  rm -rf "${pkgdir}"/usr/share
 
   # strip it manually
-  strip "$pkgdir/usr/bin/"* 2>/dev/null || true
-  find "$pkgdir/usr/lib" -type f -exec /usr/bin/${_target}-strip \
+  strip "${pkgdir}"/usr/bin/* 2>/dev/null || true
+  find "${pkgdir}"/usr/lib -type f -exec /usr/bin/${_target}-strip \
     --strip-unneeded {} \; 2>/dev/null || true
 }