From 3e14b95280f5d98c32efbdf7ea6c1ce3f72ed050 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Sun, 5 Dec 2021 11:30:07 +0100
Subject: [PATCH] Revert target triplets for gcc/binutils

---
 binutils/0100-binutils-2.37-msys2.patch | 2 +-
 binutils/PKGBUILD                       | 4 ++--
 gcc/0950-11.2.0-configure-msys2.patch   | 2 +-
 gcc/PKGBUILD                            | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/binutils/0100-binutils-2.37-msys2.patch b/binutils/0100-binutils-2.37-msys2.patch
index 3e7ce1cd..656f88dd 100644
--- a/binutils/0100-binutils-2.37-msys2.patch
+++ b/binutils/0100-binutils-2.37-msys2.patch
@@ -544,7 +544,7 @@ diff -Naur binutils-2.37-orig/config.guess binutils-2.37/config.guess
  	echo x86_64-pc-cygwin
  	exit ;;
 +    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
-+	echo x86_64-pc-msys
++	echo x86_64-unknown-msys
 +	exit ;;
      prep*:SunOS:5.*:*)
  	echo powerpcle-unknown-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
diff --git a/binutils/PKGBUILD b/binutils/PKGBUILD
index 05bb7632..6907f5d2 100644
--- a/binutils/PKGBUILD
+++ b/binutils/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=binutils
 pkgver=2.37
-pkgrel=1
+pkgrel=2
 pkgdesc="A set of programs to assemble and manipulate binary and object files"
 arch=('i686' 'x86_64')
 url="https://www.gnu.org/software/binutils/"
@@ -21,7 +21,7 @@ source=(https://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.xz{,.sig}
 sha256sums=('820d9724f020a3e69cb337893a0b63c2db161dadcb0e06fc11dc29eb1e84a32c'
             'SKIP'
             '4e8ac055df61b1b5d6ae29dc87e1154737c2e87c7b244b44866702cabf1a5d18'
-            '5d95abdc84c51e5d13019b6e4b95860ca91ba7ebb4bb0f375b9ea82fcc0bd71e'
+            '4c5b251beb036814992bc1b6538b5ff49259e073b7cc982e036c76050a866a51'
             '29c1aab1eb96bc188c1ad29422f611e7c946cca901aed29ee2d0b9e861c75a23'
             '57478b9971183d430c93701b1d533e3724dab5334bbf44db924777e4a93c1063'
             'ce3cda1ad8ff8379869142226178b5f7fdb5b93f85a43d3437475ea0314dbf1b')
diff --git a/gcc/0950-11.2.0-configure-msys2.patch b/gcc/0950-11.2.0-configure-msys2.patch
index 88ac0fb7..21727be1 100644
--- a/gcc/0950-11.2.0-configure-msys2.patch
+++ b/gcc/0950-11.2.0-configure-msys2.patch
@@ -130,7 +130,7 @@ diff -Naur gcc-11.2.0-orig/config.guess gcc-11.2.0/config.guess
  	echo x86_64-pc-cygwin
  	exit ;;
 +    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
-+	echo x86_64-pc-msys
++	echo x86_64-unknown-msys
 +	exit ;;
      prep*:SunOS:5.*:*)
  	echo powerpcle-unknown-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
diff --git a/gcc/PKGBUILD b/gcc/PKGBUILD
index 2510c721..0b6da732 100644
--- a/gcc/PKGBUILD
+++ b/gcc/PKGBUILD
@@ -8,7 +8,7 @@
 pkgbase=gcc
 pkgname=('gcc' 'gcc-libs' 'gcc-fortran')
 pkgver=11.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64')
 groups=('msys2-devel')
@@ -55,7 +55,7 @@ sha256sums=('d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b'
             'd92ed176f950b2588292384bed0c2cf6dcc4fb58147cf341f6d40ba26d4f85fb'
             '282fd27bed2295c09768d9819d8c1f4bdfc4472e7a654cc51b45f8a2733aa07d'
             'cf2a9deb7ea1bd63a9ddb8db9274251be92cee0e49d62488dfa37a567ee7064b'
-            'a3d5d36c24ca9074f344e2115e169633d106ffce6d157cc8a929028ac4621352'
+            '7011c9e66fcb2d6ffc970763f4a15794babb62e275823c770f3cf0f4fbe7d2fb'
             'c949d1a10231c5f9cecf3f09319afb290f66fe012e545fd70cd7bdfadddfcf56'
             '593f41e1f1265171ecc5377226dc76a3a4d92d7c3cc4f0b0afe6c4a6578cc5e3')