From aa03effdcf2e9aab7f28164afb735efa95a616f7 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Sat, 7 May 2022 08:51:49 +0200
Subject: [PATCH] 12.1.1-1

---
 .gitignore                 |  1 +
 gcc.spec                   | 22 +++++++++++++++-------
 gcc12-libstdc++-docs.patch |  4 ++--
 sources                    |  2 +-
 update-gcc.sh              |  2 +-
 5 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 39a26b2..03956d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,3 +71,4 @@
 /gcc-12.0.1-20220411.tar.xz
 /gcc-12.0.1-20220413.tar.xz
 /gcc-12.0.1-20220429.tar.xz
+/gcc-12.1.1-20220507.tar.xz
diff --git a/gcc.spec b/gcc.spec
index 564a3c3..049b7f4 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -1,10 +1,10 @@
-%global DATE 20220429
-%global gitrev 07f76ab820568c24917f1667cea80f1178279ac6
-%global gcc_version 12.0.1
+%global DATE 20220507
+%global gitrev fa107326a13af9a7d7aa0df28fe364db0f6fb171
+%global gcc_version 12.1.1
 %global gcc_major 12
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %%{release}, append them after %%{gcc_release} on Release: line.
-%global gcc_release 0
+%global gcc_release 1
 %global nvptx_tools_gitrev 5f6f343a302d620b0868edab376c00b15741e39e
 %global newlib_cygwin_gitrev 50e2a63b04bdd018484605fbb954fd1bd5147fa0
 %global _unpackaged_files_terminate_build 0
@@ -125,7 +125,7 @@
 Summary: Various compilers (C, C++, Objective-C, ...)
 Name: gcc
 Version: %{gcc_version}
-Release: %{gcc_release}.18%{?dist}
+Release: %{gcc_release}%{?dist}
 # libgcc, libgfortran, libgomp, libstdc++ and crtstuff have
 # GCC Runtime Exception.
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD
@@ -3225,8 +3225,16 @@ end
 %endif
 
 %changelog
-* Thu May 05 2022 Stephen Gallagher <sgallagh@redhat.com> 12.0.1-0.18
-- Fix annobin plugin conditional to build for ELN
+* Sat May  7 2022 Jakub Jelinek <jakub@redhat.com> 12.1.1-1
+- update from releases/gcc-12 branch
+  - GCC 12.1 release
+  - PRs c++/105476, libstdc++/103911, libstdc++/105441, libstdc++/105502,
+	middle-end/105376, middle-end/105461, target/102059, testsuite/105433,
+	tree-optimization/105394, tree-optimization/105437,
+	tree-optimization/105484
+
+* Thu May  5 2022 Stephen Gallagher <sgallagh@redhat.com> 12.0.1-0.18
+- fix annobin plugin conditional to build for ELN
 
 * Fri Apr 29 2022 Jakub Jelinek <jakub@redhat.com> 12.0.1-0.17
 - update from trunk and releases/gcc-12 branch
diff --git a/gcc12-libstdc++-docs.patch b/gcc12-libstdc++-docs.patch
index cdcd435..5a27a5d 100644
--- a/gcc12-libstdc++-docs.patch
+++ b/gcc12-libstdc++-docs.patch
@@ -4,7 +4,7 @@
        <a class="link" href="https://www.fsf.org" target="_top">FSF
        </a>
      </p><p>
-+      Release 12.0.1
++      Release 12.1.1
 +    </p><p>
        Permission is granted to copy, distribute and/or modify this
        document under the terms of the GNU Free Documentation
@@ -17,7 +17,7 @@
  </p><p>
 -  The API documentation, rendered into HTML, can be viewed online
 +  The API documentation, rendered into HTML, can be viewed locally
-+  <a class="link" href="api/index.html" target="_top">for the 12.0.1 release</a>,
++  <a class="link" href="api/index.html" target="_top">for the 12.1.1 release</a>,
 +  online
    <a class="link" href="http://gcc.gnu.org/onlinedocs/" target="_top">for each GCC release</a>
    and
diff --git a/sources b/sources
index 6e51bea..3588ec2 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (gcc-12.0.1-20220429.tar.xz) = ad1543844e40fb0d703bc529f2d2b776a09aadba93f85b0a78296ff050e2e9c710cbbf50bebe37bc26426f7abf2edd0f380de42e1defb1fb5706bd204379c499
+SHA512 (gcc-12.1.1-20220507.tar.xz) = 6c978a58820ad24b2aeb03d579782de1b0e76ade509b6f2e38ebd773565d1b9afd968c99b26db399416e7aa8bdd068631bc3d3b7eff3d41e734ca3764337b8e2
 SHA512 (isl-0.18.tar.bz2) = 85d0b40f4dbf14cb99d17aa07048cdcab2dc3eb527d2fbb1e84c41b2de5f351025370e57448b63b2b8a8cf8a0843a089c3263f9baee1542d5c2e1cb37ed39d94
 SHA512 (newlib-cygwin-50e2a63b04bdd018484605fbb954fd1bd5147fa0.tar.xz) = 002a48a7b689a81abbf16161bcaec001a842e67dfbe372e9e109092703bfc666675f16198f60ca429370e8850d564547dc505df81bc3aaca4ce6defbc014ad6c
 SHA512 (nvptx-tools-5f6f343a302d620b0868edab376c00b15741e39e.tar.xz) = f6d10db94fa1570ae0f94df073fa3c73c8e5ee16d59070b53d94f7db0de8a031bc44d7f3f1852533da04b625ce758e022263855ed43cfc6867e0708d001e53c7
diff --git a/update-gcc.sh b/update-gcc.sh
index b9e8330..5b0572c 100755
--- a/update-gcc.sh
+++ b/update-gcc.sh
@@ -3,5 +3,5 @@
 git clone --depth 1 git://gcc.gnu.org/git/gcc.git gcc-dir.tmp
 git --git-dir=gcc-dir.tmp/.git fetch --depth 1 origin $1
 d=`date --iso | sed 's/-//g'`
-git --git-dir=gcc-dir.tmp/.git archive --prefix=gcc-12.0.1-$d/ $1 | xz -9e > gcc-12.0.1-$d.tar.xz
+git --git-dir=gcc-dir.tmp/.git archive --prefix=gcc-12.1.1-$d/ $1 | xz -9e > gcc-12.1.1-$d.tar.xz
 rm -rf gcc-dir.tmp