From 36d3fc0f19aad197cfdfa1873052b9fae69527f3 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 21 Jul 2022 10:49:15 +0100
Subject: [PATCH] Rebase to Fedora Rawhide

  resolves: rhbz#2080170
---
 .gitignore                                           |  1 +
 ...ibgomp-Don-t-hard-code-MS-printf-attributes.patch |  6 +++---
 mingw-gcc-config.patch                               | 12 ++++++------
 mingw-gcc.spec                                       | 12 ++++++++----
 sources                                              |  2 +-
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 104683f..34c6d83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,4 @@ gcc-4.5.1.tar.bz2
 /gcc-11.2.1-20211019.tar.xz
 /gcc-12.0.1-20220308.tar.xz
 /gcc-12.0.1-20220413.tar.xz
+/gcc-12.1.1-20220507.tar.xz
diff --git a/0020-libgomp-Don-t-hard-code-MS-printf-attributes.patch b/0020-libgomp-Don-t-hard-code-MS-printf-attributes.patch
index 5b75b2b..af889b6 100644
--- a/0020-libgomp-Don-t-hard-code-MS-printf-attributes.patch
+++ b/0020-libgomp-Don-t-hard-code-MS-printf-attributes.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference gcc-12.0.1-20220308/libgomp/libgomp.h gcc-12.0.1-20220308-new/libgomp/libgomp.h
---- gcc-12.0.1-20220308/libgomp/libgomp.h	2022-03-08 12:23:45.000000000 +0100
-+++ gcc-12.0.1-20220308-new/libgomp/libgomp.h	2022-03-11 16:00:28.480133277 +0100
+diff -rupN --no-dereference gcc-12.1.1-20220507/libgomp/libgomp.h gcc-12.1.1-20220507-new/libgomp/libgomp.h
+--- gcc-12.1.1-20220507/libgomp/libgomp.h	2022-05-07 08:37:39.000000000 +0200
++++ gcc-12.1.1-20220507-new/libgomp/libgomp.h	2022-05-09 22:50:23.568758015 +0200
 @@ -69,6 +69,13 @@
  # endif
  #endif
diff --git a/mingw-gcc-config.patch b/mingw-gcc-config.patch
index 5558740..9fed524 100644
--- a/mingw-gcc-config.patch
+++ b/mingw-gcc-config.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference gcc-12.0.1-20220308/config/intdiv0.m4 gcc-12.0.1-20220308-new/config/intdiv0.m4
---- gcc-12.0.1-20220308/config/intdiv0.m4	2022-03-08 12:23:45.000000000 +0100
-+++ gcc-12.0.1-20220308-new/config/intdiv0.m4	2022-03-11 16:00:24.564943437 +0100
+diff -rupN --no-dereference gcc-12.1.1-20220507/config/intdiv0.m4 gcc-12.1.1-20220507-new/config/intdiv0.m4
+--- gcc-12.1.1-20220507/config/intdiv0.m4	2022-05-07 08:37:39.000000000 +0200
++++ gcc-12.1.1-20220507-new/config/intdiv0.m4	2022-05-09 22:50:19.709701677 +0200
 @@ -31,10 +31,10 @@ sigfpe_handler (sig) int sig;
    exit (sig != SIGFPE);
  }
@@ -16,9 +16,9 @@ diff -rupN --no-dereference gcc-12.0.1-20220308/config/intdiv0.m4 gcc-12.0.1-202
  
  int main ()
  {
-diff -rupN --no-dereference gcc-12.0.1-20220308/libiberty/acinclude.m4 gcc-12.0.1-20220308-new/libiberty/acinclude.m4
---- gcc-12.0.1-20220308/libiberty/acinclude.m4	2022-03-08 12:23:45.000000000 +0100
-+++ gcc-12.0.1-20220308-new/libiberty/acinclude.m4	2022-03-11 16:00:24.564943437 +0100
+diff -rupN --no-dereference gcc-12.1.1-20220507/libiberty/acinclude.m4 gcc-12.1.1-20220507-new/libiberty/acinclude.m4
+--- gcc-12.1.1-20220507/libiberty/acinclude.m4	2022-05-07 08:37:39.000000000 +0200
++++ gcc-12.1.1-20220507-new/libiberty/acinclude.m4	2022-05-09 22:50:19.709701677 +0200
 @@ -157,7 +157,7 @@ if test $ac_cv_os_cray = yes; then
  fi
  
diff --git a/mingw-gcc.spec b/mingw-gcc.spec
index 396647a..6fadc53 100644
--- a/mingw-gcc.spec
+++ b/mingw-gcc.spec
@@ -18,14 +18,14 @@
 # Run the testsuite
 %global enable_tests 0
 
-%global DATE 20220413
-%global GITREV 33917d2d6edc9112702294db6ab14b580a8d7a97
-%global gcc_version 12.0.1
+%global DATE 20220507
+%global GITREV fa107326a13af9a7d7aa0df28fe364db0f6fb171
+%global gcc_version 12.1.1
 %global gcc_major 12
 
 Name:           mingw-gcc
 Version:        %{gcc_version}
-Release:        11.2%{?dist}
+Release:        1%{?dist}
 Summary:        MinGW Windows cross-compiler (GCC) for C
 
 License:        GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions
@@ -902,6 +902,10 @@ ln -sf %{ucrt64_bindir}/libssp-0.dll %{buildroot}%{ucrt64_libdir}/libssp.dll.a
 
 
 %changelog
+* Thu Jul 21 2022 Richard W.M. Jones <rjones@redhat.com> - 12.1.1-1
+- Rebase to Fedora Rawhide
+  resolves: rhbz#2080170
+
 * Wed Jul 20 2022 Richard W.M. Jones <rjones@redhat.com> - 12.0.1-11.2
 - Bump release and rebuild
   resolves: rhbz#2096010
diff --git a/sources b/sources
index 3315288..2774611 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gcc-12.0.1-20220413.tar.xz) = 6500348f3f4e22f0ddc6ac332a1e6f64eb2684772c67401ddd98c96aabc1ce665cd088161c5878cfc24defa240f587af962ac38d9cbe94044261239be63dc47a
+SHA512 (gcc-12.1.1-20220507.tar.xz) = 6c978a58820ad24b2aeb03d579782de1b0e76ade509b6f2e38ebd773565d1b9afd968c99b26db399416e7aa8bdd068631bc3d3b7eff3d41e734ca3764337b8e2