diff --git a/.fmf/version b/.fmf/version
deleted file mode 100644
index d00491f..0000000
--- a/.fmf/version
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/.gitignore b/.gitignore
index b67c902..33d6e59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,32 +1,84 @@
-/isl-0.24.tar.bz2
-/nvptx-tools-87ce9dc5999e5fca2e1d3478a30888d9864c9804.tar.xz
-/newlib-cygwin-2e4db338ac125579d555aeee516e48588a628a16.tar.xz
-/gcc-15.0.1-20250201.tar.xz
-/gcc-15.0.1-20250204.tar.xz
-/gcc-15.0.1-20250225.tar.xz
-/gcc-15.0.1-20250301.tar.xz
-/gcc-15.0.1-20250313.tar.xz
-/gcc-15.0.1-20250329.tar.xz
-/gcc-15.0.1-20250410.tar.xz
-/newlib-cygwin-d35cc82b5ec15bb8a5fe0fe11e183d1887992e99.tar.xz
-/gcc-15.0.1-20250417.tar.xz
-/gcc-15.0.1-20250418.tar.xz
-/gcc-15.1.1-20250425.tar.xz
-/gcc-15.1.1-20250521.tar.xz
-/gcc-15.1.1-20250707.tar.xz
-/gcc-15.1.1-20250718.tar.xz
-/gcc-15.1.1-20250719.tar.xz
-/gcc-15.2.1-20250808.tar.xz
-/nvptx-tools-a0c1fff6534a4df9fb17937c3c4a4b1071212029.tar.xz
-/gcc-15.2.1-20250924.tar.xz
-/gcc-15.2.1-20251022.tar.xz
-/gcc-15.2.1-20251111.tar.xz
-/gcc-15.2.1-20251211.tar.xz
-/gcc-16.0.0-20251218.tar.xz
-/gcc-16.0.0-20251220.tar.xz
-/gcc-16.0.0-20260103.tar.xz
-/gcc-16.0.0-20260110.tar.xz
-/gcc-16.0.0-20260112.tar.xz
-/gcc-16.0.1-20260112.tar.xz
-/gcc-16.0.1-20260113.tar.xz
-/gcc-16.0.1-20260115.tar.xz
+/gcc-7.0.1-20170126.tar.bz2
+/nvptx-newlib-aadc8eb0ec43b7cd0dd2dfb484bae63c8b05ef24.tar.bz2
+/nvptx-tools-c28050f60193b3b95a18866a96f03334e874e78f.tar.bz2
+/gcc-7.0.1-20170128.tar.bz2
+/gcc-7.0.1-20170131.tar.bz2
+/gcc-7.0.1-20170201.tar.bz2
+/gcc-7.0.1-20170204.tar.bz2
+/gcc-7.0.1-20170209.tar.bz2
+/gcc-7.0.1-20170211.tar.bz2
+/gcc-7.0.1-20170219.tar.bz2
+/gcc-7.0.1-20170225.tar.bz2
+/gcc-7.0.1-20170308.tar.bz2
+/gcc-7.0.1-20170309.tar.bz2
+/gcc-7.0.1-20170327.tar.bz2
+/gcc-7.0.1-20170410.tar.bz2
+/gcc-7.0.1-20170421.tar.bz2
+/gcc-7.0.1-20170425.tar.bz2
+/gcc-7.1.1-20170503.tar.bz2
+/gcc-7.1.1-20170526.tar.bz2
+/gcc-7.1.1-20170622.tar.bz2
+/gcc-7.1.1-20170708.tar.bz2
+/gcc-7.1.1-20170711.tar.bz2
+/gcc-7.1.1-20170718.tar.bz2
+/gcc-7.1.1-20170802.tar.bz2
+/gcc-7.2.1-20170829.tar.bz2
+/gcc-7.2.1-20170915.tar.bz2
+/gcc-7.2.1-20180101.tar.bz2
+/gcc-7.2.1-20180104.tar.bz2
+/gcc-7.2.1-20180117.tar.bz2
+/gcc-7.3.1-20180125.tar.bz2
+/gcc-8.0.1-20180127.tar.xz
+/nvptx-newlib-aadc8eb0ec43b7cd0dd2dfb484bae63c8b05ef24.tar.xz
+/nvptx-tools-c28050f60193b3b95a18866a96f03334e874e78f.tar.xz
+/gcc-8.0.1-20180830.tar.xz
+/gcc-8.0.1-20180130.tar.xz
+/gcc-8.0.1-20180131.tar.xz
+/gcc-8.0.1-20180207.tar.xz
+/gcc-8.0.1-20180210.tar.xz
+/gcc-8.0.1-20180218.tar.xz
+/gcc-8.0.1-20180220.tar.xz
+/gcc-8.0.1-20180222.tar.xz
+/gcc-8.0.1-20180310.tar.xz
+/gcc-8.0.1-20180312.tar.xz
+/gcc-8.0.1-20180317.tar.xz
+/gcc-8.0.1-20180324.tar.xz
+/gcc-8.0.1-20180410.tar.xz
+/gcc-8.0.1-20180424.tar.xz
+/gcc-8.0.1-20180425.tar.xz
+/gcc-8.1.1-20180502.tar.xz
+/gcc-8.1.1-20180620.tar.xz
+/gcc-8.1.1-20180626.tar.xz
+/gcc-8.1.1-20180712.tar.xz
+/gcc-8.2.1-20180726.tar.xz
+/gcc-8.2.1-20180801.tar.xz
+/gcc-8.2.1-20180905.tar.xz
+/gcc-8.2.1-20181011.tar.xz
+/gcc-8.2.1-20181105.tar.xz
+/gcc-8.2.1-20181215.tar.xz
+/gcc-8.2.1-20190109.tar.xz
+/gcc-9.0.0-20190119.tar.xz
+/gcc-9.0.0-20190121.tar.xz
+/gcc-9.0.1-20190123.tar.xz
+/gcc-9.0.1-20190129.tar.xz
+/gcc-9.0.1-20190203.tar.xz
+/gcc-9.0.1-20190209.tar.xz
+/gcc-9.0.1-20190215.tar.xz
+/gcc-9.0.1-20190219.tar.xz
+/gcc-9.0.1-20190221.tar.xz
+/gcc-9.0.1-20190227.tar.xz
+/gcc-9.0.1-20190309.tar.xz
+/gcc-9.0.1-20190312.tar.xz
+/gcc-9.0.1-20190320.tar.xz
+/gcc-9.0.1-20190328.tar.xz
+/gcc-9.0.1-20190415.tar.xz
+/gcc-9.0.1-20190418.tar.xz
+/gcc-9.0.1-20190426.tar.xz
+/gcc-9.0.1-20190430.tar.xz
+/gcc-9.1.1-20190503.tar.xz
+/gcc-9.1.1-20190605.tar.xz
+/gcc-9.2.1-20190827.tar.xz
+/gcc-9.2.1-20191120.tar.xz
+/gcc-9.2.1-20200123.tar.xz
+/gcc-9.3.1-20200317.tar.xz
+/gcc-9.3.1-20200408.tar.xz
diff --git a/gating.yaml b/gating.yaml
deleted file mode 100644
index cb47dc6..0000000
--- a/gating.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_stable
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-qe.koji-build.scratch-build.validation}
---- !Policy
-product_versions:
-  - rhel-9
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1-gating.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1-gating-p9.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-qe.koji-build.scratch-build.validation}
diff --git a/gcc.spec b/gcc.spec
index 71e5d1d..71c6c10 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -1,39 +1,21 @@
-%global DATE 20260115
-%global gitrev 1a9a51aca25eaad91d80869c43859274fe5e1096
-%global gcc_version 16.0.1
-%global gcc_major 16
+%global DATE 20200408
+%global gitrev 3535aa1f5e6c9b2de6a60d84460b8c5945a77ab4
+%global gcc_version 9.3.1
+%global gcc_major 9
 # 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 nvptx_tools_gitrev a0c1fff6534a4df9fb17937c3c4a4b1071212029
-%global newlib_cygwin_gitrev d35cc82b5ec15bb8a5fe0fe11e183d1887992e99
+%global gcc_release 2
+%global nvptx_tools_gitrev c28050f60193b3b95a18866a96f03334e874e78f
+%global nvptx_newlib_gitrev aadc8eb0ec43b7cd0dd2dfb484bae63c8b05ef24
 %global _unpackaged_files_terminate_build 0
-%if 0%{?fedora:1}
 %global _performance_build 1
 # Hardening slows the compiler way too much.
 %undefine _hardened_build
-%endif
-%undefine _auto_set_build_flags
 %if 0%{?fedora} > 27 || 0%{?rhel} > 7
 # Until annobin is fixed (#1519165).
 %undefine _annotated_build
 %endif
-# Strip will fail on nvptx-none *.a archives and the brp-* scripts will
-# fail randomly depending on what is stripped last.
-%if 0%{?__brp_strip_static_archive:1}
-%global __brp_strip_static_archive %{__brp_strip_static_archive} || :
-%endif
-%if 0%{?__brp_strip_lto:1}
-%global __brp_strip_lto %{__brp_strip_lto} || :
-%endif
-%if 0%{?rhel} > 0
-%define bugurl https://issues.redhat.com
-%else
-%define bugurl https://bugzilla.redhat.com/bugzilla
-%endif
-%{!?dist_bug_report_url: %global dist_bug_report_url %bugurl}
-
-%if 0%{?fedora} < 32 && 0%{?rhel} < 8
+%if 0%{?fedora} < 32
 %global multilib_64_archs sparc64 ppc64 ppc64p7 s390x x86_64
 %else
 %global multilib_64_archs sparc64 ppc64 ppc64p7 x86_64
@@ -43,85 +25,62 @@
 %global build_objc 0
 %global build_go 0
 %global build_d 0
-%global build_m2 0
-%global build_cobol 0
-%global build_algol68 0
 %else
-%ifarch %{ix86} x86_64 ia64 ppc %{power64} alpha s390x %{arm} aarch64 riscv64
+%ifarch %{ix86} x86_64 ia64 ppc %{power64} alpha s390x %{arm} aarch64
 %global build_ada 1
 %else
 %global build_ada 0
 %endif
 %global build_objc 1
-%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 %{mips} riscv64
+%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 %{mips}
 %global build_go 1
 %else
 %global build_go 0
 %endif
-%ifarch %{ix86} x86_64 %{arm} aarch64 %{mips} s390 s390x riscv64
+%ifarch %{ix86} x86_64 %{arm} %{mips} s390 s390x riscv64
 %global build_d 1
 %else
 %global build_d 0
 %endif
-%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 %{mips} riscv64
-%global build_m2 1
-%else
-%global build_m2 0
-%endif
-%ifarch x86_64 aarch64 ppc64le
-%global build_cobol 1
-%else
-%global build_cobol 0
-%endif
-%global build_algol68 1
 %endif
 %ifarch %{ix86} x86_64 ia64 ppc64le
 %global build_libquadmath 1
 %else
 %global build_libquadmath 0
 %endif
-%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 riscv64
+%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64
 %global build_libasan 1
 %else
 %global build_libasan 0
 %endif
-%ifarch x86_64 aarch64
-%global build_libhwasan 1
-%else
-%global build_libhwasan 0
-%endif
-%ifarch x86_64 ppc64 ppc64le aarch64 s390x riscv64
+%ifarch x86_64 ppc64 ppc64le aarch64
 %global build_libtsan 1
 %else
 %global build_libtsan 0
 %endif
-%ifarch x86_64 ppc64 ppc64le aarch64 s390x riscv64
+%ifarch x86_64 ppc64 ppc64le aarch64
 %global build_liblsan 1
 %else
 %global build_liblsan 0
 %endif
-%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 riscv64
+%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64
 %global build_libubsan 1
 %else
 %global build_libubsan 0
 %endif
-%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 %{mips} riscv64
+%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 %{mips}
 %global build_libatomic 1
 %else
 %global build_libatomic 0
 %endif
-%ifarch %{ix86} x86_64 %{arm} alpha ppc ppc64 ppc64le ppc64p7 s390 s390x aarch64 riscv64
+%ifarch %{ix86} x86_64 %{arm} alpha ppc ppc64 ppc64le ppc64p7 s390 s390x aarch64
 %global build_libitm 1
 %else
 %global build_libitm 0
 %endif
-%if 0%{?rhel} > 8
-%global build_isl 0
-%else
 %global build_isl 1
-%endif
 %global build_libstdcxx_docs 1
-%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 %{mips} riscv64
+%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 %{mips}
 %global attr_ifunc 1
 %else
 %global attr_ifunc 0
@@ -131,12 +90,7 @@
 %else
 %global build_offload_nvptx 0
 %endif
-%ifarch x86_64
-%global build_offload_amdgcn 1
-%else
-%global build_offload_amdgcn 0
-%endif
-%if 0%{?fedora} < 32 && 0%{?rhel} < 8
+%if 0%{?fedora} < 32
 %ifarch s390x
 %global multilib_32_arch s390
 %endif
@@ -150,48 +104,35 @@
 %ifarch x86_64
 %global multilib_32_arch i686
 %endif
-%if 0%{?fedora} >= 36 || 0%{?rhel} >= 10
-%global build_annobin_plugin 1
-%else
-%global build_annobin_plugin 0
-%endif
 Summary: Various compilers (C, C++, Objective-C, ...)
 Name: gcc
 Version: %{gcc_version}
-Release: %{gcc_release}.3%{?dist}
-# License notes for some of the less obvious ones:
-#   gcc/doc/cppinternals.texi: Linux-man-pages-copyleft-2-para
-#   isl: MIT, BSD-2-Clause
-#   libcody: Apache-2.0
-#   libphobos/src/etc/c/curl.d: curl
-# All of the remaining license soup is in newlib.
-License: GPL-3.0-or-later AND LGPL-3.0-or-later AND (GPL-3.0-or-later WITH GCC-exception-3.1) AND (GPL-3.0-or-later WITH Texinfo-exception) AND (LGPL-2.1-or-later WITH GCC-exception-2.0) AND (GPL-2.0-or-later WITH GCC-exception-2.0) AND (GPL-2.0-or-later WITH GNU-compiler-exception) AND BSL-1.0 AND GFDL-1.3-or-later AND Linux-man-pages-copyleft-2-para AND SunPro AND BSD-1-Clause AND BSD-2-Clause AND BSD-2-Clause-Views AND BSD-3-Clause AND BSD-4-Clause AND BSD-Source-Code AND Zlib AND MIT AND Apache-2.0 AND (Apache-2.0 WITH LLVM-Exception) AND ZPL-2.1 AND ISC AND LicenseRef-Fedora-Public-Domain AND HP-1986 AND curl AND Martin-Birgmeier AND HPND-Markus-Kuhn AND dtoa AND SMLNJ AND AMD-newlib AND OAR AND HPND-merchantability-variant AND HPND-Intel
-# The source for this package was pulled from upstream's vcs.
-# %%{gitrev} is some commit from the
-# https://gcc.gnu.org/git/?p=gcc.git;h=refs/vendors/redhat/heads/gcc-%%{gcc_major}-branch
-# branch.  Use the following command to generate the tarball:
-# ./update-gcc.sh %%{gitrev}
-# optionally if say /usr/src/gcc/.git/ is an existing gcc git clone
-# ./update-gcc.sh %%{gitrev} /usr/src/gcc/.git/
-# to speed up the clone operations.  Note, %%{gitrev} macro in
-# gcc.spec shouldn't be updated before running the script, the script
-# will update it, fill in some %%changelog details etc.
+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
+# The source for this package was pulled from upstream's vcs.  Use the
+# following commands to generate the tarball:
+# 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 %%{gitrev}
+# git --git-dir=gcc-dir.tmp/.git archive --prefix=%%{name}-%%{version}-%%{DATE}/ %%{gitrev} | xz -9e > %%{name}-%%{version}-%%{DATE}.tar.xz
+# rm -rf gcc-dir.tmp
 Source0: gcc-%{version}-%{DATE}.tar.xz
 # The source for nvptx-tools package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-# git clone --depth 1 https://github.com/MentorEmbedded/nvptx-tools.git nvptx-tools-dir.tmp
-# git --git-dir=nvptx-tools-dir.tmp/.git fetch --depth 1 origin %%{nvptx_tools_gitrev}
-# git --git-dir=nvptx-tools-dir.tmp/.git archive --prefix=nvptx-tools-%%{nvptx_tools_gitrev}/ %%{nvptx_tools_gitrev} | xz -9e > nvptx-tools-%%{nvptx_tools_gitrev}.tar.xz
-# rm -rf nvptx-tools-dir.tmp
+# git clone https://github.com/MentorEmbedded/nvptx-tools.git
+# cd nvptx-tools
+# git archive origin/master --prefix=nvptx-tools-%%{nvptx_tools_gitrev}/ | xz -9e > ../nvptx-tools-%%{nvptx_tools_gitrev}.tar.xz
+# cd ..; rm -rf nvptx-tools
 Source1: nvptx-tools-%{nvptx_tools_gitrev}.tar.xz
 # The source for nvptx-newlib package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-# git clone https://sourceware.org/git/newlib-cygwin.git newlib-cygwin-dir.tmp
-# git --git-dir=newlib-cygwin-dir.tmp/.git archive --prefix=newlib-cygwin-%%{newlib_cygwin_gitrev}/ %%{newlib_cygwin_gitrev} ":(exclude)newlib/libc/sys/linux/include/rpc/*.[hx]" | xz -9e > newlib-cygwin-%%{newlib_cygwin_gitrev}.tar.xz
-# rm -rf newlib-cygwin-dir.tmp
-Source2: newlib-cygwin-%{newlib_cygwin_gitrev}.tar.xz
-%global isl_version 0.24
-Source3: https://gcc.gnu.org/pub/gcc/infrastructure/isl-%{isl_version}.tar.bz2
+# git clone https://github.com/MentorEmbedded/nvptx-newlib.git
+# cd nvptx-newlib
+# git archive origin/master --prefix=nvptx-newlib-%%{nvptx_newlib_gitrev}/ | xz -9 > ../nvptx-newlib-%%{nvptx_newlib_gitrev}.tar.xz
+# cd ..; rm -rf nvptx-newlib
+Source2: nvptx-newlib-%{nvptx_newlib_gitrev}.tar.xz
+%global isl_version 0.16.1
 URL: http://gcc.gnu.org
 # Need binutils with -pie support >= 2.14.90.0.4-4
 # Need binutils which can omit dot symbols and overlap .opd on ppc64 >= 2.15.91.0.2-4
@@ -206,23 +147,23 @@ URL: http://gcc.gnu.org
 # Need binutils which support -plugin
 # Need binutils which support .loc view >= 2.30
 # Need binutils which support --generate-missing-build-notes=yes >= 2.31
-# Need binutils which support .base64 >= 2.43
-BuildRequires: binutils >= 2.43
+%if 0%{?fedora} >= 29 || 0%{?rhel} > 7
+BuildRequires: binutils >= 2.31
+%else
+BuildRequires: binutils >= 2.24
+%endif
 # While gcc doesn't include statically linked binaries, during testing
 # -static is used several times.
 BuildRequires: glibc-static
 BuildRequires: zlib-devel, gettext, dejagnu, bison, flex, sharutils
 BuildRequires: texinfo, texinfo-tex, /usr/bin/pod2man
 BuildRequires: systemtap-sdt-devel >= 1.3
-BuildRequires: gmp-devel >= 4.1.2-8, mpfr-devel >= 3.1.0, libmpc-devel >= 0.8.1
-BuildRequires: python3-devel, /usr/bin/python
-BuildRequires: gcc, gcc-c++, make
+BuildRequires: gmp-devel >= 4.1.2-8, mpfr-devel >= 2.2.1, libmpc-devel >= 0.8.1
+BuildRequires: python2-devel, python3-devel, /usr/bin/python
+BuildRequires: gcc, gcc-c++
 %if %{build_go}
 BuildRequires: hostname, procps
 %endif
-%if %{build_cobol}
-BuildRequires: libxml2-devel
-%endif
 # For VTA guality testing
 BuildRequires: gdb
 # Make sure pthread.h doesn't contain __thread tokens
@@ -231,35 +172,34 @@ BuildRequires: gdb
 BuildRequires: glibc-devel >= 2.4.90-13
 BuildRequires: elfutils-devel >= 0.147
 BuildRequires: elfutils-libelf-devel >= 0.147
-BuildRequires: libzstd-devel
 %ifarch ppc ppc64 ppc64le ppc64p7 s390 s390x sparc sparcv9 alpha
 # Make sure glibc supports TFmode long double
 BuildRequires: glibc >= 2.3.90-35
 %endif
-%ifarch %{multilib_64_archs}
-BuildRequires: (glibc32 or glibc-devel(%{__isa_name}-32))
-%endif
-%ifarch sparcv9 ppc
-BuildRequires: (glibc64 or glibc-devel(%{__isa_name}-64))
+%ifarch %{multilib_64_archs} sparcv9 ppc
+# Ensure glibc{,-devel} is installed for both multilib arches
+BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
 %endif
 %if %{build_ada}
 # Ada requires Ada to build
 BuildRequires: gcc-gnat >= 3.1, libgnat >= 3.1
 %endif
-%if %{build_d}
-# D requires D to build
-BuildRequires: gcc-gdc >= 11.0.0, libgphobos-static >= 11.0.0
-%endif
 %ifarch ia64
 BuildRequires: libunwind >= 0.98
 %endif
+%if %{build_isl}
+BuildRequires: isl = %{isl_version}
+BuildRequires: isl-devel = %{isl_version}
+%if 0%{?__isa_bits} == 64
+Requires: libisl.so.15()(64bit)
+%else
+Requires: libisl.so.15
+%endif
+%endif
 %if %{build_libstdcxx_docs}
 BuildRequires: doxygen >= 1.7.1
 BuildRequires: graphviz, dblatex, texlive-collection-latex, docbook5-style-xsl
 %endif
-%if %{build_offload_amdgcn}
-BuildRequires: llvm >= 15, lld >= 15
-%endif
 Requires: cpp = %{version}-%{release}
 # Need .eh_frame ld optimizations
 # Need proper visibility support
@@ -277,8 +217,11 @@ Requires: cpp = %{version}-%{release}
 # Need binutils that support -plugin
 # Need binutils that support .loc view >= 2.30
 # Need binutils which support --generate-missing-build-notes=yes >= 2.31
-# Need binutils that support .base64 >= 2.43
-Requires: binutils >= 2.43
+%if 0%{?fedora} >= 29 || 0%{?rhel} > 7
+Requires: binutils >= 2.31
+%else
+Requires: binutils >= 2.24
+%endif
 # Make sure gdb will understand DW_FORM_strp
 Conflicts: gdb < 5.1-2
 Requires: glibc-devel >= 2.2.90-12
@@ -293,40 +236,31 @@ Requires: glibc >= 2.16
 %endif
 Requires: libgcc >= %{version}-%{release}
 Requires: libgomp = %{version}-%{release}
-%if %{build_libatomic}
-Requires: libatomic = %{version}-%{release}
-Obsoletes: libatomic-static < %{version}-%{release}
-Provides: libatomic-static = %{version}-%{release}
-%endif
-# lto-wrapper invokes make
-Requires: make
 %if !%{build_ada}
 Obsoletes: gcc-gnat < %{version}-%{release}
 %endif
 Obsoletes: gcc-java < %{version}-%{release}
 AutoReq: true
 Provides: bundled(libiberty)
-Provides: bundled(libbacktrace)
-Provides: bundled(libffi)
 Provides: gcc(major) = %{gcc_major}
 
-Patch0: gcc16-hack.patch
-Patch2: gcc16-sparc-config-detection.patch
-Patch3: gcc16-libgomp-omp_h-multilib.patch
-Patch4: gcc16-libtool-no-rpath.patch
-Patch5: gcc16-isl-dl.patch
-Patch6: gcc16-isl-dl2.patch
-Patch7: gcc16-libstdc++-docs.patch
-Patch8: gcc16-no-add-needed.patch
-Patch9: gcc16-Wno-format-security.patch
-Patch10: gcc16-rh1574936.patch
-Patch11: gcc16-d-shared-libphobos.patch
-Patch12: gcc16-pr119006.patch
-Patch13: gcc16-pr123273.patch
+Patch0: gcc9-hack.patch
+Patch1: gcc9-i386-libgomp.patch
+Patch2: gcc9-sparc-config-detection.patch
+Patch3: gcc9-libgomp-omp_h-multilib.patch
+Patch4: gcc9-libtool-no-rpath.patch
+Patch5: gcc9-isl-dl.patch
+Patch6: gcc9-libstdc++-docs.patch
+Patch7: gcc9-no-add-needed.patch
+Patch8: gcc9-foffload-default.patch
+Patch9: gcc9-Wno-format-security.patch
+Patch10: gcc9-rh1574936.patch
+Patch11: gcc9-d-shared-libphobos.patch
 
-Patch50: isl-rh2155127.patch
+Patch1000: nvptx-tools-no-ptxas.patch
+Patch1001: nvptx-tools-build.patch
+Patch1002: nvptx-tools-glibc.patch
 
-Patch100: gcc16-fortran-fdec-duplicates.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -348,7 +282,7 @@ Patch100: gcc16-fortran-fdec-duplicates.patch
 %if %{build_go}
 # Avoid stripping these libraries and binaries.
 %global __os_install_post \
-chmod 644 %{buildroot}%{_prefix}/%{_lib}/libgo.so.25.* \
+chmod 644 %{buildroot}%{_prefix}/%{_lib}/libgo.so.14.* \
 chmod 644 %{buildroot}%{_prefix}/bin/go.gcc \
 chmod 644 %{buildroot}%{_prefix}/bin/gofmt.gcc \
 chmod 644 %{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/cgo \
@@ -356,7 +290,7 @@ chmod 644 %{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}
 chmod 644 %{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/test2json \
 chmod 644 %{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/vet \
 %__os_install_post \
-chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgo.so.25.* \
+chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgo.so.14.* \
 chmod 755 %{buildroot}%{_prefix}/bin/go.gcc \
 chmod 755 %{buildroot}%{_prefix}/bin/gofmt.gcc \
 chmod 755 %{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/cgo \
@@ -367,26 +301,26 @@ chmod 755 %{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}
 %endif
 
 %description
-The gcc package contains the GNU Compiler Collection version %{gcc_major}.
+The gcc package contains the GNU Compiler Collection version 9.
 You'll need this package in order to compile C code.
 
 %package -n libgcc
-Summary: GCC version %{gcc_major} shared support library
+Summary: GCC version 9 shared support library
 Autoreq: false
 %if !%{build_ada}
 Obsoletes: libgnat < %{version}-%{release}
 %endif
-Obsoletes: libmudflap < %{version}-%{release}
-Obsoletes: libmudflap-devel < %{version}-%{release}
-Obsoletes: libmudflap-static < %{version}-%{release}
+Obsoletes: libmudflap
+Obsoletes: libmudflap-devel
+Obsoletes: libmudflap-static
 Obsoletes: libgcj < %{version}-%{release}
 Obsoletes: libgcj-devel < %{version}-%{release}
 Obsoletes: libgcj-src < %{version}-%{release}
 %ifarch %{ix86} x86_64
-Obsoletes: libcilkrts < %{version}-%{release}
-Obsoletes: libcilkrts-static < %{version}-%{release}
-Obsoletes: libmpx < %{version}-%{release}
-Obsoletes: libmpx-static < %{version}-%{release}
+Obsoletes: libcilkrts
+Obsoletes: libcilkrts-static
+Obsoletes: libmpx
+Obsoletes: libmpx-static
 %endif
 
 %description -n libgcc
@@ -411,12 +345,6 @@ including templates and exception handling.
 Summary: GNU Standard C++ Library
 Autoreq: true
 Requires: glibc >= 2.10.90-7
-BuildRequires: tzdata >= 2017c
-%if 0%{?fedora} > 38 || 0%{?rhel} > 9
-Recommends: tzdata >= 2017c
-%else
-Requires: tzdata >= 2017c
-%endif
 
 %description -n libstdc++
 The libstdc++ package contains a rewritten standard compliant GCC Standard
@@ -494,11 +422,9 @@ programs with the GNU Compiler Collection.
 %package -n libgfortran
 Summary: Fortran runtime
 Autoreq: true
-%if 0%{?fedora} < 28 && 0%{?rhel} < 8
 %if %{build_libquadmath}
 Requires: libquadmath = %{version}-%{release}
 %endif
-%endif
 
 %description -n libgfortran
 This package contains Fortran shared library which is needed to run
@@ -543,96 +469,15 @@ Requires: gcc-gdc = %{version}-%{release}
 %description -n libgphobos-static
 This package contains static D libraries.
 
-%package gm2
-Summary: Modula-2 support
-Requires: gcc = %{version}-%{release}
-Requires: libgm2 = %{version}-%{release}
-Provides: gcc-m2 = %{version}-%{release}
-Provides: gm2 = %{version}-%{release}
-Autoreq: true
-
-%description gm2
-The gcc-gm2 package provides support for compiling Modula-2
-programs with the GNU Compiler Collection.
-
-%package -n libgm2
-Summary: Modula-2 runtime
-Autoreq: true
-
-%description -n libgm2
-This package contains Modula-2 shared libraries which are needed to run
-Modula-2 dynamically linked programs.
-
-%package -n libgm2-static
-Summary: Static Modula-2 libraries
-Requires: libgm2 = %{version}-%{release}
-Requires: gcc-gm2 = %{version}-%{release}
-
-%description -n libgm2-static
-This package contains static Modula-2 libraries.
-
-%package gcobol
-Summary: COBOL support
-Requires: gcc = %{version}-%{release}
-Requires: gcc-c++ = %{version}-%{release}
-Requires: libgcobol = %{version}-%{release}
-Autoreq: true
-
-%description gcobol
-The gcc-gcobol package provides support for compiling COBOL
-programs with the GNU Compiler Collection.
-
-%package -n libgcobol
-Summary: COBOL runtime
-Autoreq: true
-
-%description -n libgcobol
-This package contains COBOL shared libraries which are needed to run
-COBOL dynamically linked programs.
-
-%package -n libgcobol-static
-Summary: Static COBOL libraries
-Requires: libgcobol = %{version}-%{release}
-Requires: gcc-gcobol = %{version}-%{release}
-
-%description -n libgcobol-static
-This package contains static COBOL libraries.
-
-%package algol68
-Summary: Algol 68 support
-Requires: gcc = %{version}-%{release}
-Requires: libga68 = %{version}-%{release}
-Autoreq: true
-
-%description algol68
-The gcc-algol68 package provides support for compiling Algol 68
-programs with the GNU Compiler Collection.
-
-%package -n libga68
-Summary: Algol 68 runtime
-Autoreq: true
-
-%description -n libga68
-This package contains Algol 68 shared libraries which are needed to run
-Algol 68 dynamically linked programs.
-
-%package -n libga68-static
-Summary: Static Algol 68 libraries
-Requires: libga68 = %{version}-%{release}
-Requires: gcc-algol68 = %{version}-%{release}
-
-%description -n libga68-static
-This package contains static Algol 68 libraries.
-
 %package -n libgomp
-Summary: GCC OpenMP v5.2 shared support library
+Summary: GCC OpenMP v4.5 shared support library
 
 %description -n libgomp
 This package contains GCC shared support library which is needed
-for OpenMP v5.2 support.
+for OpenMP v4.5 support.
 
 %package -n libgomp-offload-nvptx
-Summary: GCC OpenMP v5.2 plugin for offloading to NVPTX
+Summary: GCC OpenMP v4.5 plugin for offloading to NVPTX
 Requires: libgomp = %{version}-%{release}
 
 %description -n libgomp-offload-nvptx
@@ -640,17 +485,6 @@ This package contains libgomp plugin for offloading to NVidia
 PTX.  The plugin needs libcuda.so.1 shared library that has to be
 installed separately.
 
-%package -n libgomp-offload-amdgcn
-Summary: GCC OpenMP v5.2 plugin for offloading to AMD GCN
-Requires: libgomp = %{version}-%{release}
-%if 0%{?fedora:1}
-Requires: rocm-runtime >= 6.0.0
-%endif
-
-%description -n libgomp-offload-amdgcn
-This package contains libgomp plugin for offloading to AMD ROCm capable
-devices.
-
 %package gdb-plugin
 Summary: GCC plugin for GDB
 Requires: gcc = %{version}-%{release}
@@ -677,20 +511,6 @@ Requires: libgccjit = %{version}-%{release}
 %description -n libgccjit-devel
 This package contains header files and documentation for GCC JIT front-end.
 
-%package -n libgdiagnostics
-Summary: Library for emitting diagnostics
-
-%description -n libgdiagnostics
-This package contains libgdiagnostics shared library and sarif-replay program.
-
-%package -n libgdiagnostics-devel
-Summary: Support for emitting diagnostics
-Requires: libgdiagnostics = %{version}-%{release}
-
-%description -n libgdiagnostics-devel
-This package contains header files and documentation for the libgdiagnostics
-library.
-
 %package -n libquadmath
 Summary: GCC __float128 shared support library
 
@@ -746,6 +566,13 @@ This package contains the GNU Atomic library
 which is a GCC support runtime library for atomic operations not supported
 by hardware.
 
+%package -n libatomic-static
+Summary: The GNU Atomic static library
+Requires: libatomic = %{version}-%{release}
+
+%description -n libatomic-static
+This package contains GNU Atomic static libraries.
+
 %package -n libasan
 Summary: The Address Sanitizer runtime library
 
@@ -760,21 +587,6 @@ Requires: libasan = %{version}-%{release}
 %description -n libasan-static
 This package contains Address Sanitizer static runtime library.
 
-%package -n libhwasan
-Summary: The Hardware-assisted Address Sanitizer runtime library
-
-%description -n libhwasan
-This package contains the Hardware-assisted Address Sanitizer library
-which is used for -fsanitize=hwaddress instrumented programs.
-
-%package -n libhwasan-static
-Summary: The Hardware-assisted Address Sanitizer static library
-Requires: libhwasan = %{version}-%{release}
-
-%description -n libhwasan-static
-This package contains Hardware-assisted Address Sanitizer static runtime
-library.
-
 %package -n libtsan
 Summary: The Thread Sanitizer runtime library
 
@@ -922,7 +734,7 @@ This package contains static Go libraries.
 %package plugin-devel
 Summary: Support for compiling GCC plugins
 Requires: gcc = %{version}-%{release}
-Requires: gmp-devel >= 4.1.2-8, mpfr-devel >= 3.1.0, libmpc-devel >= 0.8.1
+Requires: gmp-devel >= 4.1.2-8, mpfr-devel >= 2.2.1, libmpc-devel >= 0.8.1
 
 %description plugin-devel
 This package contains header files and other support files
@@ -940,64 +752,42 @@ NVidia PTX.  OpenMP and OpenACC programs linked with -fopenmp will
 by default add PTX code into the binaries, which can be offloaded
 to NVidia PTX capable devices if available.
 
-%package offload-amdgcn
-Summary: Offloading compiler to AMD GCN
-Requires: gcc = %{version}-%{release}
-Requires: libgomp-offload-amdgcn = %{version}-%{release}
-Requires: llvm >= 15, lld >= 15
-
-%description offload-amdgcn
-The gcc-offload-amdgcn package provides offloading support for
-AMD GCN.  OpenMP and OpenACC programs linked with -fopenmp will
-by default add GCN code into the binaries, which can be offloaded
-to AMD ROCm capable devices if available.
-
-%package plugin-annobin
-Summary: The annobin plugin for gcc, built by the installed version of gcc
-Requires: gcc = %{version}-%{release}
-%if %{build_annobin_plugin}
-BuildRequires: annobin-plugin-gcc >= 10.62, rpm-devel, binutils-devel, xz
-%endif
-
-%description plugin-annobin
-This package adds a version of the annobin plugin for gcc.  This version
-of the plugin is explicitly built by the same version of gcc that is installed
-so that there cannot be any synchronization problems.
-
 %prep
-%setup -q -n gcc-%{version}-%{DATE} -a 1 -a 2 -a 3
-%autopatch -p0 -m 0 -M 4
+%setup -q -n gcc-%{version}-%{DATE} -a 1 -a 2
+%patch0 -p0 -b .hack~
+%patch1 -p0 -b .i386-libgomp~
+%patch2 -p0 -b .sparc-config-detection~
+%patch3 -p0 -b .libgomp-omp_h-multilib~
+%patch4 -p0 -b .libtool-no-rpath~
 %if %{build_isl}
-%autopatch -p0 -m 5 -M 6
+%patch5 -p0 -b .isl-dl~
 %endif
 %if %{build_libstdcxx_docs}
-%autopatch -p0 7
+%patch6 -p0 -b .libstdc++-docs~
 %endif
-%autopatch -p0 -m 8 -M 9
+%patch7 -p0 -b .no-add-needed~
+%patch8 -p0 -b .foffload-default~
+%patch9 -p0 -b .Wno-format-security~
 %if 0%{?fedora} >= 29 || 0%{?rhel} > 7
-%autopatch -p0 10
+%patch10 -p0 -b .rh1574936~
 %endif
-%autopatch -p0 -m 11 -M 99
-touch -r isl-0.24/m4/ax_prog_cxx_for_build.m4 isl-0.24/m4/ax_prog_cc_for_build.m4
+%patch11 -p0 -b .d-shared-libphobos~
 
-%if 0%{?rhel} >= 9
-%autopatch -p1 100
-%endif
-
-%ifarch %{arm}
-rm -f gcc/testsuite/go.test/test/fixedbugs/issue19182.go
-%endif
-rm -f libphobos/testsuite/libphobos.gc/forkgc2.d
-#rm -rf libphobos/testsuite/libphobos.gc
+cd nvptx-tools-%{nvptx_tools_gitrev}
+%patch1000 -p1 -b .nvptx-tools-no-ptxas~
+%patch1001 -p1 -b .nvptx-tools-build~
+%patch1002 -p1 -b .nvptx-tools-glibc~
+cd ..
 
 echo 'Red Hat %{version}-%{gcc_release}' > gcc/DEV-PHASE
 
+cp -a libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
+
 ./contrib/gcc_update --touch
 
 LC_ALL=C sed -i -e 's/\xa0/ /' gcc/doc/options.texi
 
 sed -i -e 's/Common Driver Var(flag_report_bug)/& Init(1)/' gcc/common.opt
-sed -i -e 's/m_report_bug = false;/m_report_bug = true;/' gcc/diagnostics/context.cc
 
 %ifarch ppc
 if [ -d libstdc++-v3/config/abi/post/powerpc64-linux-gnu ]; then
@@ -1026,15 +816,10 @@ export CONFIG_SITE=NONE
 
 CC=gcc
 CXX=g++
-OPT_FLAGS="%{optflags}"
-OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=[123]//g'`
-OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/\(-Wp,\)\?-D_FORTIFY_SOURCE=[123]//g'`
-OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/\(-Wp,\)\?-U_FORTIFY_SOURCE//g'`
-OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-flto=auto//g;s/-flto//g;s/-ffat-lto-objects//g'`
+OPT_FLAGS=`echo %{optflags}|sed -e 's/\(-Wp,\)\?-D_FORTIFY_SOURCE=[12]//g'`
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-m64//g;s/-m32//g;s/-m31//g'`
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mfpmath=sse/-mfpmath=sse -msse2/g'`
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/ -pipe / /g'`
-OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-fno-omit-frame-pointer//g;s/-mbackchain//g;s/-mno-omit-leaf-frame-pointer//g'`
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-Werror=format-security/-Wformat-security/g'`
 %ifarch sparc
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mcpu=ultrasparc/-mtune=ultrasparc/g;s/-mcpu=v[78]//g'`
@@ -1063,7 +848,7 @@ make %{?_smp_mflags}
 make install prefix=${IROOT}%{_prefix}
 cd ../..
 
-ln -sf newlib-cygwin-%{newlib_cygwin_gitrev}/newlib newlib
+ln -sf nvptx-newlib-%{nvptx_newlib_gitrev}/newlib newlib
 rm -rf obj-offload-nvptx-none
 mkdir obj-offload-nvptx-none
 
@@ -1077,7 +862,7 @@ CC="$CC" CXX="$CXX" CFLAGS="$OPT_FLAGS" \
 	--target nvptx-none --enable-as-accelerator-for=%{gcc_target_platform} \
 	--enable-languages=c,c++,fortran,lto \
 	--prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
-	--with-bugurl=%dist_bug_report_url \
+	--with-bugurl=http://bugzilla.redhat.com/bugzilla \
 	--enable-checking=release --with-system-zlib \
 	--with-gcc-major-version-only --without-isl
 make %{?_smp_mflags}
@@ -1085,82 +870,14 @@ cd ..
 rm -f newlib
 %endif
 
-%if %{build_offload_amdgcn}
-mkdir -p objia%{_prefix}/bin objia%{_prefix}/amdgcn-amdhsa/bin
-IAROOT=`pwd`/objia
-ln -sf %{_prefix}/bin/llvm-ar ${IAROOT}%{_prefix}/bin/amdgcn-amdhsa-ar
-ln -sf %{_prefix}/bin/llvm-ar ${IAROOT}%{_prefix}/bin/amdgcn-amdhsa-ranlib
-ln -sf %{_prefix}/bin/llvm-mc ${IAROOT}%{_prefix}/bin/amdgcn-amdhsa-as
-ln -sf %{_prefix}/bin/llvm-nm ${IAROOT}%{_prefix}/bin/amdgcn-amdhsa-nm
-ln -sf %{_prefix}/bin/lld ${IAROOT}%{_prefix}/bin/amdgcn-amdhsa-ld
-ln -sf ../../bin/amdgcn-amdhsa-ar ${IAROOT}%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -sf ../../bin/amdgcn-amdhsa-ranlib ${IAROOT}%{_prefix}/amdgcn-amdhsa/bin/ranlib
-ln -sf ../../bin/amdgcn-amdhsa-as ${IAROOT}%{_prefix}/amdgcn-amdhsa/bin/as
-ln -sf ../../bin/amdgcn-amdhsa-nm ${IAROOT}%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -sf ../../bin/amdgcn-amdhsa-ld ${IAROOT}%{_prefix}/amdgcn-amdhsa/bin/ld
-
-ln -sf newlib-cygwin-%{newlib_cygwin_gitrev}/newlib newlib
-rm -rf obj-offload-amdgcn-amdhsa
-mkdir obj-offload-amdgcn-amdhsa
-
-cd obj-offload-amdgcn-amdhsa
-CC="$CC" CXX="$CXX" CFLAGS="$OPT_FLAGS" \
-	CXXFLAGS="`echo " $OPT_FLAGS " | sed 's/ -Wall / /g;s/ -fexceptions / /g' \
-		  | sed 's/ -Wformat-security / -Wformat -Wformat-security /'`" \
-	XCFLAGS="$OPT_FLAGS" TCFLAGS="$OPT_FLAGS" \
-	../configure --disable-bootstrap --disable-sjlj-exceptions \
-	--with-build-time-tools=${IAROOT}%{_prefix}/amdgcn-amdhsa/bin \
-	--target amdgcn-amdhsa --enable-as-accelerator-for=%{gcc_target_platform} \
-	--enable-languages=c,c++,fortran,lto \
-	--prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
-	--with-bugurl=%dist_bug_report_url \
-	--enable-checking=release --with-system-zlib \
-	--with-gcc-major-version-only --without-isl --disable-libquadmath
-make %{?_smp_mflags}
-cd ..
-rm -f newlib
-%endif
-
 rm -rf obj-%{gcc_target_platform}
 mkdir obj-%{gcc_target_platform}
 cd obj-%{gcc_target_platform}
 
-%if %{build_isl}
-mkdir isl-build isl-install
-%ifarch s390 s390x
-ISL_FLAG_PIC=-fPIC
-%else
-ISL_FLAG_PIC=-fpic
-%endif
-cd isl-build
-
-%ifarch riscv64
-# Update config.{sub,guess} scripts for riscv64 (the original ones are too old)
-cp -f -v /usr/lib/rpm/%{_vendor}/config.guess ../../isl-%{isl_version}/config.guess
-cp -f -v /usr/lib/rpm/%{_vendor}/config.sub ../../isl-%{isl_version}/config.sub
-%endif
-
-sed -i 's|libisl\([^-]\)|libgcc%{gcc_major}privateisl\1|g' \
-  ../../isl-%{isl_version}/Makefile.{am,in}
-../../isl-%{isl_version}/configure \
-  CC=/usr/bin/gcc CXX=/usr/bin/g++ \
-  CFLAGS="${CFLAGS:-%optflags} $ISL_FLAG_PIC" --prefix=`cd ..; pwd`/isl-install
-make %{?_smp_mflags} CFLAGS="${CFLAGS:-%optflags} $ISL_FLAG_PIC"
-make install
-cd ../isl-install/lib
-rm libgcc%{gcc_major}privateisl.so{,.23}
-mv libgcc%{gcc_major}privateisl.so.23.1.0 libisl.so.23
-ln -sf libisl.so.23 libisl.so
-cd ../..
-%endif
-
 enablelgo=
 enablelada=
 enablelobjc=
 enableld=
-enablelm2=
-enablelcob=
-enablela68=
 %if %{build_objc}
 enablelobjc=,objc,obj-c++
 %endif
@@ -1173,32 +890,16 @@ enablelgo=,go
 %if %{build_d}
 enableld=,d
 %endif
-%if %{build_m2}
-enablelm2=,m2
-%endif
-%if %{build_cobol}
-enablelcob=,cobol
-%endif
-%if %{build_algol68}
-enablela68=,algol68
-%endif
-offloadtgts=
-%if %{build_offload_nvptx}
-offloadtgts=nvptx-none
-%endif
-%if %{build_offload_amdgcn}
-offloadtgts=${offloadtgts:+${offloadtgts},}amdgcn-amdhsa
-%endif
 CONFIGURE_OPTS="\
 	--prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
-	--with-bugurl=%dist_bug_report_url \
+	--with-bugurl=http://bugzilla.redhat.com/bugzilla \
 	--enable-shared --enable-threads=posix --enable-checking=release \
 %ifarch ppc64le
 	--enable-targets=powerpcle-linux \
 %endif
-%ifarch ppc64le %{mips} s390x
+%ifarch ppc64le %{mips} riscv64 s390x
 %ifarch s390x
-%if 0%{?fedora} < 32 && 0%{?rhel} < 8
+%if 0%{?fedora} < 32
 	--enable-multilib \
 %else
 	--disable-multilib \
@@ -1211,20 +912,17 @@ CONFIGURE_OPTS="\
 %endif
 	--with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions \
 	--enable-gnu-unique-object --enable-linker-build-id --with-gcc-major-version-only \
-	--enable-libstdcxx-backtrace --with-libstdcxx-zoneinfo=%{_datadir}/zoneinfo \
 %ifnarch %{mips}
 	--with-linker-hash-style=gnu \
 %endif
 	--enable-plugin --enable-initfini-array \
 %if %{build_isl}
-	--with-isl=`pwd`/isl-install \
+	--with-isl \
 %else
 	--without-isl \
 %endif
-%if %{build_offload_nvptx} || %{build_offload_amdgcn}
-	--enable-offload-targets=$offloadtgts --enable-offload-defaulted \
-%endif
 %if %{build_offload_nvptx}
+	--enable-offload-targets=nvptx-none \
 	--without-cuda-driver \
 %endif
 %if 0%{?fedora} >= 21 || 0%{?rhel} >= 7
@@ -1241,9 +939,6 @@ CONFIGURE_OPTS="\
 %ifarch sparc sparcv9 sparc64 ppc ppc64 ppc64le ppc64p7 s390 s390x alpha
 	--with-long-double-128 \
 %endif
-%ifarch ppc64le
-	--with-long-double-format=ieee \
-%endif
 %ifarch sparc
 	--disable-linux-futex \
 %endif
@@ -1262,38 +957,20 @@ CONFIGURE_OPTS="\
 %endif
 %endif
 %ifarch ppc64le
-%if 0%{?rhel} >= 9
-%if 0%{?rhel} >= 10
-	--with-cpu-32=power9 --with-tune-32=power10 --with-cpu-64=power9 --with-tune-64=power10 \
-%else
-	--with-cpu-32=power9 --with-tune-32=power9 --with-cpu-64=power9 --with-tune-64=power9 \
-%endif
-%else
 	--with-cpu-32=power8 --with-tune-32=power8 --with-cpu-64=power8 --with-tune-64=power8 \
 %endif
-%endif
 %ifarch ppc
 	--build=%{gcc_target_platform} --target=%{gcc_target_platform} --with-cpu=default32
 %endif
 %ifarch %{ix86} x86_64
 	--enable-cet \
 	--with-tune=generic \
-%if 0%{?fedora} >= 44 || 0%{?rhel} >= 11
-	--with-tls=gnu2 \
-%endif
 %endif
 %if 0%{?rhel} >= 7
 %ifarch %{ix86}
 	--with-arch=x86-64 \
 %endif
 %ifarch x86_64
-%if 0%{?rhel} > 8
-%if 0%{?rhel} > 9
-	--with-arch_64=x86-64-v3 \
-%else
-	--with-arch_64=x86-64-v2 \
-%endif
-%endif
 	--with-arch_32=x86-64 \
 %endif
 %else
@@ -1307,28 +984,16 @@ CONFIGURE_OPTS="\
 %ifarch s390 s390x
 %if 0%{?rhel} >= 7
 %if 0%{?rhel} > 7
-%if 0%{?rhel} > 8
-%if 0%{?rhel} >= 9
-	--with-arch=z14 --with-tune=z15 \
-%else
-	--with-arch=z13 --with-tune=arch13 \
-%endif
-%else
-	--with-arch=z13 --with-tune=z14 \
-%endif
+	--with-arch=zEC12 --with-tune=z13 \
 %else
 	--with-arch=z196 --with-tune=zEC12 \
 %endif
 %else
-%if 0%{?fedora} >= 38
-	--with-arch=z13 --with-tune=z14 \
-%else
 %if 0%{?fedora} >= 26
 	--with-arch=zEC12 --with-tune=z13 \
 %else
 	--with-arch=z9-109 --with-tune=z10 \
 %endif
-%endif
 %endif
 	--enable-decimal-float \
 %endif
@@ -1342,29 +1007,8 @@ CONFIGURE_OPTS="\
 %ifarch mips64 mips64el
 	--with-arch=mips64r2 --with-abi=64 \
 %endif
-%ifarch riscv64
-	--with-arch=rv64gc --with-abi=lp64d --with-multilib-list=lp64d \
-%endif
 %ifnarch sparc sparcv9 ppc
 	--build=%{gcc_target_platform} \
-%endif
-%if 0%{?fedora} >= 35 || 0%{?rhel} >= 9
-%ifnarch %{arm}
-	--with-build-config=bootstrap-lto --enable-link-serialization=1 \
-%endif
-%endif
-%if 0%{?rhel:1}
-	--enable-host-pie --enable-host-bind-now \
-%endif
-	--disable-libssp \
-%if %{build_libquadmath} == 0
-	--disable-libquadmath \
-%endif
-%if %{build_libatomic} == 0
-	--disable-libatomic \
-%endif
-%if %{build_libitm} == 0
-	--disable-libitm \
 %endif
 	"
 
@@ -1373,13 +1017,13 @@ CC="$CC" CXX="$CXX" CFLAGS="$OPT_FLAGS" \
 		  | sed 's/ -Wformat-security / -Wformat -Wformat-security /'`" \
 	XCFLAGS="$OPT_FLAGS" TCFLAGS="$OPT_FLAGS" \
 	../configure --enable-bootstrap \
-	--enable-languages=c,c++,fortran${enablelobjc}${enablelada}${enablelgo}${enableld}${enablelm2}${enablelcob}${enablela68},lto \
+	--enable-languages=c,c++,fortran${enablelobjc}${enablelada}${enablelgo}${enableld},lto \
 	$CONFIGURE_OPTS
 
 %ifarch sparc sparcv9 sparc64
-make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS" LDFLAGS_FOR_TARGET=-Wl,-z,relro,-z,now bootstrap
+make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS" bootstrap
 %else
-make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS" LDFLAGS_FOR_TARGET=-Wl,-z,relro,-z,now profiledbootstrap
+make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS" profiledbootstrap
 %endif
 
 CC="`%{gcc_target_platform}/libstdc++-v3/scripts/testsuite_flags --build-cc`"
@@ -1394,7 +1038,7 @@ CC="$CC" CXX="$CXX" CFLAGS="$OPT_FLAGS" \
 		  | sed 's/ -Wformat-security / -Wformat -Wformat-security /'`" \
 	XCFLAGS="$OPT_FLAGS" TCFLAGS="$OPT_FLAGS" \
 	../../configure --disable-bootstrap --enable-host-shared \
-	--enable-languages=jit --enable-libgdiagnostics $CONFIGURE_OPTS
+	--enable-languages=jit $CONFIGURE_OPTS
 make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS" all-gcc
 cp -a gcc/libgccjit.so* ../gcc/
 cd ../gcc/
@@ -1407,10 +1051,6 @@ make jit.sphinx.html
 make jit.sphinx.install-html jit_htmldir=`pwd`/../../rpm.doc/libgccjit-devel/html
 cd ..
 
-%if %{build_isl}
-cp -a isl-install/lib/libisl.so.23 gcc/
-%endif
-
 # Make generated man pages even if Pod::Man is not new enough
 perl -pi -e 's/head3/head2/' ../contrib/texi2pod.pl
 for i in ../gcc/doc/*.texi; do
@@ -1429,7 +1069,7 @@ cd ../..
 
 # Copy various doc files here and there
 cd ..
-mkdir -p rpm.doc/{gfortran,objc,gdc,libphobos,gm2,libgm2,libgdiagnostics-devel,gcobol,libgcobol,algol68,libga68}
+mkdir -p rpm.doc/gfortran rpm.doc/objc rpm.doc/gdc rpm.doc/libphobos
 mkdir -p rpm.doc/go rpm.doc/libgo rpm.doc/libquadmath rpm.doc/libitm
 mkdir -p rpm.doc/changelogs/{gcc/cp,gcc/ada,gcc/jit,libstdc++-v3,libobjc,libgomp,libcc1,libatomic,libsanitizer}
 
@@ -1455,38 +1095,12 @@ done)
 (cd libphobos; for i in ChangeLog*; do
 	cp -p $i ../rpm.doc/libphobos/$i.libphobos
 done
-cp -a src/LICENSE*.txt libdruntime/LICENSE.txt ../rpm.doc/libphobos/)
-%endif
-%if %{build_m2}
-(cd gcc/m2; for i in ChangeLog*; do
-	cp -p $i ../../rpm.doc/gm2/$i.gm2
-done)
-(cd libgm2; for i in ChangeLog*; do
-	cp -p $i ../rpm.doc/libgm2/$i.libgm2
-done)
-%endif
-%if %{build_cobol}
-(cd gcc/cobol; for i in ChangeLog*; do
-	cp -p $i ../../rpm.doc/gcobol/$i.gcobol
-done)
-(cd libgcobol; for i in ChangeLog*; do
-	cp -p $i ../rpm.doc/libgcobol/$i.libgcobol
-done)
-%endif
-%if %{build_algol68}
-(cd gcc/algol68; for i in ChangeLog*; do
-	cp -p $i ../../rpm.doc/algol68/$i.algol68
-done)
-(cd libga68; for i in ChangeLog*; do
-	cp -p $i ../rpm.doc/libga68/$i.libga68
-done)
+cp -a src/LICENSE*.txt libdruntime/LICENSE ../rpm.doc/libphobos/)
 %endif
 %if %{build_libquadmath}
 (cd libquadmath; for i in ChangeLog* COPYING.LIB; do
 	cp -p $i ../rpm.doc/libquadmath/$i.libquadmath
-done;
-sed -n '/==========/,/==========/{/==========/d;s/^ \* *//p}' math/cosq.c \
-  > ../rpm.doc/libquadmath/LICENSE.SunPro)
+done)
 %endif
 %if %{build_libitm}
 (cd libitm; for i in ChangeLog*; do
@@ -1501,48 +1115,12 @@ done)
 	cp -p $i ../rpm.doc/libgo/$i.libgo
 done)
 %endif
-(cd gcc/doc/libgdiagnostics; make html; \
-mv _build/html ../../../rpm.doc/libgdiagnostics-devel/html )
 
 rm -f rpm.doc/changelogs/gcc/ChangeLog.[1-9]
 find rpm.doc -name \*ChangeLog\* | xargs bzip2 -9
 
-%if %{build_annobin_plugin}
-mkdir annobin-plugin
-cd annobin-plugin
-tar xf %{_usrsrc}/annobin/latest-annobin.tar.xz
-cd annobin*
-touch aclocal.m4 configure Makefile.in */configure */config.h.in */Makefile.in
-ANNOBIN_FLAGS=../../obj-%{gcc_target_platform}/%{gcc_target_platform}/libstdc++-v3/scripts/testsuite_flags
-ANNOBIN_CFLAGS1="%build_cflags -I %{_builddir}/gcc-%{version}-%{DATE}/gcc"
-ANNOBIN_CFLAGS1="$ANNOBIN_CFLAGS1 -I %{_builddir}/gcc-%{version}-%{DATE}/obj-%{gcc_target_platform}/gcc"
-ANNOBIN_CFLAGS2="-I %{_builddir}/gcc-%{version}-%{DATE}/include -I %{_builddir}/gcc-%{version}-%{DATE}/libcpp/include"
-ANNOBIN_LDFLAGS="%build_ldflags -L%{_builddir}/gcc-%{version}-%{DATE}/obj-%{gcc_target_platform}/%{gcc_target_platform}/libstdc++-v3/src/.libs"
-CC="`$ANNOBIN_FLAGS --build-cc`" CXX="`$ANNOBIN_FLAGS --build-cxx`" \
-  CFLAGS="$ANNOBIN_CFLAGS1 $ANNOBIN_CFLAGS2 $ANNOBIN_LDFLAGS" \
-  CXXFLAGS="$ANNOBIN_CFLAGS1 `$ANNOBIN_FLAGS --build-includes` $ANNOBIN_CFLAGS2 $ANNOBIN_LDFLAGS" \
-  ./configure --with-gcc-plugin-dir=%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/plugin \
-	      --without-annocheck --without-tests --without-docs --disable-rpath --without-debuginfod \
-	      --without-clang-plugin --without-llvm-plugin
-make
-cd ../..
-%endif
-
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}
-
-# RISC-V ABI wants to install everything in /lib64/lp64d or /usr/lib64/lp64d.
-# Make these be symlinks to /lib64 or /usr/lib64 respectively. See:
-# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/DRHT5YTPK4WWVGL3GIN5BF2IKX2ODHZ3/
-%ifarch riscv64
-for d in %{buildroot}%{_libdir} %{buildroot}/%{_lib} \
-	  %{buildroot}%{_datadir}/gdb/auto-load/%{_prefix}/%{_lib} \
-	  %{buildroot}%{_prefix}/include/c++/%{gcc_major}/%{gcc_target_platform}/%{_lib}; do
-  mkdir -p $d
-  (cd $d && ln -sf . lp64d)
-done
-%endif
 
 %if %{build_offload_nvptx}
 cd nvptx-tools-%{nvptx_tools_gitrev}
@@ -1550,12 +1128,11 @@ cd obj-%{gcc_target_platform}
 make install prefix=%{buildroot}%{_prefix}
 cd ../..
 
-ln -sf newlib-cygwin-%{newlib_cygwin_gitrev}/newlib newlib
+ln -sf nvptx-newlib-%{nvptx_newlib_gitrev}/newlib newlib
 cd obj-offload-nvptx-none
 make prefix=%{buildroot}%{_prefix} mandir=%{buildroot}%{_mandir} \
   infodir=%{buildroot}%{_infodir} install
 rm -rf %{buildroot}%{_prefix}/libexec/gcc/nvptx-none/%{gcc_major}/install-tools
-rm -rf %{buildroot}%{_prefix}/libexec/gcc/nvptx-none/%{gcc_major}/g++-mapper-server
 rm -rf %{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/accel/nvptx-none/{install-tools,plugin,cc1,cc1plus,f951}
 rm -rf %{buildroot}%{_infodir} %{buildroot}%{_mandir}/man7 %{buildroot}%{_prefix}/share/locale
 rm -rf %{buildroot}%{_prefix}/lib/gcc/nvptx-none/%{gcc_major}/{install-tools,plugin}
@@ -1571,44 +1148,6 @@ cd ..
 rm -f newlib
 %endif
 
-%if %{build_offload_amdgcn}
-mkdir -p %{buildroot}%{_prefix}/bin %{buildroot}%{_prefix}/amdgcn-amdhsa/bin
-ln -sf llvm-ar %{buildroot}%{_prefix}/bin/amdgcn-amdhsa-ar
-ln -sf llvm-ar %{buildroot}%{_prefix}/bin/amdgcn-amdhsa-ranlib
-ln -sf llvm-mc %{buildroot}%{_prefix}/bin/amdgcn-amdhsa-as
-ln -sf llvm-nm %{buildroot}%{_prefix}/bin/amdgcn-amdhsa-nm
-ln -sf lld %{buildroot}%{_prefix}/bin/amdgcn-amdhsa-ld
-ln -sf ../../bin/amdgcn-amdhsa-ar %{buildroot}%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -sf ../../bin/amdgcn-amdhsa-ranlib %{buildroot}%{_prefix}/amdgcn-amdhsa/bin/ranlib
-ln -sf ../../bin/amdgcn-amdhsa-as %{buildroot}%{_prefix}/amdgcn-amdhsa/bin/as
-ln -sf ../../bin/amdgcn-amdhsa-nm %{buildroot}%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -sf ../../bin/amdgcn-amdhsa-ld %{buildroot}%{_prefix}/amdgcn-amdhsa/bin/ld
-
-ln -sf newlib-cygwin-%{newlib_cygwin_gitrev}/newlib newlib
-cd obj-offload-amdgcn-amdhsa
-make prefix=%{buildroot}%{_prefix} mandir=%{buildroot}%{_mandir} \
-  infodir=%{buildroot}%{_infodir} install
-rm -rf %{buildroot}%{_prefix}/libexec/gcc/amdgcn-amdhsa/%{gcc_major}/install-tools
-rm -rf %{buildroot}%{_prefix}/libexec/gcc/amdgcn-amdhsa/%{gcc_major}/g++-mapper-server
-rm -rf %{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/accel/amdgcn-amdhsa/{install-tools,plugin,cc1,cc1plus,f951}
-rm -rf %{buildroot}%{_infodir} %{buildroot}%{_mandir}/man7 %{buildroot}%{_prefix}/share/locale
-rm -rf %{buildroot}%{_prefix}/lib/gcc/amdgcn-amdhsa/%{gcc_major}/{install-tools,plugin}
-rm -rf %{buildroot}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/accel/amdgcn-amdhsa/{install-tools,plugin,include-fixed}
-rm -rf %{buildroot}%{_prefix}/%{_lib}/libc[cp]1*
-mv -f %{buildroot}%{_prefix}/amdgcn-amdhsa/lib/*.{a,spec} %{buildroot}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/accel/amdgcn-amdhsa/
-mv -f %{buildroot}%{_prefix}/lib/gcc/amdgcn-amdhsa/%{gcc_major}/*.a %{buildroot}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/accel/amdgcn-amdhsa/
-pushd %{buildroot}%{_prefix}/amdgcn-amdhsa/lib
-for i in gfx*; do
-mv -f %{buildroot}%{_prefix}/amdgcn-amdhsa/lib/$i/*.{a,spec} %{buildroot}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/accel/amdgcn-amdhsa/$i/
-mv -f %{buildroot}%{_prefix}/lib/gcc/amdgcn-amdhsa/%{gcc_major}/$i/*.a %{buildroot}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/accel/amdgcn-amdhsa/$i/
-done
-popd
-find %{buildroot}%{_prefix}/lib/gcc/amdgcn-amdhsa %{buildroot}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/accel/amdgcn-amdhsa \
-     %{buildroot}%{_prefix}/amdgcn-amdhsa/lib -name \*.la | xargs rm
-cd ..
-rm -f newlib
-%endif
-
 cd obj-%{gcc_target_platform}
 
 TARGET_PLATFORM=%{gcc_target_platform}
@@ -1625,10 +1164,6 @@ chmod 644 %{buildroot}%{_infodir}/gnat*
 FULLPATH=%{buildroot}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}
 FULLEPATH=%{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}
 
-%if %{build_isl}
-cp -a isl-install/lib/libisl.so.23 $FULLPATH/
-%endif
-
 # fix some things
 ln -sf gcc %{buildroot}%{_prefix}/bin/cc
 rm -f %{buildroot}%{_prefix}/lib/cpp
@@ -1636,9 +1171,7 @@ ln -sf ../bin/cpp %{buildroot}/%{_prefix}/lib/cpp
 ln -sf gfortran %{buildroot}%{_prefix}/bin/f95
 rm -f %{buildroot}%{_infodir}/dir
 gzip -9 %{buildroot}%{_infodir}/*.info*
-%if %{build_ada}
 ln -sf gcc %{buildroot}%{_prefix}/bin/gnatgcc
-%endif
 mkdir -p %{buildroot}%{_fmoddir}
 
 %if %{build_go}
@@ -1683,10 +1216,12 @@ for f in `find %{buildroot}%{_prefix}/include/c++/%{gcc_major}/%{gcc_target_plat
 done
 
 # Nuke bits/*.h.gch dirs
-# 1) sometimes it is hard to match the exact options used for building
+# 1) there is no bits/*.h header installed, so when gch file can't be
+#    used, compilation fails
+# 2) sometimes it is hard to match the exact options used for building
 #    libstdc++-v3 or they aren't desirable
-# 2) there are multilib issues, conflicts etc. with this
-# 3) it is huge
+# 3) there are multilib issues, conflicts etc. with this
+# 4) it is huge
 # People can always precompile on their own whatever they want, but
 # shipping this for everybody is unnecessary.
 rm -rf %{buildroot}%{_prefix}/include/c++/%{gcc_major}/%{gcc_target_platform}/bits/*.h.gch
@@ -1698,7 +1233,7 @@ cp -r -p ../libstdc++-v3/doc/html ../rpm.doc/libstdc++-v3/html
 cp -r -p $libstdcxx_doc_builddir/html ../rpm.doc/libstdc++-v3/html/api
 mkdir -p %{buildroot}%{_mandir}/man3
 cp -r -p $libstdcxx_doc_builddir/man/man3/* %{buildroot}%{_mandir}/man3/
-find ../rpm.doc/libstdc++-v3 -name \*~ -o -name \*.orig | xargs rm -f
+find ../rpm.doc/libstdc++-v3 -name \*~ | xargs rm
 %endif
 
 %ifarch sparcv9 sparc64
@@ -1736,18 +1271,12 @@ mv %{buildroot}%{_prefix}/%{_lib}/libitm.spec $FULLPATH/
 %if %{build_libasan}
 mv %{buildroot}%{_prefix}/%{_lib}/libsanitizer.spec $FULLPATH/
 %endif
-%if %{build_cobol}
-mv %{buildroot}%{_prefix}/%{_lib}/libgcobol.spec $FULLPATH/
-%endif
-%if %{build_algol68}
-mv %{buildroot}%{_prefix}/%{_lib}/libga68.spec $FULLPATH/
-%endif
 
 mkdir -p %{buildroot}/%{_lib}
 mv -f %{buildroot}%{_prefix}/%{_lib}/libgcc_s.so.1 %{buildroot}/%{_lib}/libgcc_s-%{gcc_major}-%{DATE}.so.1
 chmod 755 %{buildroot}/%{_lib}/libgcc_s-%{gcc_major}-%{DATE}.so.1
 ln -sf libgcc_s-%{gcc_major}-%{DATE}.so.1 %{buildroot}/%{_lib}/libgcc_s.so.1
-%ifarch %{ix86} x86_64 ppc ppc64 ppc64p7 ppc64le %{arm} aarch64 riscv64
+%ifarch %{ix86} x86_64 ppc ppc64 ppc64p7 ppc64le %{arm}
 rm -f $FULLPATH/libgcc_s.so
 echo '/* GNU ld script
    Use the shared library, but some functions are only in
@@ -1757,11 +1286,6 @@ GROUP ( /%{_lib}/libgcc_s.so.1 libgcc.a )' > $FULLPATH/libgcc_s.so
 %else
 ln -sf /%{_lib}/libgcc_s.so.1 $FULLPATH/libgcc_s.so
 %endif
-rm -f $FULLPATH/libgcc_s_asneeded.so
-echo '/* GNU ld script
-   Add DT_NEEDED entry for libgcc_s.so only if needed.  */
-OUTPUT_FORMAT('`gcc -Wl,--print-output-format -nostdlib -r -o /dev/null`')
-INPUT ( AS_NEEDED ( -lgcc_s ) )' > $FULLPATH/libgcc_s_asneeded.so
 %ifarch sparcv9 ppc
 %ifarch ppc
 rm -f $FULLPATH/64/libgcc_s.so
@@ -1773,11 +1297,6 @@ GROUP ( /lib64/libgcc_s.so.1 libgcc.a )' > $FULLPATH/64/libgcc_s.so
 %else
 ln -sf /lib64/libgcc_s.so.1 $FULLPATH/64/libgcc_s.so
 %endif
-rm -f $FULLPATH/64/libgcc_s_asneeded.so
-echo '/* GNU ld script
-   Add DT_NEEDED entry for libgcc_s.so only if needed.  */
-OUTPUT_FORMAT('`gcc -m64 -Wl,--print-output-format -nostdlib -r -o /dev/null`')
-INPUT ( AS_NEEDED ( -lgcc_s ) )' > $FULLPATH/64/libgcc_s_asneeded.so
 %endif
 %ifarch %{multilib_64_archs}
 %ifarch x86_64 ppc64 ppc64p7
@@ -1790,11 +1309,6 @@ GROUP ( /lib/libgcc_s.so.1 libgcc.a )' > $FULLPATH/32/libgcc_s.so
 %else
 ln -sf /lib/libgcc_s.so.1 $FULLPATH/32/libgcc_s.so
 %endif
-rm -f $FULLPATH/32/libgcc_s_asneeded.so
-echo '/* GNU ld script
-   Add DT_NEEDED entry for libgcc_s.so only if needed.  */
-OUTPUT_FORMAT('`gcc -m32 -Wl,--print-output-format -nostdlib -r -o /dev/null`')
-INPUT ( AS_NEEDED ( -lgcc_s ) )' > $FULLPATH/32/libgcc_s_asneeded.so
 %endif
 
 mv -f %{buildroot}%{_prefix}/%{_lib}/libgomp.spec $FULLPATH/
@@ -1815,8 +1329,18 @@ fi
 mkdir -p %{buildroot}%{_datadir}/gdb/auto-load/%{_prefix}/%{_lib}
 mv -f %{buildroot}%{_prefix}/%{_lib}/libstdc++*gdb.py* \
       %{buildroot}%{_datadir}/gdb/auto-load/%{_prefix}/%{_lib}/
-%py_byte_compile %{python3} %{buildroot}%{_prefix}/share/gcc-%{gcc_major}/python/
-%py_byte_compile %{python3} %{buildroot}%{_datadir}/gdb/auto-load/%{_prefix}/%{_lib}/
+pushd ../libstdc++-v3/python
+for i in `find . -name \*.py`; do
+  touch -r $i %{buildroot}%{_prefix}/share/gcc-%{gcc_major}/python/$i
+done
+touch -r hook.in %{buildroot}%{_datadir}/gdb/auto-load/%{_prefix}/%{_lib}/libstdc++*gdb.py
+popd
+for f in `find %{buildroot}%{_prefix}/share/gcc-%{gcc_major}/python/ \
+	       %{buildroot}%{_datadir}/gdb/auto-load/%{_prefix}/%{_lib}/ -name \*.py`; do
+  r=${f/$RPM_BUILD_ROOT/}
+  %{__python3} -c 'import py_compile; py_compile.compile("'$f'", dfile="'$r'")'
+  %{__python3} -O -c 'import py_compile; py_compile.compile("'$f'", dfile="'$r'")'
+done
 
 rm -f $FULLEPATH/libgccjit.so
 cp -a objlibgccjit/gcc/libgccjit.so* %{buildroot}%{_prefix}/%{_lib}/
@@ -1824,15 +1348,6 @@ cp -a ../gcc/jit/libgccjit*.h %{buildroot}%{_prefix}/include/
 /usr/bin/install -c -m 644 objlibgccjit/gcc/doc/libgccjit.info %{buildroot}/%{_infodir}/
 gzip -9 %{buildroot}/%{_infodir}/libgccjit.info
 
-rm -f $FULLEPATH/libgdiagnostics.so
-cp -a objlibgccjit/gcc/libgdiagnostics.so* %{buildroot}%{_prefix}/%{_lib}/
-cp -a ../gcc/libgdiagnostics*.h %{buildroot}%{_prefix}/include/
-cp -a objlibgccjit/gcc/sarif-replay %{buildroot}%{_prefix}/bin/
-
-sed -e 's,\.\./include/,../../../../include/,' \
-  %{buildroot}%{_prefix}/%{_lib}/libstdc++.modules.json \
-  > $FULLPATH/libstdc++.modules.json
-
 pushd $FULLPATH
 if [ "%{_lib}" = "lib" ]; then
 %if %{build_objc}
@@ -1842,40 +1357,23 @@ ln -sf ../../../libstdc++.so.6.*[0-9] libstdc++.so
 ln -sf ../../../libgfortran.so.5.* libgfortran.so
 ln -sf ../../../libgomp.so.1.* libgomp.so
 %if %{build_go}
-ln -sf ../../../libgo.so.25.* libgo.so
+ln -sf ../../../libgo.so.14.* libgo.so
 %endif
 %if %{build_libquadmath}
 ln -sf ../../../libquadmath.so.0.* libquadmath.so
 %endif
 %if %{build_d}
-ln -sf ../../../libgdruntime.so.6.* libgdruntime.so
-ln -sf ../../../libgphobos.so.6.* libgphobos.so
-%endif
-%if %{build_m2}
-for i in cor iso log min pim; do
-  ln -sf ../../../libm2$i.so.21.* libm2$i.so
-done
-%endif
-%if %{build_cobol}
-ln -sf ../../../libgcobol.so.2.* libgcobol.so
-%endif
-%if %{build_algol68}
-ln -sf ../../../libga68.so.2.* libga68.so
+ln -sf ../../../libgdruntime.so.76.* libgdruntime.so
+ln -sf ../../../libgphobos.so.76.* libgphobos.so
 %endif
 %if %{build_libitm}
 ln -sf ../../../libitm.so.1.* libitm.so
 %endif
 %if %{build_libatomic}
 ln -sf ../../../libatomic.so.1.* libatomic.so
-rm -f libatomic_asneeded.so libatomic_asneeded.a
-echo '/* GNU ld script
-   Add DT_NEEDED entry for -latomic only if needed.  */
-OUTPUT_FORMAT('`gcc -Wl,--print-output-format -nostdlib -r -o /dev/null`')
-INPUT ( AS_NEEDED ( -latomic ) )' > libatomic_asneeded.so
-ln -sf libatomic.a libatomic_asneeded.a
 %endif
 %if %{build_libasan}
-ln -sf ../../../libasan.so.8.* libasan.so
+ln -sf ../../../libasan.so.5.* libasan.so
 mv ../../../libasan_preinit.o libasan_preinit.o
 %endif
 %if %{build_libubsan}
@@ -1889,40 +1387,23 @@ ln -sf ../../../../%{_lib}/libstdc++.so.6.*[0-9] libstdc++.so
 ln -sf ../../../../%{_lib}/libgfortran.so.5.* libgfortran.so
 ln -sf ../../../../%{_lib}/libgomp.so.1.* libgomp.so
 %if %{build_go}
-ln -sf ../../../../%{_lib}/libgo.so.25.* libgo.so
+ln -sf ../../../../%{_lib}/libgo.so.14.* libgo.so
 %endif
 %if %{build_libquadmath}
 ln -sf ../../../../%{_lib}/libquadmath.so.0.* libquadmath.so
 %endif
 %if %{build_d}
-ln -sf ../../../../%{_lib}/libgdruntime.so.6.* libgdruntime.so
-ln -sf ../../../../%{_lib}/libgphobos.so.6.* libgphobos.so
-%endif
-%if %{build_m2}
-for i in cor iso log min pim; do
-  ln -sf ../../../../%{_lib}/libm2$i.so.21.* libm2$i.so
-done
-%endif
-%if %{build_cobol}
-ln -sf ../../../../%{_lib}/libgcobol.so.2.* libgcobol.so
-%endif
-%if %{build_algol68}
-ln -sf ../../../../%{_lib}/libga68.so.2.* libga68.so
+ln -sf ../../../../%{_lib}/libgdruntime.so.76.* libgdruntime.so
+ln -sf ../../../../%{_lib}/libgphobos.so.76.* libgphobos.so
 %endif
 %if %{build_libitm}
 ln -sf ../../../../%{_lib}/libitm.so.1.* libitm.so
 %endif
 %if %{build_libatomic}
 ln -sf ../../../../%{_lib}/libatomic.so.1.* libatomic.so
-rm -f libatomic_asneeded.so libatomic_asneeded.a
-echo '/* GNU ld script
-   Add DT_NEEDED entry for -latomic only if needed.  */
-OUTPUT_FORMAT('`gcc -Wl,--print-output-format -nostdlib -r -o /dev/null`')
-INPUT ( AS_NEEDED ( -latomic ) )' > libatomic_asneeded.so
-ln -sf libatomic.a libatomic_asneeded.a
 %endif
 %if %{build_libasan}
-ln -sf ../../../../%{_lib}/libasan.so.8.* libasan.so
+ln -sf ../../../../%{_lib}/libasan.so.5.* libasan.so
 mv ../../../../%{_lib}/libasan_preinit.o libasan_preinit.o
 %endif
 %if %{build_libubsan}
@@ -1930,14 +1411,9 @@ ln -sf ../../../../%{_lib}/libubsan.so.1.* libubsan.so
 %endif
 %if %{build_libtsan}
 rm -f libtsan.so
-echo 'INPUT ( %{_prefix}/%{_lib}/'`echo ../../../../%{_lib}/libtsan.so.2.* | sed 's,^.*libt,libt,'`' )' > libtsan.so
+echo 'INPUT ( %{_prefix}/%{_lib}/'`echo ../../../../%{_lib}/libtsan.so.0.* | sed 's,^.*libt,libt,'`' )' > libtsan.so
 mv ../../../../%{_lib}/libtsan_preinit.o libtsan_preinit.o
 %endif
-%if %{build_libhwasan}
-rm -f libhwasan.so
-echo 'INPUT ( %{_prefix}/%{_lib}/'`echo ../../../../%{_lib}/libhwasan.so.0.* | sed 's,^.*libh,libh,'`' )' > libhwasan.so
-mv ../../../../%{_lib}/libhwasan_preinit.o libhwasan_preinit.o
-%endif
 %if %{build_liblsan}
 rm -f liblsan.so
 echo 'INPUT ( %{_prefix}/%{_lib}/'`echo ../../../../%{_lib}/liblsan.so.0.* | sed 's,^.*libl,libl,'`' )' > liblsan.so
@@ -1946,7 +1422,6 @@ mv ../../../../%{_lib}/liblsan_preinit.o liblsan_preinit.o
 fi
 mv -f %{buildroot}%{_prefix}/%{_lib}/libstdc++.*a $FULLLPATH/
 mv -f %{buildroot}%{_prefix}/%{_lib}/libstdc++fs.*a $FULLLPATH/
-mv -f %{buildroot}%{_prefix}/%{_lib}/libstdc++exp.*a $FULLLPATH/
 mv -f %{buildroot}%{_prefix}/%{_lib}/libsupc++.*a $FULLLPATH/
 mv -f %{buildroot}%{_prefix}/%{_lib}/libgfortran.*a $FULLLPATH/
 %if %{build_objc}
@@ -1960,25 +1435,11 @@ mv -f %{buildroot}%{_prefix}/%{_lib}/libquadmath.*a $FULLLPATH/
 mv -f %{buildroot}%{_prefix}/%{_lib}/libgdruntime.*a $FULLLPATH/
 mv -f %{buildroot}%{_prefix}/%{_lib}/libgphobos.*a $FULLLPATH/
 %endif
-%if %{build_m2}
-for i in cor iso log min pim; do
-  mv -f %{buildroot}%{_prefix}/%{_lib}/libm2$i.*a $FULLLPATH/
-  rm -f m2/m2$i/*.{a,la}
-  ln -sf ../../libm2$i.so m2/m2$i/
-  ln -sf ../../libm2$i.a m2/m2$i/
-done
-%endif
-%if %{build_cobol}
-mv -f %{buildroot}%{_prefix}/%{_lib}/libgcobol.*a $FULLLPATH/
-%endif
-%if %{build_algol68}
-mv -f %{buildroot}%{_prefix}/%{_lib}/libga68.*a $FULLLPATH/
-%endif
 %if %{build_libitm}
 mv -f %{buildroot}%{_prefix}/%{_lib}/libitm.*a $FULLLPATH/
 %endif
 %if %{build_libatomic}
-mv -f %{buildroot}%{_prefix}/%{_lib}/libatomic.*a $FULLPATH/
+mv -f %{buildroot}%{_prefix}/%{_lib}/libatomic.*a $FULLLPATH/
 %endif
 %if %{build_libasan}
 mv -f %{buildroot}%{_prefix}/%{_lib}/libasan.*a $FULLLPATH/
@@ -1989,9 +1450,6 @@ mv -f %{buildroot}%{_prefix}/%{_lib}/libubsan.*a $FULLLPATH/
 %if %{build_libtsan}
 mv -f %{buildroot}%{_prefix}/%{_lib}/libtsan.*a $FULLPATH/
 %endif
-%if %{build_libhwasan}
-mv -f %{buildroot}%{_prefix}/%{_lib}/libhwasan.*a $FULLPATH/
-%endif
 %if %{build_liblsan}
 mv -f %{buildroot}%{_prefix}/%{_lib}/liblsan.*a $FULLPATH/
 %endif
@@ -2013,28 +1471,28 @@ mv -f $FULLPATH/ada{include,lib} $FULLLPATH/
 pushd $FULLLPATH/adalib
 if [ "%{_lib}" = "lib" ]; then
 ln -sf ../../../../../libgnarl-*.so libgnarl.so
-ln -sf ../../../../../libgnarl-*.so libgnarl-%{gcc_major}.so
+ln -sf ../../../../../libgnarl-*.so libgnarl-9.so
 ln -sf ../../../../../libgnat-*.so libgnat.so
-ln -sf ../../../../../libgnat-*.so libgnat-%{gcc_major}.so
+ln -sf ../../../../../libgnat-*.so libgnat-9.so
 else
 ln -sf ../../../../../../%{_lib}/libgnarl-*.so libgnarl.so
-ln -sf ../../../../../../%{_lib}/libgnarl-*.so libgnarl-%{gcc_major}.so
+ln -sf ../../../../../../%{_lib}/libgnarl-*.so libgnarl-9.so
 ln -sf ../../../../../../%{_lib}/libgnat-*.so libgnat.so
-ln -sf ../../../../../../%{_lib}/libgnat-*.so libgnat-%{gcc_major}.so
+ln -sf ../../../../../../%{_lib}/libgnat-*.so libgnat-9.so
 fi
 popd
 else
 pushd $FULLPATH/adalib
 if [ "%{_lib}" = "lib" ]; then
 ln -sf ../../../../libgnarl-*.so libgnarl.so
-ln -sf ../../../../libgnarl-*.so libgnarl-%{gcc_major}.so
+ln -sf ../../../../libgnarl-*.so libgnarl-9.so
 ln -sf ../../../../libgnat-*.so libgnat.so
-ln -sf ../../../../libgnat-*.so libgnat-%{gcc_major}.so
+ln -sf ../../../../libgnat-*.so libgnat-9.so
 else
 ln -sf ../../../../../%{_lib}/libgnarl-*.so libgnarl.so
-ln -sf ../../../../../%{_lib}/libgnarl-*.so libgnarl-%{gcc_major}.so
+ln -sf ../../../../../%{_lib}/libgnarl-*.so libgnarl-9.so
 ln -sf ../../../../../%{_lib}/libgnat-*.so libgnat.so
-ln -sf ../../../../../%{_lib}/libgnat-*.so libgnat-%{gcc_major}.so
+ln -sf ../../../../../%{_lib}/libgnat-*.so libgnat-9.so
 fi
 popd
 fi
@@ -2049,8 +1507,8 @@ ln -sf ../`echo ../../../../lib/libgfortran.so.5.* | sed s~/lib/~/lib64/~` 64/li
 ln -sf ../`echo ../../../../lib/libgomp.so.1.* | sed s~/lib/~/lib64/~` 64/libgomp.so
 %if %{build_go}
 rm -f libgo.so
-echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libgo.so.25.* | sed 's,^.*libg,libg,'`' )' > libgo.so
-echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libgo.so.25.* | sed 's,^.*libg,libg,'`' )' > 64/libgo.so
+echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libgo.so.14.* | sed 's,^.*libg,libg,'`' )' > libgo.so
+echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libgo.so.14.* | sed 's,^.*libg,libg,'`' )' > 64/libgo.so
 %endif
 %if %{build_libquadmath}
 rm -f libquadmath.so
@@ -2059,30 +1517,10 @@ echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libquadmath.so.0.* | sed '
 %endif
 %if %{build_d}
 rm -f libgdruntime.so libgphobos.so
-echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libgdruntime.so.6.* | sed 's,^.*libg,libg,'`' )' > libgdruntime.so
-echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libgdruntime.so.6.* | sed 's,^.*libg,libg,'`' )' > 64/libgdruntime.so
-echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libgphobos.so.6.* | sed 's,^.*libg,libg,'`' )' > libgphobos.so
-echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libgphobos.so.6.* | sed 's,^.*libg,libg,'`' )' > 64/libgphobos.so
-%endif
-%if %{build_m2}
-for i in cor iso log min pim; do
-  rm -f libm2$i.so
-  echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libm2$i.so.21.* | sed 's,^.*libm,libm,'`' )' > libm2$i.so
-  echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libm2$i.so.21.* | sed 's,^.*libm,libm,'`' )' > 64/libm2$i.so
-  rm -f 64/m2/m2$i/*.{a,la}
-  ln -sf ../../libm2$i.so 64/m2/m2$i/
-  ln -sf ../../libm2$i.a 64/m2/m2$i/
-done
-%endif
-%if %{build_cobol}
-rm -f libgcobol.so
-echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libgcobol.so.2.* | sed 's,^.*libg,libg,'`' )' > libgcobol.so
-echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libgcobol.so.2.* | sed 's,^.*libg,libg,'`' )' > 64/libgcobol.so
-%endif
-%if %{build_algol68}
-rm -f libga68.so
-echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libga68.so.2.* | sed 's,^.*libg,libg,'`' )' > libga68.so
-echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libga68.so.2.* | sed 's,^.*libg,libg,'`' )' > 64/libga68.so
+echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libgdruntime.so.76.* | sed 's,^.*libg,libg,'`' )' > libgdruntime.so
+echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libgdruntime.so.76.* | sed 's,^.*libg,libg,'`' )' > 64/libgdruntime.so
+echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libgphobos.so.76.* | sed 's,^.*libg,libg,'`' )' > libgphobos.so
+echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libgphobos.so.76.* | sed 's,^.*libg,libg,'`' )' > 64/libgphobos.so
 %endif
 %if %{build_libitm}
 rm -f libitm.so
@@ -2093,23 +1531,11 @@ echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libitm.so.1.* | sed 's,^.*
 rm -f libatomic.so
 echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libatomic.so.1.* | sed 's,^.*liba,liba,'`' )' > libatomic.so
 echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libatomic.so.1.* | sed 's,^.*liba,liba,'`' )' > 64/libatomic.so
-mv -f %{buildroot}%{_prefix}/lib64/libatomic.*a 64/
-rm -f libatomic_asneeded.so libatomic_asneeded.a 64/libatomic_asneeded.so 64/libatomic_asneeded.a
-echo '/* GNU ld script
-   Add DT_NEEDED entry for -latomic only if needed.  */
-OUTPUT_FORMAT('`gcc -Wl,--print-output-format -nostdlib -r -o /dev/null`')
-INPUT ( AS_NEEDED ( -latomic ) )' > libatomic_asneeded.so
-ln -sf libatomic.a libatomic_asneeded.a
-echo '/* GNU ld script
-   Add DT_NEEDED entry for -latomic only if needed.  */
-OUTPUT_FORMAT('`gcc -m64 -Wl,--print-output-format -nostdlib -r -o /dev/null`')
-INPUT ( AS_NEEDED ( -latomic ) )' > 64/libatomic_asneeded.so
-ln -sf libatomic.a 64/libatomic_asneeded.a
 %endif
 %if %{build_libasan}
 rm -f libasan.so
-echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libasan.so.8.* | sed 's,^.*liba,liba,'`' )' > libasan.so
-echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libasan.so.8.* | sed 's,^.*liba,liba,'`' )' > 64/libasan.so
+echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libasan.so.5.* | sed 's,^.*liba,liba,'`' )' > libasan.so
+echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libasan.so.5.* | sed 's,^.*liba,liba,'`' )' > 64/libasan.so
 mv ../../../../lib64/libasan_preinit.o 64/libasan_preinit.o
 %endif
 %if %{build_libubsan}
@@ -2127,8 +1553,6 @@ ln -sf lib32/libstdc++.a libstdc++.a
 ln -sf ../lib64/libstdc++.a 64/libstdc++.a
 ln -sf lib32/libstdc++fs.a libstdc++fs.a
 ln -sf ../lib64/libstdc++fs.a 64/libstdc++fs.a
-ln -sf lib32/libstdc++exp.a libstdc++exp.a
-ln -sf ../lib64/libstdc++exp.a 64/libstdc++exp.a
 ln -sf lib32/libsupc++.a libsupc++.a
 ln -sf ../lib64/libsupc++.a 64/libsupc++.a
 %if %{build_libquadmath}
@@ -2141,24 +1565,14 @@ ln -sf ../lib64/libgdruntime.a 64/libgdruntime.a
 ln -sf lib32/libgphobos.a libgphobos.a
 ln -sf ../lib64/libgphobos.a 64/libgphobos.a
 %endif
-%if %{build_m2}
-for i in cor iso log min pim; do
-  ln -sf lib32/libm2$i.a libm2$i.a
-  ln -sf ../lib64/libm2$i.a 64/libm2$i.a
-done
-%endif
-%if %{build_cobol}
-ln -sf lib32/libgcobol.a libgcobol.a
-ln -sf ../lib64/libgcobol.a 64/libgcobol.a
-%endif
-%if %{build_algol68}
-ln -sf lib32/libga68.a libga68.a
-ln -sf ../lib64/libga68.a 64/libga68.a
-%endif
 %if %{build_libitm}
 ln -sf lib32/libitm.a libitm.a
 ln -sf ../lib64/libitm.a 64/libitm.a
 %endif
+%if %{build_libatomic}
+ln -sf lib32/libatomic.a libatomic.a
+ln -sf ../lib64/libatomic.a 64/libatomic.a
+%endif
 %if %{build_libasan}
 ln -sf lib32/libasan.a libasan.a
 ln -sf ../lib64/libasan.a 64/libasan.a
@@ -2192,8 +1606,8 @@ ln -sf ../`echo ../../../../lib64/libgfortran.so.5.* | sed s~/../lib64/~/~` 32/l
 ln -sf ../`echo ../../../../lib64/libgomp.so.1.* | sed s~/../lib64/~/~` 32/libgomp.so
 %if %{build_go}
 rm -f libgo.so
-echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libgo.so.25.* | sed 's,^.*libg,libg,'`' )' > libgo.so
-echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libgo.so.25.* | sed 's,^.*libg,libg,'`' )' > 32/libgo.so
+echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libgo.so.14.* | sed 's,^.*libg,libg,'`' )' > libgo.so
+echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libgo.so.14.* | sed 's,^.*libg,libg,'`' )' > 32/libgo.so
 %endif
 %if %{build_libquadmath}
 rm -f libquadmath.so
@@ -2202,30 +1616,10 @@ echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libquadmath.so.0.* | sed '
 %endif
 %if %{build_d}
 rm -f libgdruntime.so libgphobos.so
-echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libgdruntime.so.6.* | sed 's,^.*libg,libg,'`' )' > libgdruntime.so
-echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libgdruntime.so.6.* | sed 's,^.*libg,libg,'`' )' > 32/libgdruntime.so
-echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libgphobos.so.6.* | sed 's,^.*libg,libg,'`' )' > libgphobos.so
-echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libgphobos.so.6.* | sed 's,^.*libg,libg,'`' )' > 32/libgphobos.so
-%endif
-%if %{build_m2}
-for i in cor iso log min pim; do
-  rm -f libm2$i.so
-  echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libm2$i.so.21.* | sed 's,^.*libm,libm,'`' )' > libm2$i.so
-  echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libm2$i.so.21.* | sed 's,^.*libm,libm,'`' )' > 32/libm2$i.so
-  rm -f 32/m2/m2$i/*.{a,la}
-  ln -sf ../../libm2$i.so 32/m2/m2$i/
-  ln -sf ../../libm2$i.a 32/m2/m2$i/
-done
-%endif
-%if %{build_cobol}
-rm -f libgcobol.so
-echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libgcobol.so.2.* | sed 's,^.*libg,libg,'`' )' > libgcobol.so
-#echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libgcobol.so.2.* | sed 's,^.*libg,libg,'`' )' > 32/libgcobol.so
-%endif
-%if %{build_algol68}
-rm -f libga68.so
-echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libga68.so.2.* | sed 's,^.*libg,libg,'`' )' > libga68.so
-echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libga68.so.2.* | sed 's,^.*libg,libg,'`' )' > 32/libga68.so
+echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libgdruntime.so.76.* | sed 's,^.*libg,libg,'`' )' > libgdruntime.so
+echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libgdruntime.so.76.* | sed 's,^.*libg,libg,'`' )' > 32/libgdruntime.so
+echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libgphobos.so.76.* | sed 's,^.*libg,libg,'`' )' > libgphobos.so
+echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libgphobos.so.76.* | sed 's,^.*libg,libg,'`' )' > 32/libgphobos.so
 %endif
 %if %{build_libitm}
 rm -f libitm.so
@@ -2236,23 +1630,11 @@ echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libitm.so.1.* | sed 's,^.*
 rm -f libatomic.so
 echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libatomic.so.1.* | sed 's,^.*liba,liba,'`' )' > libatomic.so
 echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libatomic.so.1.* | sed 's,^.*liba,liba,'`' )' > 32/libatomic.so
-mv -f %{buildroot}%{_prefix}/lib/libatomic.*a 32/
-rm -f libatomic_asneeded.so libatomic_asneeded.a 32/libatomic_asneeded.so 32/libatomic_asneeded.a
-echo '/* GNU ld script
-   Add DT_NEEDED entry for -latomic only if needed.  */
-OUTPUT_FORMAT('`gcc -Wl,--print-output-format -nostdlib -r -o /dev/null`')
-INPUT ( AS_NEEDED ( -latomic ) )' > libatomic_asneeded.so
-ln -sf libatomic.a libatomic_asneeded.a
-echo '/* GNU ld script
-   Add DT_NEEDED entry for -latomic only if needed.  */
-OUTPUT_FORMAT('`gcc -m32 -Wl,--print-output-format -nostdlib -r -o /dev/null`')
-INPUT ( AS_NEEDED ( -latomic ) )' > 32/libatomic_asneeded.so
-ln -sf libatomic.a 32/libatomic_asneeded.a
 %endif
 %if %{build_libasan}
 rm -f libasan.so
-echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libasan.so.8.* | sed 's,^.*liba,liba,'`' )' > libasan.so
-echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libasan.so.8.* | sed 's,^.*liba,liba,'`' )' > 32/libasan.so
+echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libasan.so.5.* | sed 's,^.*liba,liba,'`' )' > libasan.so
+echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libasan.so.5.* | sed 's,^.*liba,liba,'`' )' > 32/libasan.so
 mv ../../../../lib/libasan_preinit.o 32/libasan_preinit.o
 %endif
 %if %{build_libubsan}
@@ -2272,8 +1654,6 @@ ln -sf ../lib32/libstdc++.a 32/libstdc++.a
 ln -sf lib64/libstdc++.a libstdc++.a
 ln -sf ../lib32/libstdc++fs.a 32/libstdc++fs.a
 ln -sf lib64/libstdc++fs.a libstdc++fs.a
-ln -sf ../lib32/libstdc++exp.a 32/libstdc++exp.a
-ln -sf lib64/libstdc++exp.a libstdc++exp.a
 ln -sf ../lib32/libsupc++.a 32/libsupc++.a
 ln -sf lib64/libsupc++.a libsupc++.a
 %if %{build_libquadmath}
@@ -2286,24 +1666,14 @@ ln -sf lib64/libgdruntime.a libgdruntime.a
 ln -sf ../lib32/libgphobos.a 32/libgphobos.a
 ln -sf lib64/libgphobos.a libgphobos.a
 %endif
-%if %{build_m2}
-for i in cor iso log min pim; do
-  ln -sf ../lib32/libm2$i.a 32/libm2$i.a
-  ln -sf lib64/libm2$i.a libm2$i.a
-done
-%endif
-%if %{build_cobol}
-ln -sf ../lib32/libgcobol.a 32/libgcobol.a
-ln -sf lib64/libgcobol.a libgcobol.a
-%endif
-%if %{build_algol68}
-ln -sf ../lib32/libga68.a 32/libga68.a
-ln -sf lib64/libga68.a libga68.a
-%endif
 %if %{build_libitm}
 ln -sf ../lib32/libitm.a 32/libitm.a
 ln -sf lib64/libitm.a libitm.a
 %endif
+%if %{build_libatomic}
+ln -sf ../lib32/libatomic.a 32/libatomic.a
+ln -sf lib64/libatomic.a libatomic.a
+%endif
 %if %{build_libasan}
 ln -sf ../lib32/libasan.a 32/libasan.a
 ln -sf lib64/libasan.a libasan.a
@@ -2331,7 +1701,6 @@ ln -sf lib64/adalib adalib
 ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libgfortran.a 32/libgfortran.a
 ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libstdc++.a 32/libstdc++.a
 ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libstdc++fs.a 32/libstdc++fs.a
-ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libstdc++exp.a 32/libstdc++exp.a
 ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libsupc++.a 32/libsupc++.a
 %if %{build_libquadmath}
 ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libquadmath.a 32/libquadmath.a
@@ -2340,20 +1709,12 @@ ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libqua
 ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libgdruntime.a 32/libgdruntime.a
 ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libgphobos.a 32/libgphobos.a
 %endif
-%if %{build_m2}
-for i in cor iso log min pim; do
-  ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libm2$i.a 32/libm2$i.a
-done
-%endif
-%if %{build_cobol}
-#ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libgcobol.a 32/libgcobol.a
-%endif
-%if %{build_algol68}
-ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libga68.a 32/libga68.a
-%endif
 %if %{build_libitm}
 ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libitm.a 32/libitm.a
 %endif
+%if %{build_libatomic}
+ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libatomic.a 32/libatomic.a
+%endif
 %if %{build_libasan}
 ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libasan.a 32/libasan.a
 %endif
@@ -2374,8 +1735,7 @@ ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/adalib
 
 # If we are building a debug package then copy all of the static archives
 # into the debug directory to keep them as unstripped copies.
-# if 0%{?_enable_debug_packages}
-%if 0
+%if 0%{?_enable_debug_packages}
 for d in . $FULLLSUBDIR; do
   mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/debug%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/$d
   for f in `find $d -maxdepth 1 -a \
@@ -2387,9 +1747,8 @@ for d in . $FULLLSUBDIR; do
 		-o -name libgolibbegin.a -o -name libgomp.a \
 		-o -name libitm.a -o -name liblsan.a \
 		-o -name libobjc.a -o -name libgdruntime.a -o -name libgphobos.a \
-		-o -name libm2\*.a -o -name libquadmath.a -o -name libstdc++.a \
-		-o -name libstdc++fs.a -o -name libstdc++exp.a \
-		-o -name libsupc++.a -o -name libgcobol.a \
+		-o -name libquadmath.a -o -name libstdc++.a \
+		-o -name libstdc++fs.a -o -name libsupc++.a \
 		-o -name libtsan.a -o -name libubsan.a \) -a -type f`; do
     cp -a $f $RPM_BUILD_ROOT%{_prefix}/lib/debug%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/$d/
   done
@@ -2399,11 +1758,10 @@ done
 # Strip debug info from Fortran/ObjC/Java static libraries
 strip -g `find . \( -name libgfortran.a -o -name libobjc.a -o -name libgomp.a \
 		    -o -name libgcc.a -o -name libgcov.a -o -name libquadmath.a \
-		    -o -name libgdruntime.a -o -name libgphobos.a -o -name libm2\*.a \
+		    -o -name libgdruntime.a -o -name libgphobos.a \
 		    -o -name libitm.a -o -name libgo.a -o -name libcaf\*.a \
 		    -o -name libatomic.a -o -name libasan.a -o -name libtsan.a \
-		    -o -name libubsan.a -o -name liblsan.a -o -name libcc1.a \
-		    -o -name libgcobol.a \) \
+		    -o -name libubsan.a -o -name liblsan.a -o -name libcc1.a \) \
 		 -a -type f`
 popd
 chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgfortran.so.5.*
@@ -2413,19 +1771,8 @@ chmod 755 %{buildroot}%{_prefix}/%{_lib}/libcc1.so.0.*
 chmod 755 %{buildroot}%{_prefix}/%{_lib}/libquadmath.so.0.*
 %endif
 %if %{build_d}
-chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgdruntime.so.6.*
-chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgphobos.so.6.*
-%endif
-%if %{build_m2}
-for i in cor iso log min pim; do
-  chmod 755 %{buildroot}%{_prefix}/%{_lib}/libm2$i.so.21.*
-done
-%endif
-%if %{build_cobol}
-chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgcobol.so.2.*
-%endif
-%if %{build_algol68}
-chmod 755 %{buildroot}%{_prefix}/%{_lib}/libga68.so.2.*
+chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgdruntime.so.76.*
+chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgphobos.so.76.*
 %endif
 %if %{build_libitm}
 chmod 755 %{buildroot}%{_prefix}/%{_lib}/libitm.so.1.*
@@ -2434,23 +1781,20 @@ chmod 755 %{buildroot}%{_prefix}/%{_lib}/libitm.so.1.*
 chmod 755 %{buildroot}%{_prefix}/%{_lib}/libatomic.so.1.*
 %endif
 %if %{build_libasan}
-chmod 755 %{buildroot}%{_prefix}/%{_lib}/libasan.so.8.*
+chmod 755 %{buildroot}%{_prefix}/%{_lib}/libasan.so.5.*
 %endif
 %if %{build_libubsan}
 chmod 755 %{buildroot}%{_prefix}/%{_lib}/libubsan.so.1.*
 %endif
 %if %{build_libtsan}
-chmod 755 %{buildroot}%{_prefix}/%{_lib}/libtsan.so.2.*
-%endif
-%if %{build_libhwasan}
-chmod 755 %{buildroot}%{_prefix}/%{_lib}/libhwasan.so.0.*
+chmod 755 %{buildroot}%{_prefix}/%{_lib}/libtsan.so.0.*
 %endif
 %if %{build_liblsan}
 chmod 755 %{buildroot}%{_prefix}/%{_lib}/liblsan.so.0.*
 %endif
 %if %{build_go}
 # Avoid stripping these libraries and binaries.
-chmod 644 %{buildroot}%{_prefix}/%{_lib}/libgo.so.25.*
+chmod 644 %{buildroot}%{_prefix}/%{_lib}/libgo.so.14.*
 chmod 644 %{buildroot}%{_prefix}/bin/go.gcc
 chmod 644 %{buildroot}%{_prefix}/bin/gofmt.gcc
 chmod 644 %{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/cgo
@@ -2467,6 +1811,8 @@ chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgnarl*so*
 chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgnat*so*
 %endif
 
+mv $FULLPATH/include-fixed/syslimits.h $FULLPATH/include/syslimits.h
+mv $FULLPATH/include-fixed/limits.h $FULLPATH/include/limits.h
 for h in `find $FULLPATH/include -name \*.h`; do
   if grep -q 'It has been auto-edited by fixincludes from' $h; then
     rh=`grep -A2 'It has been auto-edited by fixincludes from' $h | tail -1 | sed 's|^.*"\(.*\)".*$|\1|'`
@@ -2510,6 +1856,7 @@ cd ..
 rm -f %{buildroot}%{_prefix}/%{_lib}/{libffi*,libiberty.a} || :
 rm -f $FULLEPATH/install-tools/{mkheaders,fixincl}
 rm -f %{buildroot}%{_prefix}/lib/{32,64}/libiberty.a
+rm -f %{buildroot}%{_prefix}/%{_lib}/libssp*
 rm -f %{buildroot}%{_prefix}/%{_lib}/libvtv* || :
 rm -f %{buildroot}%{_prefix}/bin/%{_target_platform}-gfortran || :
 rm -f %{buildroot}%{_prefix}/bin/%{_target_platform}-gccgo || :
@@ -2518,10 +1865,6 @@ rm -f %{buildroot}%{_prefix}/bin/%{_target_platform}-gcc-ar || :
 rm -f %{buildroot}%{_prefix}/bin/%{_target_platform}-gcc-nm || :
 rm -f %{buildroot}%{_prefix}/bin/%{_target_platform}-gcc-ranlib || :
 rm -f %{buildroot}%{_prefix}/bin/%{_target_platform}-gdc || :
-rm -f %{buildroot}%{_prefix}/bin/%{_target_platform}-gm2 || :
-rm -f %{buildroot}%{_prefix}/bin/%{_target_platform}-gcobc || :
-rm -f %{buildroot}%{_prefix}/bin/%{_target_platform}-gcobol || :
-rm -f %{buildroot}%{_prefix}/bin/%{_target_platform}-ga68 || :
 
 %ifarch %{multilib_64_archs}
 # Remove libraries for the other arch on multilib arches
@@ -2545,96 +1888,23 @@ rm -rf %{buildroot}%{_prefix}/lib64/go/%{gcc_major}/%{gcc_target_platform}
 %endif
 %endif
 
-rm -f %{buildroot}%{_prefix}/lib*/lib*.spec || :
-rm -f %{buildroot}%{_prefix}/lib*/libstdc++.modules.json || :
-rm -f %{buildroot}%{_prefix}/%{_lib}/lib{asan,atomic,gcc_s,gcobol,ga68,gdruntime,gfortran,go,gomp-plugin-*,gomp,gphobos,hwasan}.so || :
-rm -f %{buildroot}%{_prefix}/%{_lib}/lib{itm,lsan,m2{cor,iso,log,min,pim},objc,quadmath,stdc++,tsan,ubsan,gcc_s_asneeded,atomic_asneeded}.so || :
-rm -f %{buildroot}%{_prefix}/%{_lib}/libatomic_asneeded.a || :
-rm -f %{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/install-tools/{fixinc.sh,mkinstalldirs} || :
-rm -f %{buildroot}%{_prefix}/share/locale/*/LC_MESSAGES/libstdc++.mo || :
-rm -f %{buildroot}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include-fixed/README || :
-rm -rf %{buildroot}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/ssp || :
-rm -rf %{buildroot}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/install-tools || :
-%ifarch ppc ppc64 ppc64le ppc64p7
-rm -f %{buildroot}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/{e,n}crt{i,n}.o || :
-%endif
-
-%if %{build_offload_nvptx}
-rm -f %{buildroot}%{_mandir}/man1/*-accel-*nvptx*
-find %{buildroot}%{_prefix}/nvptx-none/lib -name libstdc++.a-gdb.py | xargs rm -f || :
-find %{buildroot}%{_prefix}/nvptx-none/lib -name libstdc++.modules.json | xargs rm -f || :
-%endif
-%if %{build_offload_amdgcn}
-rm -f %{buildroot}%{_mandir}/man1/*-accel-*amdgcn*
-find %{buildroot}%{_prefix}/amdgcn-amdhsa/lib -name libstdc++.a-gdb.py | xargs rm -f || :
-find %{buildroot}%{_prefix}/amdgcn-amdhsa/lib -name libstdc++.modules.json | xargs rm -f || :
-%endif
-rm -f %{buildroot}%{_mandir}/man7/{gpl,gfdl,fsf-funding}.7*
+rm -f %{buildroot}%{mandir}/man3/ffi*
 
 # Help plugins find out nvra.
 echo gcc-%{version}-%{release}.%{_arch} > $FULLPATH/rpmver
 
-# Add symlink to lto plugin in the binutils plugin directory.
-%{__mkdir_p} %{buildroot}%{_libdir}/bfd-plugins/
-ln -s ../../libexec/gcc/%{gcc_target_platform}/%{gcc_major}/liblto_plugin.so \
-  %{buildroot}%{_libdir}/bfd-plugins/
-
-%if %{build_annobin_plugin}
-mkdir -p $FULLPATH/plugin
-rm -f $FULLPATH/plugin/gcc-annobin*
-cp -a %{_builddir}/gcc-%{version}-%{DATE}/annobin-plugin/annobin*/gcc-plugin/.libs/annobin.so.0.0.0 \
-  $FULLPATH/plugin/gcc-annobin.so.0.0.0
-ln -sf gcc-annobin.so.0.0.0 $FULLPATH/plugin/gcc-annobin.so.0
-ln -sf gcc-annobin.so.0.0.0 $FULLPATH/plugin/gcc-annobin.so
-%endif
-
 %check
 cd obj-%{gcc_target_platform}
 
 # run the tests.
 LC_ALL=C make %{?_smp_mflags} -k check ALT_CC_UNDER_TEST=gcc ALT_CXX_UNDER_TEST=g++ \
 %if 0%{?fedora} >= 20 || 0%{?rhel} > 7
-     RUNTESTFLAGS="--target_board=unix/'{-foffload=disable,-fstack-protector-strong/-foffload=disable}'" || :
+     RUNTESTFLAGS="--target_board=unix/'{,-fstack-protector-strong}'" || :
 %else
-     RUNTESTFLAGS="--target_board=unix/'{-foffload=disable,-fstack-protector/-foffload=disable}'" || :
-%endif
-%if !%{build_annobin_plugin}
-if [ -f %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/plugin/annobin.so ]; then
-  # Test whether current annobin plugin won't fail miserably with the newly built gcc.
-  echo -e '#include <stdio.h>\nint main () { printf ("Hello, world!\\n"); return 0; }' > annobin-test.c
-  echo -e '#include <iostream>\nint main () { std::cout << "Hello, world!" << std::endl; return 0; }' > annobin-test.C
-  `%{gcc_target_platform}/libstdc++-v3/scripts/testsuite_flags --build-cc` \
-  -O2 -g -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS \
-  -fexceptions -fstack-protector-strong -grecord-gcc-switches -o annobin-test{c,.c} \
-  -Wl,-rpath,%{gcc_target_platform}/libgcc/ \
-  -fplugin=%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/plugin/annobin.so \
-  2> ANNOBINOUT1 || echo Annobin test 1 FAIL > ANNOBINOUT2;
-  `%{gcc_target_platform}/libstdc++-v3/scripts/testsuite_flags --build-cxx` \
-  `%{gcc_target_platform}/libstdc++-v3/scripts/testsuite_flags --build-includes` \
-  -O2 -g -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS \
-  -fexceptions -fstack-protector-strong -grecord-gcc-switches -o annobin-test{C,.C} \
-  -Wl,-rpath,%{gcc_target_platform}/libgcc/:%{gcc_target_platform}/libstdc++-v3/src/.libs/ \
-  -fplugin=%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/plugin/annobin.so \
-  -B %{gcc_target_platform}/libstdc++-v3/src/.libs/ \
-  2> ANNOBINOUT3 || echo Annobin test 2 FAIL > ANNOBINOUT4;
-  [ -f ./annobin-testc ] || echo Annobin test 1 MISSING > ANNOBINOUT5;
-  [ -f ./annobin-testc ] && \
-  ( ./annobin-testc > ANNOBINRES1 2>&1 || echo Annobin test 1 RUNFAIL > ANNOBINOUT6 );
-  [ -f ./annobin-testC ] || echo Annobin test 2 MISSING > ANNOBINOUT7;
-  [ -f ./annobin-testC ] && \
-  ( ./annobin-testC > ANNOBINRES2 2>&1 || echo Annobin test 2 RUNFAIL > ANNOBINOUT8 );
-  cat ANNOBINOUT[1-8] > ANNOBINOUT
-  touch ANNOBINRES1 ANNOBINRES2
-  [ -s ANNOBINOUT ] && echo Annobin testing FAILed > ANNOBINRES
-  cat ANNOBINOUT ANNOBINRES[12] >> ANNOBINRES
-  rm -f ANNOBINOUT* ANNOBINRES[12] annobin-test{c,C}
-fi
+     RUNTESTFLAGS="--target_board=unix/'{,-fstack-protector}'" || :
 %endif
 echo ====================TESTING=========================
 ( LC_ALL=C ../contrib/test_summary || : ) 2>&1 | sed -n '/^cat.*EOF/,/^EOF/{/^cat.*EOF/d;/^EOF/d;/^LAST_UPDATED:/d;p;}'
-%if !%{build_annobin_plugin}
-[ -f ANNOBINRES ] && cat ANNOBINRES
-%endif
 echo ====================TESTING END=====================
 mkdir testlogs-%{_target_platform}-%{version}-%{release}
 for i in `find . -name \*.log | grep -F testsuite/ | grep -v 'config.log\|acats.*/tests/'`; do
@@ -2654,20 +1924,28 @@ if [ $1 = 0 ]; then
   %{_sbindir}/update-alternatives --remove go %{_prefix}/bin/go.gcc
 fi
 
-%{?ldconfig:
 # Because glibc Prereq's libgcc and /sbin/ldconfig
 # comes from glibc, it might not exist yet when
 # libgcc is installed
 %post -n libgcc -p <lua>
-if posix.access ("%ldconfig", "x") then
-  rpm.execute ("%ldconfig")
+if posix.access ("/sbin/ldconfig", "x") then
+  local pid = posix.fork ()
+  if pid == 0 then
+    posix.exec ("/sbin/ldconfig")
+  elseif pid ~= -1 then
+    posix.wait (pid)
+  end
 end
 
 %postun -n libgcc -p <lua>
-if posix.access ("%ldconfig", "x") then
-  rpm.execute ("%ldconfig")
+if posix.access ("/sbin/ldconfig", "x") then
+  local pid = posix.fork ()
+  if pid == 0 then
+    posix.exec ("/sbin/ldconfig")
+  elseif pid ~= -1 then
+    posix.wait (pid)
+  end
 end
-}
 
 %ldconfig_scriptlets -n libstdc++
 
@@ -2677,8 +1955,6 @@ end
 
 %ldconfig_scriptlets -n libgphobos
 
-%ldconfig_scriptlets -n libgm2
-
 %ldconfig_scriptlets -n libgnat
 
 %ldconfig_scriptlets -n libgomp
@@ -2687,9 +1963,7 @@ end
 
 %ldconfig_scriptlets -n libgccjit
 
-%ldconfig_scriptlets -n libgdiagnostics
-
-%ldconfig_scriptlets -n libquadmath
+%ldconfig_scriptlets -n libgquadmath
 
 %ldconfig_scriptlets -n libitm
 
@@ -2703,8 +1977,6 @@ end
 
 %ldconfig_scriptlets -n liblsan
 
-%ldconfig_scriptlets -n libhwasan
-
 %ldconfig_scriptlets -n libgo
 
 %files -f %{name}.lang
@@ -2718,7 +1990,6 @@ end
 %{_prefix}/bin/gcc-ar
 %{_prefix}/bin/gcc-nm
 %{_prefix}/bin/gcc-ranlib
-%{_prefix}/bin/lto-dump
 %ifarch ppc
 %{_prefix}/bin/%{_target_platform}-gcc
 %endif
@@ -2734,7 +2005,6 @@ end
 %{_mandir}/man1/gcov.1*
 %{_mandir}/man1/gcov-tool.1*
 %{_mandir}/man1/gcov-dump.1*
-%{_mandir}/man1/lto-dump.1*
 %{_infodir}/gcc*
 %dir %{_prefix}/lib/gcc
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}
@@ -2746,7 +2016,6 @@ end
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/lto1
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/lto-wrapper
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/liblto_plugin.so*
-%{_libdir}/bfd-plugins/liblto_plugin.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/rpmver
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/stddef.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/stdarg.h
@@ -2760,15 +2029,12 @@ end
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/unwind.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/omp.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/openacc.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/acc_prof.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/stdint.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/stdint-gcc.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/stdalign.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/stdnoreturn.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/stdatomic.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/gcov.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/stdckdint.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/stdcountof.h
 %ifarch %{ix86} x86_64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/mmintrin.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/xmmintrin.h
@@ -2804,7 +2070,9 @@ end
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/xsaveintrin.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/xsaveoptintrin.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx512cdintrin.h
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx512erintrin.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx512fintrin.h
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx512pfintrin.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/shaintrin.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/mm_malloc.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/mm3dnow.h
@@ -2826,6 +2094,8 @@ end
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/xsavesintrin.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/clzerointrin.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/pkuintrin.h
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx5124fmapsintrin.h
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx5124vnniwintrin.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx512vpopcntdqintrin.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/sgxintrin.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/gfniintrin.h
@@ -2844,51 +2114,6 @@ end
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/movdirintrin.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/waitpkgintrin.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/cldemoteintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx512bf16vlintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx512bf16intrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/enqcmdintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx512vp2intersectintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx512vp2intersectvlintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/serializeintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/tsxldtrkintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/amxtileintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/amxint8intrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/amxbf16intrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/x86gprintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/uintrintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/hresetintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/keylockerintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avxvnniintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/mwaitintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx512fp16intrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx512fp16vlintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avxifmaintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avxvnniint8intrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avxneconvertintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/cmpccxaddintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/amxfp16intrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/prfchiintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/raointintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/amxcomplexintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx512bitalgvlintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avxvnniint16intrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/sha512intrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/sm3intrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/sm4intrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/usermsrintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/amxavx512intrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/amxfp8intrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/amxmovrsintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/amxtf32intrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx10_2bf16intrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx10_2convertintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx10_2copyintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx10_2mediaintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx10_2minmaxintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx10_2satcvtintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/movrsintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx512bmmintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx512bmmvlintrin.h
 %endif
 %ifarch ia64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/ia64intrin.h
@@ -2913,10 +2138,6 @@ end
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/tmmintrin.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/smmintrin.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/amo.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/nmmintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/immintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/x86gprintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/rs6000-vecdefines.h
 %endif
 %ifarch %{arm}
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/unwind-arm-common.h
@@ -2925,18 +2146,11 @@ end
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_acle.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_cmse.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_fp16.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_bf16.h
 %endif
 %ifarch aarch64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_neon.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_acle.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_fp16.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_bf16.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_sve.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_sme.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_neon_sve_bridge.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_private_fp8.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_private_neon_types.h
 %endif
 %ifarch sparc sparcv9 sparc64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/visintrin.h
@@ -2947,14 +2161,6 @@ end
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/htmxlintrin.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/vecintrin.h
 %endif
-%ifarch riscv64
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/riscv_vector.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/riscv_crypto.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/riscv_bitmanip.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/riscv_th_vector.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/sifive_vector.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/andes_vector.h
-%endif
 %if %{build_libasan}
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/sanitizer
 %endif
@@ -2964,7 +2170,6 @@ end
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libgcov.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libgcc_eh.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libgcc_s.so
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libgcc_s_asneeded.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libgomp.spec
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libgomp.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libgomp.so
@@ -2974,9 +2179,6 @@ end
 %if %{build_libasan}
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libsanitizer.spec
 %endif
-%if %{build_isl}
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libisl.so.*
-%endif
 %ifarch sparcv9 ppc
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/crt*.o
@@ -2984,7 +2186,6 @@ end
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libgcov.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libgcc_eh.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libgcc_s.so
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libgcc_s_asneeded.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libgomp.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libgomp.so
 %if %{build_libquadmath}
@@ -2998,8 +2199,6 @@ end
 %if %{build_libatomic}
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libatomic.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libatomic.so
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libatomic_asneeded.a
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libatomic_asneeded.so
 %endif
 %if %{build_libasan}
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libasan.a
@@ -3018,7 +2217,6 @@ end
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libgcov.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libgcc_eh.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libgcc_s.so
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libgcc_s_asneeded.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libgomp.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libgomp.so
 %if %{build_libquadmath}
@@ -3032,8 +2230,6 @@ end
 %if %{build_libatomic}
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libatomic.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libatomic.so
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libatomic_asneeded.a
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libatomic_asneeded.so
 %endif
 %if %{build_libasan}
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libasan.a
@@ -3057,8 +2253,6 @@ end
 %if %{build_libatomic}
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libatomic.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libatomic.so
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libatomic_asneeded.a
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libatomic_asneeded.so
 %endif
 %if %{build_libasan}
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libasan.a
@@ -3071,10 +2265,7 @@ end
 %endif
 %else
 %if %{build_libatomic}
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libatomic.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libatomic.so
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libatomic_asneeded.a
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libatomic_asneeded.so
 %endif
 %if %{build_libasan}
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libasan.so
@@ -3088,16 +2279,12 @@ end
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libtsan.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libtsan_preinit.o
 %endif
-%if %{build_libhwasan}
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libhwasan.so
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libhwasan_preinit.o
-%endif
 %if %{build_liblsan}
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/liblsan.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/liblsan_preinit.o
 %endif
 %{_prefix}/libexec/getconf/default
-%doc gcc/README* rpm.doc/changelogs/gcc/ChangeLog*
+%doc gcc/README* rpm.doc/changelogs/gcc/ChangeLog* 
 %{!?_licensedir:%global license %%doc}
 %license gcc/COPYING* COPYING.RUNTIME
 
@@ -3129,13 +2316,11 @@ end
 %dir %{_prefix}/libexec/gcc/%{gcc_target_platform}
 %dir %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/cc1plus
-%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/g++-mapper-server
 %ifarch sparcv9 ppc
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libstdc++.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libstdc++.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libstdc++fs.a
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libstdc++exp.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libsupc++.a
 %endif
 %ifarch %{multilib_64_archs}
@@ -3143,7 +2328,6 @@ end
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libstdc++.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libstdc++.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libstdc++fs.a
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libstdc++exp.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libsupc++.a
 %endif
 %ifarch sparcv9 ppc %{multilib_64_archs}
@@ -3152,7 +2336,6 @@ end
 %ifarch sparcv9 sparc64 ppc ppc64 ppc64p7
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libstdc++.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libstdc++fs.a
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libstdc++exp.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libsupc++.a
 %endif
 %doc rpm.doc/changelogs/gcc/cp/ChangeLog*
@@ -3163,10 +2346,6 @@ end
 %dir %{_datadir}/gdb/auto-load
 %dir %{_datadir}/gdb/auto-load/%{_prefix}
 %dir %{_datadir}/gdb/auto-load/%{_prefix}/%{_lib}/
-# Package symlink to keep compatibility
-%ifarch riscv64
-%{_datadir}/gdb/auto-load/%{_prefix}/%{_lib}/lp64d
-%endif
 %{_datadir}/gdb/auto-load/%{_prefix}/%{_lib}/libstdc*gdb.py*
 %{_datadir}/gdb/auto-load/%{_prefix}/%{_lib}/__pycache__
 %dir %{_prefix}/share/gcc-%{gcc_major}
@@ -3182,20 +2361,16 @@ end
 %ifnarch sparcv9 ppc %{multilib_64_archs}
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libstdc++.so
 %endif
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libstdc++.modules.json
 %ifarch sparcv9 ppc
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib32
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib32/libstdc++fs.a
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib32/libstdc++exp.a
 %endif
 %ifarch sparc64 ppc64 ppc64p7
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib64/libstdc++fs.a
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib64/libstdc++exp.a
 %endif
 %ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libstdc++fs.a
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libstdc++exp.a
 %endif
 %doc rpm.doc/changelogs/libstdc++-v3/ChangeLog* libstdc++-v3/README*
 
@@ -3366,8 +2541,8 @@ end
 %doc rpm.doc/gdc/*
 
 %files -n libgphobos
-%{_prefix}/%{_lib}/libgdruntime.so.6*
-%{_prefix}/%{_lib}/libgphobos.so.6*
+%{_prefix}/%{_lib}/libgdruntime.so.76*
+%{_prefix}/%{_lib}/libgphobos.so.76*
 %doc rpm.doc/libphobos/*
 
 %files -n libgphobos-static
@@ -3390,133 +2565,6 @@ end
 %endif
 %endif
 
-%if %{build_m2}
-%files gm2
-%{_prefix}/bin/gm2
-%{_mandir}/man1/gm2.1*
-%{_infodir}/m2*
-%dir %{_prefix}/lib/gcc
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}
-%dir %{_prefix}/libexec/gcc
-%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}
-%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/plugin
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/m2
-%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/cc1gm2
-%ifarch sparcv9 sparc64 ppc ppc64 ppc64p7
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libm2*.a
-%endif
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libm2*.so
-%ifarch sparcv9 ppc
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/m2
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libm2*.a
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libm2*.so
-%endif
-%ifarch %{multilib_64_archs}
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/m2
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libm2*.a
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libm2*.so
-%endif
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/plugin/m2rte.so
-%doc rpm.doc/gm2/*
-
-%files -n libgm2
-%{_prefix}/%{_lib}/libm2*.so.21*
-%doc rpm.doc/libgm2/*
-
-%files -n libgm2-static
-%dir %{_prefix}/lib/gcc
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}
-%ifarch sparcv9 ppc
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib32
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib32/libm2*.a
-%endif
-%ifarch sparc64 ppc64 ppc64p7
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib64
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib64/libm2*.a
-%endif
-%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libm2*.a
-%endif
-%endif
-
-%if %{build_cobol}
-%files gcobol
-%{_prefix}/bin/gcobol
-%{_prefix}/bin/gcobc
-%{_mandir}/man1/gcobol.1*
-%{_mandir}/man3/gcobol-io.3*
-%dir %{_prefix}/libexec/gcc
-%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}
-%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}
-%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/cobol1
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libgcobol.spec
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libgcobol.so
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/cobol
-%doc rpm.doc/gcobol/*
-
-%files -n libgcobol
-%{_prefix}/%{_lib}/libgcobol.so.2*
-%doc rpm.doc/libgcobol/*
-
-%files -n libgcobol-static
-%dir %{_prefix}/lib/gcc
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libgcobol.a
-%endif
-
-%if %{build_algol68}
-%files algol68
-%{_prefix}/bin/ga68
-%{_mandir}/man1/ga68.1*
-%dir %{_prefix}/libexec/gcc
-%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}
-%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}
-%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/a681
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libga68.spec
-%ifarch sparcv9 sparc64 ppc ppc64 ppc64p7
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libga68.a
-%endif
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libga68.so
-%ifarch sparcv9 ppc
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libga68.a
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libga68.so
-%endif
-%ifarch %{multilib_64_archs}
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libga68.a
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libga68.so
-%endif
-%{_infodir}/ga68*
-%doc rpm.doc/algol68/*
-
-%files -n libga68
-%{_prefix}/%{_lib}/libga68.so.2*
-%doc rpm.doc/libga68/*
-
-%files -n libga68-static
-%dir %{_prefix}/lib/gcc
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}
-%ifarch sparcv9 ppc
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib32
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib32/libga68.a
-%endif
-%ifarch sparc64 ppc64 ppc64p7
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib64
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib64/libga68.a
-%endif
-%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libga68.a
-%endif
-%endif
-
 %if %{build_ada}
 %files gnat
 %{_prefix}/bin/gnat
@@ -3532,19 +2580,16 @@ end
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/adainclude
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/adalib
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/ada_target_properties
 %endif
 %ifarch %{multilib_64_archs}
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/adainclude
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/adalib
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/ada_target_properties
 %endif
 %ifarch sparcv9 sparc64 ppc ppc64 ppc64p7
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/adainclude
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/adalib
 %endif
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/ada_target_properties
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/gnat1
 %doc rpm.doc/changelogs/gcc/ada/ChangeLog*
 
@@ -3678,12 +2723,28 @@ end
 %if %{build_libatomic}
 %files -n libatomic
 %{_prefix}/%{_lib}/libatomic.so.1*
+
+%files -n libatomic-static
+%dir %{_prefix}/lib/gcc
+%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
+%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}
+%ifarch sparcv9 ppc
+%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib32
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib32/libatomic.a
+%endif
+%ifarch sparc64 ppc64 ppc64p7
+%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib64
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib64/libatomic.a
+%endif
+%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libatomic.a
+%endif
 %doc rpm.doc/changelogs/libatomic/ChangeLog*
 %endif
 
 %if %{build_libasan}
 %files -n libasan
-%{_prefix}/%{_lib}/libasan.so.8*
+%{_prefix}/%{_lib}/libasan.so.5*
 
 %files -n libasan-static
 %dir %{_prefix}/lib/gcc
@@ -3731,7 +2792,7 @@ end
 
 %if %{build_libtsan}
 %files -n libtsan
-%{_prefix}/%{_lib}/libtsan.so.2*
+%{_prefix}/%{_lib}/libtsan.so.0*
 
 %files -n libtsan-static
 %dir %{_prefix}/lib/gcc
@@ -3743,20 +2804,6 @@ end
 %license libsanitizer/LICENSE.TXT
 %endif
 
-%if %{build_libhwasan}
-%files -n libhwasan
-%{_prefix}/%{_lib}/libhwasan.so.0*
-
-%files -n libhwasan-static
-%dir %{_prefix}/lib/gcc
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libhwasan.a
-%doc rpm.doc/changelogs/libsanitizer/ChangeLog*
-%{!?_licensedir:%global license %%doc}
-%license libsanitizer/LICENSE.TXT
-%endif
-
 %if %{build_liblsan}
 %files -n liblsan
 %{_prefix}/%{_lib}/liblsan.so.0*
@@ -3817,8 +2864,7 @@ end
 %doc rpm.doc/go/*
 
 %files -n libgo
-%{_prefix}/%{_lib}/libgo.so.25
-%attr(755,root,root) %{_prefix}/%{_lib}/libgo.so.25.*
+%attr(755,root,root) %{_prefix}/%{_lib}/libgo.so.14*
 %doc rpm.doc/libgo/*
 
 %files -n libgo-devel
@@ -3879,15 +2925,6 @@ end
 %doc rpm.doc/libgccjit-devel/*
 %doc gcc/jit/docs/examples
 
-%files -n libgdiagnostics
-%{_prefix}/bin/sarif-replay
-%{_prefix}/%{_lib}/libgdiagnostics.so.*
-
-%files -n libgdiagnostics-devel
-%{_prefix}/%{_lib}/libgdiagnostics.so
-%{_prefix}/include/libgdiagnostics*.h
-%doc rpm.doc/libgdiagnostics-devel/*
-
 %files plugin-devel
 %dir %{_prefix}/lib/gcc
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}
@@ -3914,7 +2951,6 @@ end
 %files offload-nvptx
 %{_prefix}/bin/nvptx-none-*
 %{_prefix}/bin/%{gcc_target_platform}-accel-nvptx-none-gcc
-%{_prefix}/bin/%{gcc_target_platform}-accel-nvptx-none-lto-dump
 %dir %{_prefix}/lib/gcc
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}
@@ -3934,130 +2970,523 @@ end
 %{_prefix}/%{_lib}/libgomp-plugin-nvptx.so.*
 %endif
 
-%if %{build_offload_amdgcn}
-%files offload-amdgcn
-%{_prefix}/bin/amdgcn-amdhsa-*
-%{_prefix}/bin/%{gcc_target_platform}-accel-amdgcn-amdhsa-gcc
-%{_prefix}/bin/%{gcc_target_platform}-accel-amdgcn-amdhsa-lto-dump
-%dir %{_prefix}/lib/gcc
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/accel
-%dir %{_prefix}/libexec/gcc
-%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}
-%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}
-%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/accel
-%{_prefix}/lib/gcc/amdgcn-amdhsa
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/accel/amdgcn-amdhsa
-%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/accel/amdgcn-amdhsa
-%dir %{_prefix}/amdgcn-amdhsa
-%{_prefix}/amdgcn-amdhsa/bin
-%{_prefix}/amdgcn-amdhsa/include
-
-%files -n libgomp-offload-amdgcn
-%{_prefix}/%{_lib}/libgomp-plugin-gcn.so.*
-%endif
-
-%if %{build_annobin_plugin}
-%files plugin-annobin
-%dir %{_prefix}/lib/gcc
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/plugin
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/plugin/gcc-annobin.so
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/plugin/gcc-annobin.so.0
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/plugin/gcc-annobin.so.0.0.0
-%endif
-
 %changelog
-* Thu Jan 15 2026 Jakub Jelinek <jakub@redhat.com> 16.0.1-0.3
-- update from trunk
-  - PRs c/123309, c++/120775, c++/122634, c++/123081, c++/123551,
-	debug/121045, driver/108865, driver/123504, ipa/122852, ipa/123542,
-	middle-end/123115, middle-end/123392, middle-end/123573,
-	rtl-optimization/123312, rtl-optimization/123544, target/38118,
-	target/114528, target/120250, target/121240, target/123092,
-	testsuite/122522, tree-optimization/119402, tree-optimization/120322,
-	tree-optimization/123109, tree-optimization/123190,
-	tree-optimization/123530
+* Wed Apr  8 2020 Jakub Jelinek <jakub@redhat.com> 9.3.1-2
+- update from 9 branch
+  - PRs c++/84733, c++/90711, c++/90995, c++/91377, c++/91966, c++/93931,
+	c++/94385, c++/94453, c++/94477, c++/94512, c/94172, c/94239, d/94240,
+	debug/94277, debug/94283, debug/94459, driver/92757, fortran/85982,
+	fortran/93484, fortran/93498, fortran/93686, fortran/94030,
+	fortran/94348, gcov-profile/94029, ipa/94445, libstdc++/93960,
+	lto/94249, middle-end/94206, middle-end/94303, middle-end/94412,
+	middle-end/94423, target/87583, target/90763, target/91833,
+	target/91834, target/93069, target/93709, target/93819, target/94052,
+	target/94368, target/94435, target/94460, target/94488, target/94500,
+	target/94509, target/94518, testsuite/93935, tree-optimization/93435,
+	tree-optimization/94103, tree-optimization/94125,
+	tree-optimization/94211, tree-optimization/94329
+  - fix C++ ICE in get_fns (#1821077, PR c++/93597)
 
-* Tue Jan 13 2026 Jakub Jelinek <jakub@redhat.com> 16.0.1-0.2
-- update from trunk
-  - PRs fortran/91960, fortran/112460, libstdc++/123396,
-	rtl-optimization/123444, rtl-optimization/123501, target/117581,
-	target/123484, testsuite/123098, tree-optimization/122843,
-	tree-optimization/122845, tree-optimization/123301,
-	tree-optimization/123525, tree-optimization/123539
+* Tue Mar 17 2020 Jakub Jelinek <jakub@redhat.com> 9.3.1-1
+- update from 9 branch
+  - GCC 9.3 release
+  - PRs ada/91100, c++/60503, c++/86917, c++/88256, c++/88395, c++/89357,
+	c++/90333, c++/90338, c++/90432, c++/90505, c++/90546, c++/90731,
+	c++/90732, c++/90938, c++/90951, c++/90966, c++/90997, c++/91118,
+	c++/91607, c++/91826, c++/91953, c++/92003, c++/92068, c++/92601,
+	c++/92745, c++/92852, c++/92909, c++/93140, c++/93248, c++/93279,
+	c++/93299, c++/93442, c++/93551, c++/93557, c++/93676, c++/93905,
+	c/93576, c/93949, debug/92763, debug/93888, debug/94167,
+	fortran/92976, fortran/93309, fortran/93462, fortran/93463,
+	fortran/93541, fortran/93580, fortran/93599, fortran/93714,
+	fortran/93835, gcov-profile/93753, libbacktrace/91908, libgcc/85334,
+	libgomp/93515, libstdc++/78552, libstdc++/91910, libstdc++/92376,
+	libstdc++/92886, libstdc++/93205, libstdc++/93244, libstdc++/93325,
+	libstdc++/93470, libstdc++/93562, libstdc++/94063, libstdc++/94069,
+	libstdc++/94199, lto/93966, middle-end/90313, middle-end/90648,
+	middle-end/92674, middle-end/92768, middle-end/93054,
+	middle-end/93399, middle-end/93505, middle-end/93555,
+	middle-end/93566, middle-end/94111, middle-end/94189, other/93965,
+	rtl-optimization/88879, rtl-optimization/91838,
+	rtl-optimization/93402, rtl-optimization/93908,
+	rtl-optimization/94002, rtl-optimization/94119, sanitizer/93436,
+	target/65782, target/87560, target/90311, target/90724, target/91276,
+	target/91913, target/92424, target/92692, target/93047, target/93304,
+	target/93418, target/93568, target/93637, target/93656, target/93658,
+	target/93670, target/93673, target/93696, target/93704, target/93724,
+	target/93743, target/93800, target/93828, target/93913, target/94046,
+	target/94121, target/94134, testsuite/92398, testsuite/94019,
+	testsuite/94023, testsuite/94036, tree-optimization/92420,
+	tree-optimization/92704, tree-optimization/92710,
+	tree-optimization/93381, tree-optimization/93434,
+	tree-optimization/93439, tree-optimization/93744,
+	tree-optimization/93767, tree-optimization/93820,
+	tree-optimization/93945, tree-optimization/94001,
+	tree-optimization/94114, tree-optimization/94130,
+	tree-optimization/94163
 
-* Mon Jan 12 2026 Jakub Jelinek <jakub@redhat.com> 16.0.1-0.1
-- update from trunk
-  - PRs c++/81337, c++/115163, c++/123526, fortran/77415, ipa/122458,
-	ipa/123543, libfortran/123012, middle-end/123175,
-	rtl-optimization/123523, target/123415, testsuite/121752,
-	testsuite/123129, tree-optimization/122824, tree-optimization/122830,
-	tree-optimization/123417, tree-optimization/123528
+* Thu Jan 23 2020 Jakub Jelinek <jakub@redhat.com> 9.2.1-3
+- update from 9 branch
+  - PRs ada/92362, ada/92489, ada/92575, c++/57082, c++/60228, c++/61414,
+	c++/90842, c++/91476, c++/92150, c++/92438, c++/92446, c++/92524,
+	c++/92531, c++/92648, c++/92695, c++/92732, c++/92831, c++/92859,
+	c++/92992, c++/93228, c++/93286, c/90677, c/93072, c/93241, c/93348,
+	debug/92664, fortran/84135, fortran/91783, fortran/91944,
+	fortran/92050, fortran/92100, fortran/92569, fortran/92629,
+	fortran/92753, fortran/92756, fortran/92775, fortran/92781,
+	fortran/92897, fortran/92898, fortran/92899, fortran/92961,
+	fortran/92977, fortran/93236, fortran/93329, inline-asm/93202,
+	ipa/84963, ipa/92357, ipa/92971, ipa/93087, ipa/93223,
+	libfortran/93234, libgomp/93065, libgomp/93066, libgomp/93219,
+	libstdc++/81091, libstdc++/91786, libstdc++/91947, libstdc++/92267,
+	libstdc++/92853, libstdc++/93201, libstdc++/93208, middle-end/90796,
+	middle-end/91226, middle-end/93246, other/92090,
+	rtl-optimization/92591, rtl-optimization/93088, target/67834,
+	target/91298, target/92098, target/92132, target/92499, target/92545,
+	target/92615, target/92723, target/92904, target/92950, target/93009,
+	target/93073, target/93111, target/93182, target/93188, target/93254,
+	target/93333, target/93335, tree-optimization/91355,
+	tree-optimization/92222, tree-optimization/92644,
+	tree-optimization/92930
 
-* Sat Jan 10 2026 Jakub Jelinek <jakub@redhat.com> 16.0.0-0.5
-- update from trunk
-  - PRs ada/123003, ada/123371, ada/123490, c/117687, c/121081, c/121507,
-	c/123212, c/123435, c/123463, c/123475, c++/123331, c++/123347,
-	c++/123393, debug/123259, fortran/90218, fortran/123012,
-	fortran/123029, fortran/123071, fortran/123321, fortran/123352,
-	fortran/123483, gcov-profile/123019, ipa/123383, libstdc++/122878,
-	libstdc++/123100, libstdc++/123183, libstdc++/123326,
-	libstdc++/123378, libstdc++/123406, middle-end/111817,
-	middle-end/123107, rtl-optimization/119291, rtl-optimization/121675,
-	rtl-optimization/121773, rtl-optimization/123121,
-	rtl-optimization/123491, target/119430, target/121192, target/121290,
-	target/121535, target/121778, target/122846, target/123010,
-	target/123017, target/123268, target/123269, target/123317,
-	target/123320, target/123390, target/123403, target/123457,
-	target/123489, target/123492, testsuite/123353, testsuite/123377,
-	tree-optimization/42196, tree-optimization/102486,
-	tree-optimization/102954, tree-optimization/122103,
-	tree-optimization/122608, tree-optimization/122793,
-	tree-optimization/123197, tree-optimization/123200,
-	tree-optimization/123221, tree-optimization/123298,
-	tree-optimization/123300, tree-optimization/123310,
-	tree-optimization/123315, tree-optimization/123316,
-	tree-optimization/123319, tree-optimization/123351,
-	tree-optimization/123372, tree-optimization/123374,
-	tree-optimization/123382, tree-optimization/123414,
-	tree-optimization/123431
-- fix ICE on friend with noexcept (PR c++/123189)
-- fix -E -fdirectives-only comment handling (PR preprocessor/123273)
-- provide libatomic-static from gcc subpackage
+* Wed Nov 20 2019 Jakub Jelinek <jakub@redhat.com> 9.2.1-2
+- update from 9 branch
+  - PRs ada/91995, bootstrap/90543, c++/85254, c++/88203, c++/90767,
+	c++/90947, c++/90998, c++/91129, c++/91155, c++/91606, c++/91705,
+	c++/91740, c++/91923, c++/91925, c++/91974, c++/92015, c++/92062,
+	c++/92106, c++/92201, c++/92343, c++/92384, c++/92504, c/90898,
+	c/91401, debug/91772, debug/91887, driver/69471, fortran/47054,
+	fortran/69455, fortran/83113, fortran/84487, fortran/86248,
+	fortran/87752, fortran/89943, fortran/91253, fortran/91496,
+	fortran/91550, fortran/91551, fortran/91552, fortran/91553,
+	fortran/91557, fortran/91564, fortran/91565, fortran/91566,
+	fortran/91586, fortran/91587, fortran/91588, fortran/91589,
+	fortran/91641, fortran/91642, fortran/91649, fortran/91660,
+	fortran/91714, fortran/91715, fortran/91716, fortran/91727,
+	fortran/91785, fortran/91801, fortran/91802, fortran/91863,
+	fortran/91864, fortran/91926, fortran/91942, fortran/92113,
+	fortran/92174, fortran/92208, fortran/92277, fortran/92284,
+	fortran/92321, fortran/92470, fortran/92500, gcov-profile/91601,
+	go/91617, libfortran/90038, libstdc++/61761, libstdc++/89164,
+	libstdc++/90682, libstdc++/91067, libstdc++/91456, libstdc++/91748,
+	libstdc++/92059, libstdc++/92143, lto/91572, lto/91968,
+	middle-end/90840, middle-end/91001, middle-end/91105,
+	middle-end/91106, middle-end/91450, middle-end/91623,
+	middle-end/91920, middle-end/92153, middle-end/92231, pch/61250,
+	preprocessor/92296, rtl-optimization/88751, rtl-optimization/89435,
+	rtl-optimization/89795, rtl-optimization/91720,
+	rtl-optimization/92007, rtl-optimization/92430, sanitizer/92154,
+	target/59888, target/65342, target/67183, target/70010, target/80672,
+	target/81800, target/86040, target/86805, target/87243, target/87833,
+	target/87853, target/88167, target/88562, target/88630, target/89400,
+	target/90867, target/91269, target/91275, target/91289, target/91472,
+	target/91481, target/91635, target/91683, target/91704, target/91769,
+	target/92022, target/92093, target/92095, target/92225, target/92389,
+	tree-optimization/85887, tree-optimization/90278,
+	tree-optimization/90637, tree-optimization/90930,
+	tree-optimization/91351, tree-optimization/91568,
+	tree-optimization/91597, tree-optimization/91632,
+	tree-optimization/91665, tree-optimization/91723,
+	tree-optimization/91734, tree-optimization/91790,
+	tree-optimization/91812, tree-optimization/91885,
+	tree-optimization/92056, tree-optimization/92131
 
-* Sat Jan  3 2026 Jakub Jelinek <jakub@redhat.com> 16.0.0-0.4
-- update from trunk
-  - PRs ada/123060, ada/123088, ada/123185, ada/123289, ada/123302,
-	ada/123306, ada/15605, c++/117518, c++/119097, c++/120005, c++/121864,
-	c++/122550, c++/122690, c++/122712, c++/122819, c++/122958,
-	c++/122994, c++/123080, c++/123261, c++/123277, fortran/101399,
-	fortran/121472, fortran/121475, fortran/122957, fortran/123201,
-	fortran/123253, libfortran/119136, middle-end/123067,
-	middle-end/123222, other/122243, rtl-optimization/123114,
-	rtl-optimization/123267, rtl-optimization/123276,
-	rtl-optimization/123295, rtl-optimization/123308, target/121485,
-	target/122769, target/123216, target/123217, target/123274,
-	target/123278, target/123283, target/123318, testsuite/123299,
-	testsuite/123334, tree-optimization/123089
-- require libatomic package from gcc package as -latomic is now linked
-  as-needed by default
-- remove libatomic-static package, move libatomic.a into gcc package
+* Wed Oct  9 2019 Jerry James <loganjerry@gmail.com> 9.2.1-1.3
+- build against mpfr4 and libmpc linked with mpfr4
+- drop multilib support for s390x since glibc32 already did
 
-* Sat Dec 20 2025 Jakub Jelinek <jakub@redhat.com> 16.0.0-0.3
-- update from trunk
-  - PRs bootstrap/12407, c/123156, c++/91388, c++/117034, c++/122070,
-	c++/122509, c++/122690, c++/122712, c++/122772, c++/122834,
-	c++/122922, c++/122995, c++/123030, c++/123044, c++/123186,
-	debug/122968, fortran/71565, fortran/92613, libstdc++/112591,
-	libstdc++/123147, libstdc++/123180, rtl-optimization/123223,
-	target/55212, target/122970, target/123171, target/123216,
-	target/123217, tree-optimization/122734, tree-optimization/123097,
-	tree-optimization/123117, tree-optimization/123118,
-	tree-optimization/123152, tree-optimization/123153,
-	tree-optimization/123192, tree-optimization/123205
+* Tue Oct  8 2019 Jerry James <loganjerry@gmail.com> 9.2.1-1.2
+- build against mpfr3 and libmpc-mpfr3 so an mpfr 4.x version can be built
 
-* Thu Dec 18 2025 Jakub Jelinek <jakub@redhat.com> 16.0.0-0.2
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> 9.2.1-1.1
+- rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Tue Aug 27 2019 Jakub Jelinek <jakub@redhat.com> 9.2.1-1
+- update from 9 branch
+  - GCC 9.2 release
+  - PRs ada/80590, bootstrap/87030, c++/60223, c++/63149, c++/64372,
+	c++/81429, c++/82081, c++/85552, c++/86205, c++/87519, c++/88095,
+	c++/90098, c++/90099, c++/90101, c++/90393, c++/90473, c++/90490,
+	c++/90538, c++/90736, c++/90810, c++/90825, c++/90832, c++/90884,
+	c++/90947, c++/90950, c++/91024, c++/91125, c++/91230, c++/91378,
+	c++/91436, c++/91521, c/53633, c/90474, c/90737, c/90760, c/91149,
+	c/91192, debug/90900, debug/90914, debug/91231, driver/90684,
+	driver/91130, driver/91172, fortran/42546, fortran/68544,
+	fortran/69398, fortran/69499, fortran/77632, fortran/78719,
+	fortran/78739, fortran/82992, fortran/86587, fortran/87233,
+	fortran/87907, fortran/87991, fortran/87993, fortran/88072,
+	fortran/89344, fortran/89647, fortran/90002, fortran/90290,
+	fortran/90561, fortran/90563, fortran/90577, fortran/90578,
+	fortran/90744, fortran/90786, fortran/90813, fortran/90937,
+	fortran/91077, fortran/91296, fortran/91359, fortran/91414,
+	fortran/91422, fortran/91424, fortran/91471, fortran/91485,
+	gcov-profile/91087, ipa/90939, ipa/90982, ipa/91062, ipa/91404,
+	ipa/91438, ipa/91508, libfortran/91030, libsanitizer/87880,
+	libstdc++/51333, libstdc++/85494, libstdc++/90252, libstdc++/90281,
+	libstdc++/90361, libstdc++/90770, libstdc++/90920, libstdc++/91012,
+	libstdc++/91067, libstdc++/91308, lto/90369, lto/90924, lto/91287,
+	lto/91375, middle-end/64242, middle-end/78884, middle-end/90899,
+	middle-end/91131, middle-end/91162, middle-end/91216,
+	middle-end/91301, objc/90709, rtl-optimisation/64895,
+	rtl-optimization/90756, rtl-optimization/91136,
+	rtl-optimization/91173, rtl-optimization/91347, sanitizer/90954,
+	target/63891, target/83531, target/90698, target/90751, target/90811,
+	target/90991, target/91135, target/91150, target/91349, target/91386,
+	target/91533, testsuite/27221, testsuite/58321, testsuite/65364,
+	testsuite/67958, testsuite/78529, testsuite/91004, testsuite/91175,
+	tree-optimization/90328, tree-optimization/90402,
+	tree-optimization/90450, tree-optimization/90892,
+	tree-optimization/90930, tree-optimization/90949,
+	tree-optimization/90972, tree-optimization/90989,
+	tree-optimization/91063, tree-optimization/91091,
+	tree-optimization/91108, tree-optimization/91109,
+	tree-optimization/91126, tree-optimization/91137,
+	tree-optimization/91145, tree-optimization/91157,
+	tree-optimization/91178, tree-optimization/91200,
+	tree-optimization/91280, tree-optimization/91293,
+	tree-optimization/91445
+
+* Wed Jun  5 2019 Jakub Jelinek <jakub@redhat.com> 9.1.1-2
+- update from 9 branch
+  - PRs bootstrap/90543, c++/78010, c++/90173, c++/90265, c++/90383,
+	c++/90484, c++/90532, c++/90548, c++/90572, c++/90598, debug/90197,
+	debug/90733, fortran/54613, fortran/90093, fortran/90329,
+	fortran/90351, fortran/90352, fortran/90355, fortran/90498,
+	gcov-profile/90380, libfortran/90038, libgomp/90527, libgomp/90585,
+	libgomp/90641, libstdc++/81266, libstdc++/90299, libstdc++/90397,
+	libstdc++/90454, libstdc++/90557, libstdc++/90634, libstdc++/90686,
+	libstdc++/90700, pch/90326, sanitizer/90312, sanitizer/90570,
+	target/82920, target/89424, target/89765, target/90357, target/90379,
+	target/90530, target/90547, testsuite/81058, tree-optimization/90385,
+	tree-optimization/90416
+
+* Fri May  3 2019 Jakub Jelinek <jakub@redhat.com> 9.1.1-1
+- update from 9 branch
+  - GCC 9.1 release
+  - PR tree-optimization/90316
+- fix up devirtualization ICE with fastcall attribute (#1705081,
+  PR tree-optimization/90303)
+- move Obsoletes for lib{cilkrts,mpx}{,-static} from gcc to libgcc subpackage
+
+* Tue Apr 30 2019 Jakub Jelinek <jakub@redhat.com> 9.0.1-0.16
+- update from 9 branch
+  - gcc 9.1-rc2
+  - PRs middle-end/90258, target/86538, translation/90274,
+	tree-optimization/90273
+- enable D on s390{,x} and riscv64
+
+* Fri Apr 26 2019 Jakub Jelinek <jakub@redhat.com> 9.0.1-0.15
+- update from trunk and 9 branch
+  - gcc 9.1-rc1
+  - PRs c++/87366, c++/87554, c++/89900, c++/90108, c++/90138, c++/90171,
+	c++/90190, c++/90227, c++/90236, c/89888, d/88431, d/88654, d/89293,
+	d/89432, d/90086, d/90250, debug/90131, fortran/57284, fortran/90166,
+	ipa/85051, libstdc++/90165, libstdc++/90220, libstdc++/90239,
+	middle-end/85164, middle-end/89765, middle-end/89797,
+	middle-end/90139, middle-end/90194, middle-end/90213, other/90257,
+	rtl-optimization/84032, rtl-optimization/87871,
+	rtl-optimization/87979, target/89929, target/89952, target/90187,
+	target/90193, translation/90118, tree-optimization/88055,
+	tree-optimization/90021, tree-optimization/90037,
+	tree-optimization/90078, tree-optimization/90208,
+	tree-optimization/90211, tree-optimization/90240
+
+* Thu Apr 18 2019 Jakub Jelinek <jakub@redhat.com> 9.0.1-0.14
+- update from trunk
+  - PRs bootstrap/89864, c++/86953, c++/89325, c++/90047, c++/90124,
+	debug/89528, fortran/90048, fortran/90067, fortran/90114,
+	libstdc++/90105, middle-end/90095, rtl-optimization/86438,
+	rtl-optimization/90082, target/17108, target/84369, target/90096,
+	target/90125, translation/79183, tree-optimization/56049,
+	tree-optimization/90090
+- buildrequire /usr/bin/python for better dg-extract-results.sh
+
+* Mon Apr 15 2019 Jakub Jelinek <jakub@redhat.com> 9.0.1-0.13
+- update from trunk
+  - PRs bootstrap/89980, c++/47488, c++/56643, c++/61327, c++/62207,
+	c++/65619, c++/66548, c++/81506, c++/81866, c++/86586, c++/86946,
+	c++/86986, c++/87145, c++/87603, c++/89331, c++/89612, c++/89744,
+	c++/89833, c++/89836, c++/89852, c++/89871, c++/89876, c++/89878,
+	c++/89914, c++/89917, c++/89948, c++/89966, c++/89973, c++/89974,
+	c++/90010, c/71598, c/88383, c/89288, c/89685, c/89797, c/89798,
+	c/89872, c/89933, c/89946, c/89985, d/87799, d/88150, d/88462,
+	d/89255, d/89823, debug/89892, debug/89905, driver/89861,
+	fortran/68567, fortran/79842, fortran/83515, fortran/85448,
+	fortran/85797, fortran/87352, fortran/89375, fortran/89841,
+	fortran/89842, fortran/89843, fortran/89846, fortran/89866,
+	fortran/89904, fortran/89981, fortran/90022, gcov-profile/89959,
+	gcov-profile/89961, ipa/88936, ipa/pr89693, libstdc++/85184,
+	libstdc++/87431, libstdc++/89851, libstdc++/89986, libstdc++/90008,
+	libstdc++/90046, lto/89358, lto/89896, middle-end/89621,
+	middle-end/89911, middle-end/89934, middle-end/89957,
+	middle-end/89970, middle-end/90025, other/89394,
+	rtl-optimization/46590, rtl-optimization/81025,
+	rtl-optimization/84206, rtl-optimization/85412,
+	rtl-optimization/85876, rtl-optimization/86928,
+	rtl-optimization/87273, rtl-optimization/87485,
+	rtl-optimization/89399, rtl-optimization/89862,
+	rtl-optimization/89865, rtl-optimization/89965,
+	rtl-optimization/90026, sanitizer/89869, sanitizer/89941,
+	target/83033, target/89623, target/89848, target/89865, target/89902,
+	target/89903, target/89945, target/90015, target/90016, target/90024,
+	testsuite/89907, testsuite/89916, translation/89912,
+	translation/89936, translation/89939, translation/90011,
+	translation/90035, translation/90041, tree-optimization/46590,
+	tree-optimization/84101, tree-optimization/89725,
+	tree-optimization/89730, tree-optimization/89956,
+	tree-optimization/89998, tree-optimization/90006,
+	tree-optimization/90018, tree-optimization/90020
+- PRs rtl-optimization/89794, tree-optimization/90071, debug/90074
+
+* Thu Mar 28 2019 Jakub Jelinek <jakub@redhat.com> 9.0.1-0.12
+- update from trunk
+  - PRs ada/89583, bootstrap/89829, c++/60702, c++/78645, c++/82643,
+	c++/84598, c++/84661, c++/85013, c++/86429, c++/86932, c++/87327,
+	c++/87480, c++/87481, c++/87748, c++/89214, c++/89421, c++/89705,
+	c++/89767, c++/89785, c++/89796, c++/89831, c/79022, c/89812, d/89017,
+	debug/86964, fortran/29383, fortran/56408, fortran/71861,
+	fortran/78865, fortran/85537, fortran/88247, fortran/89773,
+	libgfortran/79540, libstdc++/85965, libstdc++/88066, libstdc++/89816,
+	libstdc++/89824, libstdc++/89825, lto/89692, middle-end/89725,
+	middle-end/89790, rtl-optimization/88347, rtl-optimization/88423,
+	rtl-optimization/89313, rtl-optimization/89676,
+	rtl-optimization/89826, target/85667, target/89775, target/89784,
+	target/89827, testsuite/89834, tree-optimization/81740,
+	tree-optimization/89350, tree-optimization/89463,
+	tree-optimization/89779, tree-optimization/89789,
+	tree-optimization/89802
+
+* Wed Mar 20 2019 Jakub Jelinek <jakub@redhat.com> 9.0.1-0.11
+- update from trunk
+  - PRs c++/63508, c++/85014, c++/85558, c++/88534, c++/88537, c++/88979,
+	c++/89512, c++/89571, c++/89630, c++/89640, c++/89660, c++/89682,
+	c++/89686, c++/89709, c++/89761, c/89734, d/87866, d/88957,
+	debug/88389, debug/89498, debug/89704, fortran/60091, fortran/66695,
+	fortran/68009, fortran/77746, fortran/79485, fortran/84394,
+	fortran/87045, fortran/87673, fortran/88008, fortran/89363,
+	fortran/89364, fortran/89601, fortran/89724, ipa/89684,
+	libstdc++/89461, lto/87809, lto/89335, middle-end/86979,
+	middle-end/88588, middle-end/88945, middle-end/89677,
+	middle-end/89698, middle-end/89737, other/89712,
+	rtl-optimization/89679, rtl-optimization/89721,
+	rtl-optimization/89753, rtl-optimization/89768, sanitizer/80953,
+	target/52726, target/85860, target/87532, target/87561, target/89378,
+	target/89411, target/89523, target/89627, target/89650, target/89711,
+	target/89719, target/89726, target/89736, target/89746, target/89752,
+	testsuite/83453, testsuite/84174, testsuite/89393, testsuite/89471,
+	testsuite/89666, tree-optimization/89546, tree-optimization/89644,
+	tree-optimization/89662, tree-optimization/89688,
+	tree-optimization/89703, tree-optimization/89710,
+	tree-optimization/89720
+- turn libgcc_s.so into a linker script on i?86, x86_64, ppc64le and also on
+  ppc and ppc64 for 64-bit multilib (#1688766)
+
+* Tue Mar 12 2019 Jakub Jelinek <jakub@redhat.com> 9.0.1-0.10
+- update from trunk
+  - PRs bootstrap/89656, c++/70349, c++/86521, c++/87571, c++/87750,
+	c++/89648, c/88568, contrib/82704, d/89041, fortran/66089,
+	fortran/71544, fortran/84504, fortran/87734, fortran/89639,
+	fortran/89651, inline-asm/87010, libbacktrace/89669, libstdc++/89460,
+	libstdc++/89641, middle-end/68733, middle-end/89655, middle-end/89663,
+	rtl-optimization/89588, testsuite/89472, tree-optimization/85459,
+	tree-optimization/85762, tree-optimization/87008,
+	tree-optimization/89649, tree-optimization/89664
+- fix ICE in constexpr loop handling of SAVE_EXPRs (PR c++/89652)
+- temporarily revert -Wredundant-move warning false positive
+  improvement (PR c++/89660)
+
+* Sat Mar  9 2019 Jakub Jelinek <jakub@redhat.com> 9.0.1-0.9
+- update from trunk
+  - PRs bootstrap/89539, bootstrap/89560, c++/22149, c++/63540, c++/71446,
+	c++/80916, c++/82075, c++/84518, c++/84605, c++/86485, c++/86969,
+	c++/87068, c++/87148, c++/87378, c++/88049, c++/88123, c++/88183,
+	c++/88820, c++/88857, c++/89381, c++/89511, c++/89513, c++/89522,
+	c++/89532, c++/89537, c++/89576, c++/89585, c++/89599, c++/89622,
+	c/85870, c/89520, c/89521, c/89525, debug/89631, fortran/71203,
+	fortran/72714, fortran/77583, fortran/89433, fortran/89516,
+	gcov-profile/89577, go/63560, go/89227, go/89406, ipa/80000,
+	ipa/88235, libgfortran/89593, libstdc++/86655, libstdc++/88996,
+	libstdc++/89562, libstdc++/89608, lto/87525, lto/88585,
+	middle-end/89497, middle-end/89503, middle-end/89541,
+	middle-end/89572, middle-end/89578, middle-end/89590,
+	middle-end/89618, other/80058, rtl-optimization/85899,
+	rtl-optimization/88845, rtl-optimization/89634, sanitizer/88684,
+	target/68924, target/78782, target/79645, target/79846, target/79926,
+	target/80003, target/80190, target/85665, target/86952, target/87558,
+	target/89222, target/89455, target/89506, target/89517, target/89587,
+	target/89602, testsuite/89441, testsuite/89551, translation/79999,
+	tree-optimization/89437, tree-optimization/89487,
+	tree-optimization/89535, tree-optimization/89536,
+	tree-optimization/89550, tree-optimization/89566,
+	tree-optimization/89570, tree-optimization/89594,
+	tree-optimization/89595
+- fix libstdc++ hashing of > 2GB strings (PR libstdc++/89629)
+
+* Wed Feb 27 2019 Jakub Jelinek <jakub@redhat.com> 9.0.1-0.8
+- update from trunk
+  - PRs c++/84585, c++/84676, c++/87685, c++/88294, c++/88394, c++/88419,
+	c++/88869, c++/88987, c++/89285, c++/89419, c++/89420, c++/89422,
+	c++/89481, c++/89488, c++/89507, c/77754, c/80409, c/89425, c/89495,
+	debug/88878, debug/89514, driver/69471, fortran/43210, fortran/72741,
+	fortran/78027, fortran/83057, fortran/84387, fortran/88117,
+	fortran/88326, fortran/89174, fortran/89266, fortran/89282,
+	fortran/89366, fortran/89385, fortran/89431, fortran/89492,
+	fortran/89496, go/89170, libfortran/89274, libstdc++/89446,
+	libstdc++/89466, libstdc++/89477, middle-end/85598, middle-end/87609,
+	rtl-optimization/86096, rtl-optimization/87761,
+	rtl-optimization/89445, target/87007, target/88530, target/89324,
+	target/89338, target/89339, target/89434, target/89438, target/89444,
+	target/89474, testsuite/89476, tree-optimization/87609,
+	tree-optimization/88853, tree-optimization/88993,
+	tree-optimization/89280, tree-optimization/89440,
+	tree-optimization/89489, tree-optimization/89500,
+	tree-optimization/89505
+- improve arm and aarch64 casesi (PR target/70341)
+- don't use section anchors block infrastructure for mergeable section
+  data (PR rtl-optimization/89490)
+
+* Thu Feb 21 2019 Jakub Jelinek <jakub@redhat.com> 9.0.1-0.7
+- update from trunk
+  - PRs c++/84536, c++/87513, c++/87921, c++/88368, c++/88380, c++/88572,
+	c++/88690, c++/89403, c++/89405, c/89410, fortran/86119,
+	fortran/89384, hsa/89302, libstdc++/89402, libstdc++/89416,
+	middle-end/89091, middle-end/89392, middle-end/89412,
+	middle-end/89415, sanitizer/89409, target/86487, target/87412,
+	target/88100
+
+* Tue Feb 19 2019 Jakub Jelinek <jakub@redhat.com> 9.0.1-0.6
+- update from trunk
+  - PRs c++/88680, c++/89217, c++/89315, c++/89336, c++/89356, c++/89383,
+	c++/89387, c++/89390, c++/89391, c/87924, d/88127, fortran/71066,
+	fortran/87689, fortran/88299, ipa/89306, middle-end/88074,
+	middle-end/89294, rtl-optimization/66152, target/89271, target/89361,
+	target/89372, target/89397, tree-optimization/89209,
+	tree-optimization/89296
+  - fix s390{,x} (#1677602, PR target/89369)
+
+* Fri Feb 15 2019 Jakub Jelinek <jakub@redhat.com> 9.0.1-0.5
+- update from trunk
+  - PRs c++/77304, c++/86379, c++/87322, c++/87996, c++/88977, c++/88986,
+	c++/89036, c++/89144, c++/89212, c++/89241, c++/89297, c/89340,
+	d/87864, fortran/67679, fortran/71723, fortran/72715, fortran/81552,
+	fortran/88248, fortran/88649, fortran/89200, go/89193, ipa/88711,
+	ipa/88755, ipa/89009, libbacktrace/81983, libstdc++/89023,
+	libstdc++/89345, lto/87957, lto/88147, lto/88677, lto/88858,
+	lto/88876, lto/89272, middle-end/89281, middle-end/89284,
+	middle-end/89303, other/69006, other/89342, rtl-optimization/88308,
+	rtl-optimization/89242, rtl-optimization/89354, target/88847,
+	target/89190, target/89233, target/89290, tree-optimization/88771,
+	tree-optimization/89253, tree-optimization/89268,
+	tree-optimization/89278, tree-optimization/89314
+
+* Sat Feb  9 2019 Jakub Jelinek <jakub@redhat.com> 9.0.1-0.4
+- update from trunk
+  - PRs c++/44648, c++/71302, c++/86218, c++/87770, c++/89158, c++/89187,
+	c/69661, c/88584, c/88606, c/88698, c/89211, debug/87451,
+	fortran/52789, fortran/71860, fortran/88912, fortran/89077,
+	fortran/89185, gcov-profile/89000, go/89019, ipa/88985,
+	libbacktrace/78063, libstdc++/71044, libstdc++/87106, libstdc++/89090,
+	libstdc++/89102, libstdc++/89128, libstdc++/89130, libstdc++/89194,
+	middle-end/88560, middle-end/89150, middle-end/89210,
+	middle-end/89223, middle-end/89246, rtl-optimization/11304,
+	rtl-optimization/89195, rtl-optimization/89225,
+	rtl-optimization/89234, target/88343, target/88856, target/89112,
+	target/89186, target/89188, target/89229, testsuite/89250,
+	testsuite/89258, tree-optimization/86637, tree-optimization/89182,
+	tree-optimization/89235, tree-optimization/89247
+- add gcc-g++ and g++ provides to gcc-c++, gcc-fortran and gfortran
+  provides to gcc-gfortran, gcc-d and gdc provides to gcc-gdc and gccgo
+  provides to gcc-go
+
+* Sun Feb  3 2019 Jakub Jelinek <jakub@redhat.com> 9.0.1-0.3
+- update from trunk
+  - PRs c++/80864, c++/86943, c++/87175, c++/88325, c++/88752, c++/88761,
+	c++/88983, c++/88988, c++/89083, c++/89105, c++/89119, c/88956,
+	c/89061, c/89122, fortran/52564, fortran/52884, fortran/57048,
+	fortran/81344, fortran/83246, fortran/88298, fortran/88393,
+	fortran/88669, fortran/88685, fortran/88980, fortran/89084, hsa/87863,
+	libbacktrace/89136, libfortran/78314, libfortran/88678,
+	libstdc++/88170, libstdc++/89117, middle-end/87887, middle-end/88597,
+	middle-end/89137, other/89106, rtl-optimization/87246,
+	rtl-optimization/88593, rtl-optimization/89115, sanitizer/89124,
+	target/89071, testsuite/87451, testsuite/88920, testsuite/89110,
+	tree-optimization/85497, tree-optimization/88107,
+	tree-optimization/88932, tree-optimization/89111,
+	tree-optimization/89135, tree-optimization/89143
+
+* Tue Jan 29 2019 Jakub Jelinek <jakub@redhat.com> 9.0.1-0.2
+- update from trunk
+  - PRs c++/66676, c++/88358, c++/88815, c++/88865, c++/88969, c++/88976,
+	c++/89001, c++/89024, c++/89089, c/86125, c/88886, c/89045, d/89042,
+	debug/87295, debug/89006, debug/89076, fortran/57553, fortran/70696,
+	fortran/85780, fortran/88929, gcc/87763, gcov-profile/88994,
+	ipa/88933, ipa/89104, libfortran/89020, libgcc/88931, libstdc++/68737,
+	libstdc++/88840, lto/87187, middle-end/86308, middle-end/89002,
+	middle-end/89015, middle-end/89037, preprocessor/88974,
+	rtl-optimization/88846, rtl-optimization/88948, target/85711,
+	target/87214, target/88998, target/89073, testsuite/89064,
+	tree-optimization/86865, tree-optimization/88739,
+	tree-optimization/89027, tree-optimization/89049
+- make sure ARM unwinder doesn't use VFP registers (#1670069, PR target/89093)
+
+* Wed Jan 23 2019 Jakub Jelinek <jakub@redhat.com> 9.0.1-0.1
+- update from trunk
+  - PRs c++/87893, c++/88293, c++/88757, c++/88984, c/44715, driver/89014,
+	fortran/88579, libstdc++/88740, lto/88422, middle-end/88968,
+	rtl-optimization/87763, sanitizer/86229, sanitizer/89010,
+	target/87835, target/88469, target/88909, target/88939, target/88941,
+	target/88954, target/88965, target/PR88946, tree-optimization/88862,
+	tree-optimization/88964, tree-optimization/89008
+  - hopefully fix arm C++ issues (#1668323)
+- fix aarch64 -march=native (#1668631)
+
+* Tue Jan 22 2019 David Abdurachmanov <david.abdurachmanov@gmail.com>
+- fix libgphobos-static requires (#1668204)
+
+* Mon Jan 21 2019 Jakub Jelinek <jakub@redhat.com> 9.0.0-0.4
+- update from trunk
+  - PRs c++/88949, c/88928, fortran/37835, fortran/56789, fortran/77960,
+	ipa/87615, libstdc++/86590, target/71659, target/88938,
+	tree-optimization/88934
+- fix up min/max reduction on ppc64le (PR target/87064)
+- fix up thread_jump on thumb1 (PR rtl-optimization/88904)
+- fix up doubleword unop REG_EQUAL notes with const args (PR target/88905)
+- fix up DSE on memcpy/memmove/memcmp libcalls (PR rtl-optimization/49429,
+  PR target/49454, PR rtl-optimization/86334, PR target/88906)
+
+* Sat Jan 19 2019 Jakub Jelinek <jakub@redhat.com> 9.0.0-0.3
+- update from trunk
+  - PRs c++/86205, c++/86740, c++/86926, c++/88699, c++/88875, c/88664,
+	fortran/88871, fortran/88898, fortran/88902, libbacktrace/88890,
+	libstdc++/87514, libstdc++/87520, libstdc++/88782, middle-end/88273,
+	middle-end/88587, target/85596, target/88799, target/88892,
+	tree-optimization/88800, tree-optimization/88903
+- fix transfer_intrinsic_3.f90 miscompilation on ppc64le and s390x
+  (PR tree-optimization/88044)
+- fix -fsanitize=pointer-{compare,subtract} in C++ templates
+  (PR sanitizer/88901)
+- add Obsoletes for libmpx and libmpx-static
+
+* Thu Jan 17 2019 Jakub Jelinek <jakub@redhat.com> 9.0.0-0.2
+- update from trunk
+  - PRs c++/78244, c++/86610, c++/86648, c++/87768, c++/87882, c++/88114,
+	c++/88146, c++/88312, c++/88613, c++/88692, c++/88795, c++/88825,
+	c++/88830, c++/88866, c/51628, d/87824, debug/88046, fortran/35031,
+	fortran/43136, fortran/57992, fortran/59345, fortran/61765,
+	fortran/81849, fortran/88803, gcov-profile/88263, inline-asm/52813,
+	ipa/88788, libbacktrace/82857, libfortran/88776, libfortran/88807,
+	libstdc++/83306, libstdc++/88738, libstdc++/88802, libstdc++/88811,
+	libstdc++/88881, libstdc++/88884, lto/86736, lto/88733,
+	middle-end/85956, middle-end/88703, rtl-optimization/87305,
+	rtl-optimization/88796, rtl-optimization/88870, target/80547,
+	target/85381, target/85486, target/88614, target/86891, target/87306,
+	target/88489, target/88638, target/88682, target/88777, target/88794,
+	target/88850, target/88851, target/88861, tree-optimization/86214,
+	tree-optimization/88693, tree-optimization/88775,
+	tree-optimization/88855
+- fix arm bootstrap failure (PR bootstrap/88714)
+- fix <arm_neon.h> on aarch64 and arm (PR target/88734)
+- default to -shared-libphobos for gdc
+
+* Fri Jan 11 2019 Jakub Jelinek <jakub@redhat.com> 9.0.0-0.1
 - new package
diff --git a/gcc16-Wno-format-security.patch b/gcc16-Wno-format-security.patch
deleted file mode 100644
index 2a4f0f3..0000000
--- a/gcc16-Wno-format-security.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-2022-01-07  Jakub Jelinek  <jakub@redhat.com>
-
-	* Makefile.tpl (GOCFLAGS, GDCFLAGS): Filter out -Wformat-security.
-	* Makefile.in: Regenerated.
-
-2017-02-25  Jakub Jelinek  <jakub@redhat.com>
-
-	* configure.ac: When adding -Wno-format, also add -Wno-format-security.
-	* configure: Regenerated.
-
---- gcc/configure.ac.jj	2017-02-13 12:20:53.000000000 +0100
-+++ gcc/configure.ac	2024-11-30 13:34:11.100296256 +0100
-@@ -592,7 +592,7 @@ AC_ARG_ENABLE(build-format-warnings,
-   AS_HELP_STRING([--disable-build-format-warnings],[don't use -Wformat while building GCC]),
-   [],[enable_build_format_warnings=yes])
- AS_IF([test $enable_build_format_warnings = no],
--      [wf_opt=-Wno-format],[wf_opt=])
-+      [wf_opt="-Wno-format -Wno-format-security"],[wf_opt=])
- ACX_PROG_CXX_WARNING_OPTS(
- 	m4_quote(m4_do([-W -Wall -Wno-error=narrowing -Wwrite-strings ],
- 		       [-Wcast-qual $wf_opt])),
---- gcc/configure.jj	2017-02-13 12:20:52.000000000 +0100
-+++ gcc/configure	2017-02-25 12:42:50.041946391 +0100
-@@ -7077,7 +7077,7 @@ else
- fi
- 
- if test $enable_build_format_warnings = no; then :
--  wf_opt=-Wno-format
-+  wf_opt="-Wno-format -Wno-format-security"
- else
-   wf_opt=
- fi
---- Makefile.tpl.jj	2023-11-29 13:21:41.680292662 +0100
-+++ Makefile.tpl	2024-11-30 13:35:29.303196246 +0100
-@@ -450,10 +450,10 @@ LDFLAGS = @LDFLAGS@
- LIBCFLAGS = $(CFLAGS)
- CXXFLAGS = @CXXFLAGS@
- LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
--GOCFLAGS = $(CFLAGS)
--A68FLAGS = @A68FLAGS@
--GDCFLAGS = @GDCFLAGS@
--GM2FLAGS = $(CFLAGS)
-+GOCFLAGS = $(filter-out -Wformat-security,$(CFLAGS))
-+A68FLAGS = $(filter-out -Wformat-security,@A68FLAGS@)
-+GDCFLAGS = $(filter-out -Wformat-security,@GDCFLAGS@)
-+GM2FLAGS = $(filter-out -Wformat-security,$(CFLAGS))
- 
- CRAB1_LIBS = @CRAB1_LIBS@
- 
---- Makefile.in.jj	2023-11-29 13:21:41.691292507 +0100
-+++ Makefile.in	2024-11-30 13:36:12.113594079 +0100
-@@ -447,10 +447,10 @@ LDFLAGS = @LDFLAGS@
- LIBCFLAGS = $(CFLAGS)
- CXXFLAGS = @CXXFLAGS@
- LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
--GOCFLAGS = $(CFLAGS)
--A68FLAGS = @A68FLAGS@
--GDCFLAGS = @GDCFLAGS@
--GM2FLAGS = $(CFLAGS)
-+GOCFLAGS = $(filter-out -Wformat-security,$(CFLAGS))
-+A68FLAGS = $(filter-out -Wformat-security,@A68FLAGS@)
-+GDCFLAGS = $(filter-out -Wformat-security,@GDCFLAGS@)
-+GM2FLAGS = $(filter-out -Wformat-security,$(CFLAGS))
- 
- CRAB1_LIBS = @CRAB1_LIBS@
- 
diff --git a/gcc16-fortran-fdec-duplicates.patch b/gcc16-fortran-fdec-duplicates.patch
deleted file mode 100644
index 5298baa..0000000
--- a/gcc16-fortran-fdec-duplicates.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-From 23b1fcb104c666429451ffaf936f8da5fcd3d43a Mon Sep 17 00:00:00 2001
-From: Mark Eggleston <markeggleston@gcc.gnu.org>
-Date: Fri, 22 Jan 2021 12:29:47 +0000
-Subject: [PATCH 01/10] Allow duplicate declarations.
-
-Enabled by -fdec-duplicates and -fdec.
-
-Some fixes by Jim MacArthur <jim.macarthur@codethink.co.uk>
-Addition of -fdec-duplicates by Mark Eggleston <mark.eggleston@codethink.com>
----
- gcc/fortran/lang.opt                          |  4 ++++
- gcc/fortran/options.cc                        |  1 +
- gcc/fortran/symbol.cc                         | 21 +++++++++++++++++--
- .../gfortran.dg/duplicate_type_4.f90          | 13 ++++++++++++
- .../gfortran.dg/duplicate_type_5.f90          | 13 ++++++++++++
- .../gfortran.dg/duplicate_type_6.f90          | 13 ++++++++++++
- .../gfortran.dg/duplicate_type_7.f90          | 13 ++++++++++++
- .../gfortran.dg/duplicate_type_8.f90          | 12 +++++++++++
- .../gfortran.dg/duplicate_type_9.f90          | 12 +++++++++++
- 9 files changed, 100 insertions(+), 2 deletions(-)
- create mode 100644 gcc/testsuite/gfortran.dg/duplicate_type_4.f90
- create mode 100644 gcc/testsuite/gfortran.dg/duplicate_type_5.f90
- create mode 100644 gcc/testsuite/gfortran.dg/duplicate_type_6.f90
- create mode 100644 gcc/testsuite/gfortran.dg/duplicate_type_7.f90
- create mode 100644 gcc/testsuite/gfortran.dg/duplicate_type_8.f90
- create mode 100644 gcc/testsuite/gfortran.dg/duplicate_type_9.f90
-
-diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt
-index 2b1977c523b..52bd522051e 100644
---- a/gcc/fortran/lang.opt
-+++ b/gcc/fortran/lang.opt
-@@ -469,6 +469,10 @@ Fortran Var(flag_dec_char_conversions)
- Enable the use of character literals in assignments and data statements
- for non-character variables.
- 
-+fdec-duplicates
-+Fortran Var(flag_dec_duplicates)
-+Allow varibles to be duplicated in the type specification matches.
-+
- fdec-include
- Fortran Var(flag_dec_include)
- Enable legacy parsing of INCLUDE as statement.
-diff --git a/gcc/fortran/options.cc b/gcc/fortran/options.cc
-index 3a0b98bf1ec..f19ba87f8a0 100644
---- a/gcc/fortran/options.cc
-+++ b/gcc/fortran/options.cc
-@@ -77,6 +77,7 @@ set_dec_flags (int value)
-   SET_BITFLAG (flag_dec_format_defaults, value, value);
-   SET_BITFLAG (flag_dec_blank_format_item, value, value);
-   SET_BITFLAG (flag_dec_char_conversions, value, value);
-+  SET_BITFLAG (flag_dec_duplicates, value, value);
- }
- 
- /* Finalize DEC flags.  */
-diff --git a/gcc/fortran/symbol.cc b/gcc/fortran/symbol.cc
-index 3b988d1be22..9843175cc2a 100644
---- a/gcc/fortran/symbol.cc
-+++ b/gcc/fortran/symbol.cc
-@@ -1995,6 +1995,8 @@ gfc_add_type (gfc_symbol *sym, gfc_typespec *ts, locus *where)
-   if (sym->attr.result && type == BT_UNKNOWN && sym->ns->proc_name)
-     type = sym->ns->proc_name->ts.type;
- 
-+  flavor = sym->attr.flavor;
-+
-   if (type != BT_UNKNOWN && !(sym->attr.function && sym->attr.implicit_type)
-       && !(gfc_state_stack->previous && gfc_state_stack->previous->previous
- 	   && gfc_state_stack->previous->previous->state == COMP_SUBMODULE)
-@@ -2007,6 +2009,23 @@ gfc_add_type (gfc_symbol *sym, gfc_typespec *ts, locus *where)
-       else if (sym->attr.function && sym->attr.result)
- 	gfc_error ("Symbol %qs at %L already has basic type of %s",
- 		   sym->ns->proc_name->name, where, gfc_basic_typename (type));
-+      else if (flag_dec_duplicates)
-+	{
-+	  /* Ignore temporaries and class/procedure names */
-+	  if (sym->ts.type == BT_DERIVED || sym->ts.type == BT_CLASS
-+	      || sym->ts.type == BT_PROCEDURE)
-+	    return false;
-+
-+	  if (gfc_compare_types (&sym->ts, ts)
-+	      && (flavor == FL_UNKNOWN || flavor == FL_VARIABLE
-+	      || flavor == FL_PROCEDURE))
-+	    {
-+	      return gfc_notify_std (GFC_STD_LEGACY,
-+				     "Symbol '%qs' at %L already has "
-+				     "basic type of %s", sym->name, where,
-+				     gfc_basic_typename (type));
-+	    }
-+	}
-       else
- 	gfc_error ("Symbol %qs at %L already has basic type of %s", sym->name,
- 		   where, gfc_basic_typename (type));
-@@ -2020,8 +2039,6 @@ gfc_add_type (gfc_symbol *sym, gfc_typespec *ts, locus *where)
-       return false;
-     }
- 
--  flavor = sym->attr.flavor;
--
-   if (flavor == FL_PROGRAM || flavor == FL_BLOCK_DATA || flavor == FL_MODULE
-       || flavor == FL_LABEL
-       || (flavor == FL_PROCEDURE && sym->attr.subroutine)
-diff --git a/gcc/testsuite/gfortran.dg/duplicate_type_4.f90 b/gcc/testsuite/gfortran.dg/duplicate_type_4.f90
-new file mode 100644
-index 00000000000..cdd29ea8846
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/duplicate_type_4.f90
-@@ -0,0 +1,13 @@
-+! { dg-do compile }
-+! { dg-options "-std=f95" }
-+
-+! PR fortran/30239
-+! Check for errors when a symbol gets declared a type twice, even if it
-+! is the same.
-+
-+INTEGER FUNCTION foo ()
-+  IMPLICIT NONE
-+  INTEGER :: x
-+  INTEGER :: x ! { dg-error "basic type of" }
-+  x = 42
-+END FUNCTION foo
-diff --git a/gcc/testsuite/gfortran.dg/duplicate_type_5.f90 b/gcc/testsuite/gfortran.dg/duplicate_type_5.f90
-new file mode 100644
-index 00000000000..00f931809aa
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/duplicate_type_5.f90
-@@ -0,0 +1,13 @@
-+! { dg-do run }
-+! { dg-options "-fdec" }
-+!
-+! Test case contributed by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+
-+program test
-+  implicit none
-+  integer :: x
-+  integer :: x
-+  x = 42
-+  if (x /= 42) stop 1
-+end program test
-diff --git a/gcc/testsuite/gfortran.dg/duplicate_type_6.f90 b/gcc/testsuite/gfortran.dg/duplicate_type_6.f90
-new file mode 100644
-index 00000000000..f0df27e323c
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/duplicate_type_6.f90
-@@ -0,0 +1,13 @@
-+! { dg-do run }
-+! { dg-options "-std=legacy -fdec-duplicates" }
-+!
-+! Test case contributed by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+
-+program test
-+  implicit none
-+  integer :: x
-+  integer :: x
-+  x = 42
-+  if (x /= 42) stop 1
-+end program test
-diff --git a/gcc/testsuite/gfortran.dg/duplicate_type_7.f90 b/gcc/testsuite/gfortran.dg/duplicate_type_7.f90
-new file mode 100644
-index 00000000000..f32472ff586
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/duplicate_type_7.f90
-@@ -0,0 +1,13 @@
-+! { dg-do run }
-+! { dg-options "-fdec-duplicates" }
-+!
-+! Test case contributed by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+
-+program test
-+  implicit none
-+  integer :: x
-+  integer :: x! { dg-warning "Legacy Extension" }
-+  x = 42
-+  if (x /= 42) stop 1
-+end program test
-diff --git a/gcc/testsuite/gfortran.dg/duplicate_type_8.f90 b/gcc/testsuite/gfortran.dg/duplicate_type_8.f90
-new file mode 100644
-index 00000000000..23c94add179
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/duplicate_type_8.f90
-@@ -0,0 +1,12 @@
-+! { dg-do compile }
-+! { dg-options "-fdec -fno-dec-duplicates" }
-+!
-+! Test case contributed by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+
-+integer function foo ()
-+  implicit none
-+  integer :: x
-+  integer :: x ! { dg-error "basic type of" }
-+  x = 42
-+end function foo
-diff --git a/gcc/testsuite/gfortran.dg/duplicate_type_9.f90 b/gcc/testsuite/gfortran.dg/duplicate_type_9.f90
-new file mode 100644
-index 00000000000..d5edee4d8ee
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/duplicate_type_9.f90
-@@ -0,0 +1,12 @@
-+! { dg-do compile }
-+! { dg-options "-fdec-duplicates -fno-dec-duplicates" }
-+!
-+! Test case contributed by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+
-+integer function foo ()
-+  implicit none
-+  integer :: x
-+  integer :: x ! { dg-error "basic type of" }
-+  x = 42
-+end function foo
--- 
-2.27.0
-
diff --git a/gcc16-isl-dl2.patch b/gcc16-isl-dl2.patch
deleted file mode 100644
index 8d2c4d9..0000000
--- a/gcc16-isl-dl2.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-2011-04-04  Jakub Jelinek  <jakub@redhat.com>
-
-	* toplev.cc (toplev_main_argv): New variable.
-	(toplev_main): Initialize it.
-	* graphite.cc (init_isl_pointers): Load libisl.so.23 from gcc's private
-	directory.
-
---- gcc/toplev.cc.jj	2008-12-09 23:59:10.000000000 +0100
-+++ gcc/toplev.cc	2024-11-30 13:26:05.085132543 +0100
-@@ -112,6 +112,8 @@ static void finalize ();
- static void crash_signal (int) ATTRIBUTE_NORETURN;
- static void compile_file (void);
- 
-+const char **toplev_main_argv;
-+
- /* Decoded options, and number of such options.  */
- struct cl_decoded_option *save_decoded_options;
- unsigned int save_decoded_options_count;
-@@ -2296,6 +2298,8 @@ toplev::main (int argc, char **argv)
- 
-   expandargv (&argc, &argv);
- 
-+  toplev_main_argv = CONST_CAST2 (const char **, char **, argv);
-+
-   /* Initialization of GCC's environment, and diagnostics.  */
-   general_init (argv[0], m_init_signals, std::move (original_argv));
- 
---- gcc/graphite.cc.jj	2010-12-01 10:24:32.000000000 -0500
-+++ gcc/graphite.cc	2010-12-01 11:46:07.832118193 -0500
-@@ -64,11 +64,39 @@ __typeof (isl_pointers__) isl_pointers__
- static bool
- init_isl_pointers (void)
- {
--  void *h;
-+  void *h = NULL;
-+  extern const char **toplev_main_argv;
-+  char *buf, *p;
-+  size_t len;
- 
-   if (isl_pointers__.inited)
-     return isl_pointers__.h != NULL;
--  h = dlopen ("libisl.so.23", RTLD_LAZY);
-+  len = progname - toplev_main_argv[0];
-+  buf = XALLOCAVAR (char, len + sizeof "libisl.so.23");
-+  memcpy (buf, toplev_main_argv[0], len);
-+  strcpy (buf + len, "libisl.so.23");
-+  len += sizeof "libisl.so.23";
-+  p = strstr (buf, "/libexec/");
-+  if (p != NULL)
-+    {
-+      while (1)
-+	{
-+	  char *q = strstr (p + 8, "/libexec/");
-+	  if (q == NULL)
-+	    break;
-+	  p = q;
-+	}
-+      memmove (p + 4, p + 8, len - (p + 8 - buf));
-+      h = dlopen (buf, RTLD_LAZY);
-+      if (h == NULL)
-+	{
-+	  len = progname - toplev_main_argv[0];
-+	  memcpy (buf, toplev_main_argv[0], len);
-+	  strcpy (buf + len, "libisl.so.23");
-+	}
-+    }
-+  if (h == NULL)
-+    h = dlopen (buf, RTLD_LAZY);
-   isl_pointers__.h = h;
-   if (h == NULL)
-     return false;
diff --git a/gcc16-pr119006.patch b/gcc16-pr119006.patch
deleted file mode 100644
index dfbdaa9..0000000
--- a/gcc16-pr119006.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-2025-02-27  Jakub Jelinek  <jakub@redhat.com>
-
-	PR ipa/119006
-	* ipa-icf-gimple.cc (func_checker::compare_operand): If t1 and t2
-	are ADDR_EXPRs, call operand_equal_p on their operands rather than on
-	the ADDR_EXPRs themselves.  Formatting fix.
-
-	* g++.dg/opt/pr119006.C: New test.
-
---- gcc/ipa-icf-gimple.cc.jj	2025-02-01 00:50:02.080774328 +0100
-+++ gcc/ipa-icf-gimple.cc	2025-02-27 14:35:19.931183246 +0100
-@@ -437,12 +437,23 @@ func_checker::compare_operand (tree t1,
- 		 ("compare_ao_refs failed (dependence clique difference)");
-       gcc_unreachable ();
-     }
-+  else if (TREE_CODE (t1) == ADDR_EXPR && TREE_CODE (t2) == ADDR_EXPR)
-+    {
-+      /* For ADDR_EXPR compare the operands of the ADDR_EXPR rather than
-+	 the ADDR_EXPRs themselves.  operand_equal_p will compare the
-+	 operands with OEP_ADDRESS_OF and only care about the value
-+	 of the ADDR_EXPR, rather than e.g. types of MEM_REFs in there.
-+	 Some optimizations use such details though, see PR119006.  */
-+      if (operand_equal_p (TREE_OPERAND (t1, 0), TREE_OPERAND (t2, 0),
-+			   OEP_MATCH_SIDE_EFFECTS))
-+	return true;
-+      return return_false_with_msg ("operand_equal_p failed");
-+    }
-   else
-     {
-       if (operand_equal_p (t1, t2, OEP_MATCH_SIDE_EFFECTS))
- 	return true;
--      return return_false_with_msg
--		 ("operand_equal_p failed");
-+      return return_false_with_msg ("operand_equal_p failed");
-     }
- }
- 
---- gcc/testsuite/g++.dg/opt/pr119006.C.jj	2025-02-27 14:37:05.952707350 +0100
-+++ gcc/testsuite/g++.dg/opt/pr119006.C	2025-02-27 14:36:29.251218260 +0100
-@@ -0,0 +1,36 @@
-+// PR ipa/119006
-+// { dg-do run { target c++11 } }
-+// { dg-options "-O2 -fwhole-program" }
-+
-+struct A {
-+  bool operator== (const char *x) const { return x && !__builtin_strcmp (a, x); }
-+  char a[11];
-+};
-+
-+struct B {
-+  bool operator== (const char *x) const { return x && !__builtin_strcmp (a, x); }
-+  bool operator!= (const char *x) const { return !(*this == x); }
-+  char a[128];
-+};
-+
-+[[gnu::noinline,gnu::used]] int
-+foo (const A& lhs, const char* rhs)
-+{
-+  return lhs == rhs;
-+}
-+
-+constexpr const char *t = "abcdefghijklmno";
-+
-+[[gnu::noinline,gnu::used]] void
-+bar (B x)
-+{
-+  if (x != t) __builtin_abort ();
-+}
-+
-+int
-+main ()
-+{
-+  B b;
-+  __builtin_strcpy (b.a, t);
-+  bar (b);
-+}
diff --git a/gcc16-pr123273.patch b/gcc16-pr123273.patch
deleted file mode 100644
index 987f6e0..0000000
--- a/gcc16-pr123273.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-2026-01-06  Jakub Jelinek  <jakub@redhat.com>
-
-	PR preprocessor/123273
-	* lex.cc (cpp_directive_only_process): Only go to done_comment
-	for '/' if star is true and esc is false.  When seeing '\\' with
-	esc set to true, clear esc as well as star instead of keeping esc
-	set.
-
-	* c-c++-common/cpp/dir-only-10.c: New test.
-	* c-c++-common/cpp/dir-only-11.c: New test.
-
---- libcpp/lex.cc.jj	2026-01-02 09:56:10.417332292 +0100
-+++ libcpp/lex.cc	2026-01-05 16:40:26.413766032 +0100
-@@ -5461,7 +5461,13 @@ cpp_directive_only_process (cpp_reader *
- 		    switch (c)
- 		      {
- 		      case '\\':
--			esc = true;
-+			if (esc)
-+			  {
-+			    star = false;
-+			    esc = false;
-+			  }
-+			else
-+			  esc = true;
- 			break;
- 
- 		      case '\r':
-@@ -5492,7 +5498,7 @@ cpp_directive_only_process (cpp_reader *
- 			break;
- 
- 		      case '/':
--			if (star)
-+			if (star && !esc)
- 			  goto done_comment;
- 			/* FALLTHROUGH  */
- 
---- gcc/testsuite/c-c++-common/cpp/dir-only-10.c.jj	2026-01-05 17:04:26.144566116 +0100
-+++ gcc/testsuite/c-c++-common/cpp/dir-only-10.c	2026-01-05 17:05:02.226946201 +0100
-@@ -0,0 +1,5 @@
-+/* PR preprocessor/123273 */
-+/* { dg-do preprocess } */
-+/* { dg-options -fdirectives-only } */
-+
-+/* *\/""" */
---- gcc/testsuite/c-c++-common/cpp/dir-only-11.c.jj	2026-01-05 17:05:18.498666647 +0100
-+++ gcc/testsuite/c-c++-common/cpp/dir-only-11.c	2026-01-05 17:06:17.574651691 +0100
-@@ -0,0 +1,6 @@
-+/* PR preprocessor/123273 */
-+/* { dg-do preprocess } */
-+/* { dg-options -fdirectives-only } */
-+
-+/* *\\
-+/""" */
diff --git a/gcc16-rh1574936.patch b/gcc16-rh1574936.patch
deleted file mode 100644
index bcc7000..0000000
--- a/gcc16-rh1574936.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-crt files and statically linked libgcc objects cause false positives
-in annobin coverage, so we add the assembler flag to generate notes
-for them.
-
-The patch also adds notes to libgcc_s.so, but this is harmless because
-these notes only confer that there is no other annobin markup.
-
-2018-07-25  Florian Weimer  <fweimer@redhat.com>
-
-	* config/t-linux (LIBGCC2_CFLAGS, CRTSTUFF_CFLAGS): Add
-	-Wa,--generate-missing-build-notes=yes.
-
---- libgcc/config/t-linux	2022-12-15 19:25:20.581394950 +0100
-+++ libgcc/config/t-linux	2023-03-21 22:00:37.054478562 +0100
-@@ -1,3 +1,6 @@
- # Override t-slibgcc-elf-ver to export some libgcc symbols with
- # the symbol versions that glibc used.
- SHLIB_MAPFILES += $(srcdir)/config/libgcc-glibc.ver
-+
-+LIBGCC2_CFLAGS += -Wa,--generate-missing-build-notes=yes
-+CRTSTUFF_CFLAGS += -Wa,--generate-missing-build-notes=yes
diff --git a/gcc9-Wno-format-security.patch b/gcc9-Wno-format-security.patch
new file mode 100644
index 0000000..cb21e5d
--- /dev/null
+++ b/gcc9-Wno-format-security.patch
@@ -0,0 +1,27 @@
+2017-02-25  Jakub Jelinek  <jakub@redhat.com>
+
+	* configure.ac: When adding -Wno-format, also add -Wno-format-security.
+	* configure: Regenerated.
+
+--- gcc/configure.ac.jj	2017-02-13 12:20:53.000000000 +0100
++++ gcc/configure.ac	2017-02-25 12:42:32.859175403 +0100
+@@ -481,7 +481,7 @@ AC_ARG_ENABLE(build-format-warnings,
+   AS_HELP_STRING([--disable-build-format-warnings],[don't use -Wformat while building GCC]),
+   [],[enable_build_format_warnings=yes])
+ AS_IF([test $enable_build_format_warnings = no],
+-      [wf_opt=-Wno-format],[wf_opt=])
++      [wf_opt="-Wno-format -Wno-format-security"],[wf_opt=])
+ ACX_PROG_CXX_WARNING_OPTS(
+ 	m4_quote(m4_do([-W -Wall -Wno-narrowing -Wwrite-strings ],
+ 		       [-Wcast-qual $wf_opt])), [loose_warn])
+--- gcc/configure.jj	2017-02-13 12:20:52.000000000 +0100
++++ gcc/configure	2017-02-25 12:42:50.041946391 +0100
+@@ -6647,7 +6647,7 @@ else
+ fi
+ 
+ if test $enable_build_format_warnings = no; then :
+-  wf_opt=-Wno-format
++  wf_opt="-Wno-format -Wno-format-security"
+ else
+   wf_opt=
+ fi
diff --git a/gcc16-d-shared-libphobos.patch b/gcc9-d-shared-libphobos.patch
similarity index 77%
rename from gcc16-d-shared-libphobos.patch
rename to gcc9-d-shared-libphobos.patch
index 6384bbb..392d631 100644
--- a/gcc16-d-shared-libphobos.patch
+++ b/gcc9-d-shared-libphobos.patch
@@ -5,9 +5,9 @@
 
 --- gcc/d/d-spec.cc.jj	2019-01-01 12:37:49.502444257 +0100
 +++ gcc/d/d-spec.cc	2019-01-17 17:09:45.364949246 +0100
-@@ -408,9 +408,9 @@ lang_specific_driver (cl_decoded_option
+@@ -405,9 +405,9 @@ lang_specific_driver (cl_decoded_option
    /* Add `-lgphobos' if we haven't already done so.  */
-   if (phobos_library != PHOBOS_NOLINK)
+   if (phobos_library != PHOBOS_NOLINK && need_phobos)
      {
 -      /* Default to static linking.  */
 -      if (phobos_library != PHOBOS_DYNAMIC)
@@ -17,4 +17,4 @@
 +	phobos_library = PHOBOS_DYNAMIC;
  
  #ifdef HAVE_LD_STATIC_DYNAMIC
-       if (phobos_library == PHOBOS_STATIC && !static_link)
+       if (phobos_library == PHOBOS_DYNAMIC && static_link)
diff --git a/gcc9-foffload-default.patch b/gcc9-foffload-default.patch
new file mode 100644
index 0000000..ac462f1
--- /dev/null
+++ b/gcc9-foffload-default.patch
@@ -0,0 +1,122 @@
+2019-01-17  Jakub Jelinek  <jakub@redhat.com>
+
+	* gcc.c (offload_targets_default): New variable.
+	(process_command): Set it if -foffload is defaulted.
+	(driver::maybe_putenv_OFFLOAD_TARGETS): Add OFFLOAD_TARGET_DEFAULT=1
+	into environment if -foffload has been defaulted.
+	* lto-wrapper.c (OFFLOAD_TARGET_DEFAULT_ENV): Define.
+	(compile_offload_image): If OFFLOAD_TARGET_DEFAULT
+	is in the environment, don't fail if corresponding mkoffload
+	can't be found.
+	(compile_images_for_offload_targets): Likewise.  Free and clear
+	offload_names if no valid offload is found.
+libgomp/
+	* target.c (gomp_load_plugin_for_device): If a plugin can't be
+	dlopened, assume it has no devices silently.
+
+--- gcc/gcc.c.jj	2017-01-17 10:28:40.000000000 +0100
++++ gcc/gcc.c	2017-01-20 16:26:29.649962902 +0100
+@@ -290,6 +290,10 @@ static const char *spec_host_machine = D
+ 
+ static char *offload_targets = NULL;
+ 
++/* Set to true if -foffload has not been used and offload_targets
++   is set to the configured in default.  */
++static bool offload_targets_default;
++
+ /* Nonzero if cross-compiling.
+    When -b is used, the value comes from the `specs' file.  */
+ 
+@@ -4457,7 +4461,10 @@ process_command (unsigned int decoded_op
+   /* If the user didn't specify any, default to all configured offload
+      targets.  */
+   if (ENABLE_OFFLOADING && offload_targets == NULL)
+-    handle_foffload_option (OFFLOAD_TARGETS);
++    {
++      handle_foffload_option (OFFLOAD_TARGETS);
++      offload_targets_default = true;
++    }
+ 
+   if (output_file
+       && strcmp (output_file, "-") != 0
+@@ -7693,6 +7700,8 @@ driver::maybe_putenv_OFFLOAD_TARGETS ()
+       obstack_grow (&collect_obstack, offload_targets,
+ 		    strlen (offload_targets) + 1);
+       xputenv (XOBFINISH (&collect_obstack, char *));
++      if (offload_targets_default)
++	  xputenv ("OFFLOAD_TARGET_DEFAULT=1");
+     }
+ 
+   free (offload_targets);
+--- gcc/lto-wrapper.c.jj	2017-01-01 12:45:34.000000000 +0100
++++ gcc/lto-wrapper.c	2017-01-20 16:34:18.294016997 +0100
+@@ -52,6 +52,7 @@ along with GCC; see the file COPYING3.
+ /* Environment variable, used for passing the names of offload targets from GCC
+    driver to lto-wrapper.  */
+ #define OFFLOAD_TARGET_NAMES_ENV	"OFFLOAD_TARGET_NAMES"
++#define OFFLOAD_TARGET_DEFAULT_ENV	"OFFLOAD_TARGET_DEFAULT"
+ 
+ enum lto_mode_d {
+   LTO_MODE_NONE,			/* Not doing LTO.  */
+@@ -820,6 +821,12 @@ compile_offload_image (const char *targe
+ 	break;
+       }
+ 
++  if (!compiler && getenv (OFFLOAD_TARGET_DEFAULT_ENV))
++    {
++      free_array_of_ptrs ((void **) paths, n_paths);
++      return NULL;
++    }
++
+   if (!compiler)
+     fatal_error (input_location,
+ 		 "could not find %s in %s (consider using %<-B%>)\n",
+@@ -883,6 +890,7 @@ compile_images_for_offload_targets (unsi
+   unsigned num_targets = parse_env_var (target_names, &names, NULL);
+ 
+   int next_name_entry = 0;
++  bool hsa_seen = false;
+   const char *compiler_path = getenv ("COMPILER_PATH");
+   if (!compiler_path)
+     goto out;
+@@ -895,18 +903,26 @@ compile_images_for_offload_targets (unsi
+       /* HSA does not use LTO-like streaming and a different compiler, skip
+ 	 it. */
+       if (strcmp (names[i], "hsa") == 0)
+-	continue;
++	{
++	  hsa_seen = true;
++	  continue;
++	}
+ 
+       offload_names[next_name_entry]
+ 	= compile_offload_image (names[i], compiler_path, in_argc, in_argv,
+ 				 compiler_opts, compiler_opt_count,
+ 				 linker_opts, linker_opt_count);
+       if (!offload_names[next_name_entry])
+-	fatal_error (input_location,
+-		     "problem with building target image for %s\n", names[i]);
++	continue;
+       next_name_entry++;
+     }
+ 
++  if (next_name_entry == 0 && !hsa_seen)
++    {
++      free (offload_names);
++      offload_names = NULL;
++    }
++
+  out:
+   free_array_of_ptrs ((void **) names, num_targets);
+ }
+--- libgomp/target.c.jj	2017-01-01 12:45:52.000000000 +0100
++++ libgomp/target.c	2017-01-20 20:12:13.756710875 +0100
+@@ -2356,7 +2356,7 @@ gomp_load_plugin_for_device (struct gomp
+ 
+   void *plugin_handle = dlopen (plugin_name, RTLD_LAZY);
+   if (!plugin_handle)
+-    goto dl_fail;
++    return 0;
+ 
+   /* Check if all required functions are available in the plugin and store
+      their handlers.  None of the symbols can legitimately be NULL,
diff --git a/gcc16-hack.patch b/gcc9-hack.patch
similarity index 54%
rename from gcc16-hack.patch
rename to gcc9-hack.patch
index 61331bf..ba80c24 100644
--- a/gcc16-hack.patch
+++ b/gcc9-hack.patch
@@ -64,119 +64,63 @@
 +				infodir="$(infodir)" \
  				GOCFLAGS="$(GOCFLAGS) $${flags}" \
  				GDCFLAGS="$(GDCFLAGS) $${flags}" \
- 				A68FLAGS="$(A68FLAGS) $${flags}" \
---- libcpp/macro.cc.jj	2019-01-09 13:01:21.420552123 +0100
-+++ libcpp/macro.cc	2024-11-30 13:16:41.163056391 +0100
-@@ -3680,8 +3680,6 @@ static cpp_macro *
+ 				CXXFLAGS="$(CXXFLAGS) $${flags}" \
+--- libcpp/macro.c.jj	2019-01-09 13:01:21.420552123 +0100
++++ libcpp/macro.c	2019-01-11 18:18:17.736876285 +0100
+@@ -3256,8 +3256,6 @@ static cpp_macro *
  create_iso_definition (cpp_reader *pfile)
  {
    bool following_paste_op = false;
 -  const char *paste_op_error_msg =
--    N_("%<##%> cannot appear at either end of a macro expansion");
+-    N_("'##' cannot appear at either end of a macro expansion");
    unsigned int num_extra_tokens = 0;
    unsigned nparms = 0;
    cpp_hashnode **params = NULL;
-@@ -3809,7 +3807,9 @@ create_iso_definition (cpp_reader *pfile
+@@ -3382,7 +3380,9 @@ create_iso_definition (cpp_reader *pfile
  	     function-like macros, but not at the end.  */
  	  if (following_paste_op)
  	    {
 -	      cpp_error (pfile, CPP_DL_ERROR, paste_op_error_msg);
 +	      cpp_error (pfile, CPP_DL_ERROR,
-+			 "%<##%> cannot appear at either end of a macro "
++			 "'##' cannot appear at either end of a macro "
 +			 "expansion");
  	      goto out;
  	    }
  	  if (!vaopt_tracker.completed ())
-@@ -3824,7 +3824,9 @@ create_iso_definition (cpp_reader *pfile
+@@ -3397,7 +3397,9 @@ create_iso_definition (cpp_reader *pfile
  	     function-like macros, but not at the beginning.  */
  	  if (macro->count == 1)
  	    {
 -	      cpp_error (pfile, CPP_DL_ERROR, paste_op_error_msg);
 +	      cpp_error (pfile, CPP_DL_ERROR,
-+			 "%<##%> cannot appear at either end of a macro "
++			 "'##' cannot appear at either end of a macro "
 +			 "expansion");
  	      goto out;
  	    }
  
---- libcpp/expr.cc.jj	2019-01-09 13:01:22.415535734 +0100
-+++ libcpp/expr.cc	2024-11-30 13:14:52.468583689 +0100
-@@ -874,50 +874,54 @@ cpp_classify_number (cpp_reader *pfile,
+--- libcpp/expr.c.jj	2019-01-09 13:01:22.415535734 +0100
++++ libcpp/expr.c	2019-01-11 18:16:23.444726882 +0100
+@@ -788,16 +788,17 @@ cpp_classify_number (cpp_reader *pfile,
        if ((result & CPP_N_WIDTH) == CPP_N_LARGE
  	  && CPP_OPTION (pfile, cpp_warn_long_long))
          {
--          const char *message = CPP_OPTION (pfile, cplusplus)
+-          const char *message = CPP_OPTION (pfile, cplusplus) 
 -				? N_("use of C++11 long long integer constant")
 -		                : N_("use of C99 long long integer constant");
 -
  	  if (CPP_OPTION (pfile, c99))
--            cpp_warning_with_line (pfile, CPP_W_LONG_LONG, virtual_location,
+             cpp_warning_with_line (pfile, CPP_W_LONG_LONG, virtual_location,
 -				   0, message);
-+            cpp_warning_with_line (pfile, CPP_W_LONG_LONG, virtual_location, 0,
-+				   CPP_OPTION (pfile, cplusplus)
-+				   ? N_("use of C++11 long long integer "
-+					"constant")
-+				   : N_("use of C99 long long integer "
-+					"constant"));
++				   0, CPP_OPTION (pfile, cplusplus)
++				      ? N_("use of C++11 long long integer constant")
++				      : N_("use of C99 long long integer constant"));
            else
              cpp_pedwarning_with_line (pfile, CPP_W_LONG_LONG,
 -				      virtual_location, 0, message);
 +				      virtual_location, 0,
 +				      CPP_OPTION (pfile, cplusplus)
-+				      ? N_("use of C++11 long long integer "
-+					   "constant")
-+				      : N_("use of C99 long long integer "
-+					   "constant"));
++				      ? N_("use of C++11 long long integer constant")
++				      : N_("use of C99 long long integer constant"));
          }
  
-       if ((result & CPP_N_SIZE_T) == CPP_N_SIZE_T
- 	  && !CPP_OPTION (pfile, size_t_literals))
--       {
--	  const char *message
--	    = (result & CPP_N_UNSIGNED) == CPP_N_UNSIGNED
--	      ? N_("use of C++23 %<size_t%> integer constant")
--	      : N_("use of C++23 %<make_signed_t<size_t>%> integer constant");
--	  cpp_warning_with_line (pfile, CPP_W_SIZE_T_LITERALS,
--				 virtual_location, 0, message);
--       }
-+	cpp_warning_with_line (pfile, CPP_W_SIZE_T_LITERALS,
-+			       virtual_location, 0,
-+			       (result & CPP_N_UNSIGNED) == CPP_N_UNSIGNED
-+				? N_("use of C++23 %<size_t%> integer "
-+				     "constant")
-+				: N_("use of C++23 %<make_signed_t<size_t>%> "
-+				     "integer constant"));
- 
-       if ((result & CPP_N_BITINT) != 0
- 	  && CPP_OPTION (pfile, cpp_warn_c11_c23_compat) != 0)
- 	{
- 	  if (CPP_OPTION (pfile, cpp_warn_c11_c23_compat) > 0)
- 	    {
--	      const char *message = N_("ISO C does not support literal "
--				       "%<wb%> suffixes before C23");
- 	      if (CPP_PEDANTIC (pfile) && !CPP_OPTION (pfile, true_false))
- 		cpp_pedwarning_with_line (pfile, CPP_W_C11_C23_COMPAT,
--					  virtual_location, 0, message);
-+					  virtual_location, 0,
-+					  "ISO C does not support literal "
-+					  "%<wb%> suffixes before C23");
- 	      else
- 		cpp_warning_with_line (pfile, CPP_W_C11_C23_COMPAT,
--				       virtual_location, 0, message);
--	    }
--	  else if (!CPP_OPTION (pfile, true_false))
--	    {
--	      const char *message = N_("ISO C does not support literal "
-+				       virtual_location, 0,
-+				       "ISO C does not support literal "
- 				       "%<wb%> suffixes before C23");
--	      cpp_pedwarning_with_line (pfile, CPP_W_PEDANTIC,
--					virtual_location, 0, message);
- 	    }
-+	  else if (!CPP_OPTION (pfile, true_false))
-+	    cpp_pedwarning_with_line (pfile, CPP_W_PEDANTIC,
-+				      virtual_location, 0,
-+				      "ISO C does not support literal "
-+				      "%<wb%> suffixes before C23");
- 	}
- 
        result |= CPP_N_INTEGER;
diff --git a/gcc9-i386-libgomp.patch b/gcc9-i386-libgomp.patch
new file mode 100644
index 0000000..520561e
--- /dev/null
+++ b/gcc9-i386-libgomp.patch
@@ -0,0 +1,11 @@
+--- libgomp/configure.tgt.jj	2008-01-10 20:53:48.000000000 +0100
++++ libgomp/configure.tgt	2008-03-27 12:44:51.000000000 +0100
+@@ -67,7 +67,7 @@ if test $enable_linux_futex = yes; then
+ 	    ;;
+ 	  *)
+ 	    if test -z "$with_arch"; then
+-	      XCFLAGS="${XCFLAGS} -march=i486 -mtune=${target_cpu}"
++	      XCFLAGS="${XCFLAGS} -march=i486 -mtune=generic"
+ 	    fi
+ 	esac
+ 	;;
diff --git a/gcc16-isl-dl.patch b/gcc9-isl-dl.patch
similarity index 96%
rename from gcc16-isl-dl.patch
rename to gcc9-isl-dl.patch
index dc0c49b..46d3b0d 100644
--- a/gcc16-isl-dl.patch
+++ b/gcc9-isl-dl.patch
@@ -1,15 +1,15 @@
 --- gcc/Makefile.in.jj	2015-06-06 10:00:25.000000000 +0200
 +++ gcc/Makefile.in	2015-11-04 14:56:02.643536437 +0100
-@@ -1063,7 +1063,7 @@ BUILD_LIBDEPS= $(BUILD_LIBIBERTY)
+@@ -1046,7 +1046,7 @@ BUILD_LIBDEPS= $(BUILD_LIBIBERTY)
  # and the system's installed libraries.
  LIBS = @LIBS@ libcommon.a $(CPPLIB) $(LIBINTL) $(LIBICONV) $(LIBBACKTRACE) \
  	$(LIBIBERTY) $(LIBDECNUMBER) $(HOST_LIBS)
 -BACKENDLIBS = $(ISLLIBS) $(GMPLIBS) $(PLUGINLIBS) $(HOST_LIBS) \
 +BACKENDLIBS = $(if $(ISLLIBS),-ldl) $(GMPLIBS) $(PLUGINLIBS) $(HOST_LIBS) \
- 	$(ZLIB) $(ZSTD_LIB)
+ 	$(ZLIB)
  # Any system libraries needed just for GNAT.
  SYSLIBS = @GNAT_LIBEXC@
-@@ -2302,6 +2302,15 @@ $(out_object_file): $(out_file)
+@@ -2196,6 +2196,15 @@ $(out_object_file): $(out_file)
  $(common_out_object_file): $(common_out_file)
  	$(COMPILE) $<
  	$(POSTCOMPILE)
@@ -26,11 +26,11 @@
  # Generate header and source files from the machine description,
  # and compile them.
 --- gcc/graphite.h.jj	2016-01-27 12:44:06.000000000 +0100
-+++ gcc/graphite.h	2022-11-03 19:14:50.369690720 +0100
-@@ -24,6 +24,591 @@ along with GCC; see the file COPYING3.
- 
- #include "sese.h"
- 
++++ gcc/graphite.h	2016-01-27 13:26:38.309876856 +0100
+@@ -39,6 +39,590 @@ along with GCC; see the file COPYING3.
+ #include <isl/schedule_node.h>
+ #include <isl/id.h>
+ #include <isl/space.h>
 +#include <isl/version.h>
 +#include <dlfcn.h>
 +
@@ -41,15 +41,15 @@
 +  DYNSYM (isl_aff_set_coefficient_si); \
 +  DYNSYM (isl_aff_set_constant_si); \
 +  DYNSYM (isl_aff_zero_on_domain); \
-+  /* DYNSYM (isl_band_free); */ \
-+  /* DYNSYM (isl_band_get_children); */ \
-+  /* DYNSYM (isl_band_get_partial_schedule); */ \
-+  /* DYNSYM (isl_band_has_children); */ \
-+  /* DYNSYM (isl_band_list_free); */ \
-+  /* DYNSYM (isl_band_list_get_band); */ \
-+  /* DYNSYM (isl_band_list_get_ctx); */ \
-+  /* DYNSYM (isl_band_list_n_band); */ \
-+  /* DYNSYM (isl_band_n_member); */ \
++  DYNSYM (isl_band_free); \
++  DYNSYM (isl_band_get_children); \
++  DYNSYM (isl_band_get_partial_schedule); \
++  DYNSYM (isl_band_has_children); \
++  DYNSYM (isl_band_list_free); \
++  DYNSYM (isl_band_list_get_band); \
++  DYNSYM (isl_band_list_get_ctx); \
++  DYNSYM (isl_band_list_n_band); \
++  DYNSYM (isl_band_n_member); \
 +  DYNSYM (isl_basic_map_add_constraint); \
 +  DYNSYM (isl_basic_map_project_out); \
 +  DYNSYM (isl_basic_map_universe); \
@@ -91,7 +91,7 @@
 +  DYNSYM (isl_map_is_empty); \
 +  DYNSYM (isl_map_lex_ge); \
 +  DYNSYM (isl_map_lex_le); \
-+  /* DYNSYM (isl_map_n_out); */ \
++  DYNSYM (isl_map_n_out); \
 +  DYNSYM (isl_map_range); \
 +  DYNSYM (isl_map_set_tuple_id); \
 +  DYNSYM (isl_map_universe); \
@@ -124,7 +124,7 @@
 +  DYNSYM (isl_pw_aff_sub); \
 +  DYNSYM (isl_pw_aff_zero_set); \
 +  DYNSYM (isl_schedule_free); \
-+  /* DYNSYM (isl_schedule_get_band_forest); */ \
++  DYNSYM (isl_schedule_get_band_forest); \
 +  DYNSYM (isl_set_add_constraint); \
 +  DYNSYM (isl_set_add_dims); \
 +  DYNSYM (isl_set_apply); \
@@ -615,21 +615,20 @@
 +#define isl_version (*isl_pointers__.p_isl_version)
 +#define isl_options_get_on_error (*isl_pointers__.p_isl_options_get_on_error)
 +#define isl_ctx_reset_error (*isl_pointers__.p_isl_ctx_reset_error)
-+
+ 
  typedef struct poly_dr *poly_dr_p;
  
- typedef struct poly_bb *poly_bb_p;
-@@ -448,5 +1033,6 @@ extern tree cached_scalar_evolution_in_r
+@@ -461,5 +1045,6 @@ extern void build_scops (vec<scop_p> *);
  extern void dot_all_sese (FILE *, vec<sese_l> &);
  extern void dot_sese (sese_l &);
  extern void dot_cfg ();
 +extern const char *get_isl_version (bool);
  
  #endif
---- gcc/graphite.cc.jj	2015-11-04 14:15:32.000000000 +0100
-+++ gcc/graphite.cc	2015-11-04 14:56:02.645536409 +0100
+--- gcc/graphite.c.jj	2015-11-04 14:15:32.000000000 +0100
++++ gcc/graphite.c	2015-11-04 14:56:02.645536409 +0100
 @@ -60,6 +60,35 @@ along with GCC; see the file COPYING3.
- #include "tree-ssa-propagate.h"
+ #include "tree-into-ssa.h"
  #include "graphite.h"
  
 +__typeof (isl_pointers__) isl_pointers__;
@@ -641,7 +640,7 @@
 +
 +  if (isl_pointers__.inited)
 +    return isl_pointers__.h != NULL;
-+  h = dlopen ("libisl.so.23", RTLD_LAZY);
++  h = dlopen ("libisl.so.15", RTLD_LAZY);
 +  isl_pointers__.h = h;
 +  if (h == NULL)
 +    return false;
@@ -664,7 +663,7 @@
  /* Print global statistics to FILE.  */
  
  static void
-@@ -424,6 +453,15 @@ graphite_transform_loops (void)
+@@ -365,6 +394,15 @@ graphite_transform_loops (void)
    if (parallelized_function_p (cfun->decl))
      return;
  
@@ -680,7 +679,7 @@
    calculate_dominance_info (CDI_DOMINATORS);
  
    /* We rely on post-dominators during merging of SESE regions so those
-@@ -519,6 +557,14 @@ graphite_transform_loops (void)
+@@ -455,6 +493,14 @@ graphite_transform_loops (void)
      }
  }
  
@@ -695,17 +694,17 @@
  #else /* If isl is not available: #ifndef HAVE_isl.  */
  
  static void
---- gcc/toplev.cc.jj	2017-02-19 13:02:31.000000000 +0100
-+++ gcc/toplev.cc	2024-11-30 13:22:34.175096117 +0100
-@@ -100,6 +100,7 @@ along with GCC; see the file COPYING3.
+--- gcc/toplev.c.jj	2017-02-19 13:02:31.000000000 +0100
++++ gcc/toplev.c	2017-02-19 16:50:25.536301350 +0100
+@@ -94,6 +94,7 @@ along with GCC; see the file COPYING3.
  
  #ifdef HAVE_isl
  #include <isl/version.h>
 +extern const char *get_isl_version (bool);
  #endif
  
- static void general_init (const char *, bool, unique_argv original_argv);
-@@ -652,7 +653,7 @@ print_version (FILE *file, const char *i
+ static void general_init (const char *, bool);
+@@ -683,7 +684,7 @@ print_version (FILE *file, const char *i
  #ifndef HAVE_isl
  	   "none"
  #else
diff --git a/gcc16-libgomp-omp_h-multilib.patch b/gcc9-libgomp-omp_h-multilib.patch
similarity index 100%
rename from gcc16-libgomp-omp_h-multilib.patch
rename to gcc9-libgomp-omp_h-multilib.patch
diff --git a/gcc16-libstdc++-docs.patch b/gcc9-libstdc++-docs.patch
similarity index 69%
rename from gcc16-libstdc++-docs.patch
rename to gcc9-libstdc++-docs.patch
index 7d2d357..ce07f32 100644
--- a/gcc16-libstdc++-docs.patch
+++ b/gcc9-libstdc++-docs.patch
@@ -4,21 +4,21 @@
        <a class="link" href="https://www.fsf.org" target="_top">FSF
        </a>
      </p><p>
-+      Release 16.0.1
++      Release 9.3.1
 +    </p><p>
        Permission is granted to copy, distribute and/or modify this
        document under the terms of the GNU Free Documentation
        License, Version 1.2 or any later version published by the
 --- libstdc++-v3/doc/html/api.html.jj	2011-01-03 12:53:21.000000000 +0100
-+++ libstdc++-v3/doc/html/api.html	2024-11-30 13:30:16.607594623 +0100
++++ libstdc++-v3/doc/html/api.html	2011-01-04 18:12:01.672757784 +0100
 @@ -20,7 +20,9 @@
    member functions for the library classes, finding out what is in a
    particular include file, looking at inheritance diagrams, etc.
  </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 16.0.1 release</a>,
++  <a class="link" href="api/index.html" target="_top">for the 9.3.1 release</a>,
 +  online
-   <a class="link" href="https://gcc.gnu.org/onlinedocs/" target="_top">for each GCC release</a>
+   <a class="link" href="http://gcc.gnu.org/onlinedocs/" target="_top">for each GCC release</a>
    and
-   <a class="link" href="https://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/index.html" target="_top">
+   <a class="link" href="http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/index.html" target="_top">
diff --git a/gcc16-libtool-no-rpath.patch b/gcc9-libtool-no-rpath.patch
similarity index 87%
rename from gcc16-libtool-no-rpath.patch
rename to gcc9-libtool-no-rpath.patch
index 8429a4c..466c661 100644
--- a/gcc16-libtool-no-rpath.patch
+++ b/gcc9-libtool-no-rpath.patch
@@ -5,7 +5,7 @@ libtool sucks.
  	  rpath="$finalize_rpath"
  	  test "$mode" != relink && rpath="$compile_rpath$rpath"
  	  for libdir in $rpath; do
-+	    case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64|/usr/lib/../lib64/lp64d) continue;; esac
++	    case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac
  	    if test -n "$hardcode_libdir_flag_spec"; then
  	      if test -n "$hardcode_libdir_separator"; then
  		if test -z "$hardcode_libdirs"; then
@@ -13,7 +13,7 @@ libtool sucks.
        rpath=
        hardcode_libdirs=
        for libdir in $compile_rpath $finalize_rpath; do
-+	case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64|/usr/lib/../lib64/lp64d) continue;; esac
++	case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac
  	if test -n "$hardcode_libdir_flag_spec"; then
  	  if test -n "$hardcode_libdir_separator"; then
  	    if test -z "$hardcode_libdirs"; then
@@ -21,7 +21,7 @@ libtool sucks.
        rpath=
        hardcode_libdirs=
        for libdir in $finalize_rpath; do
-+	case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64|/usr/lib/../lib64/lp64d) continue;; esac
++	case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac
  	if test -n "$hardcode_libdir_flag_spec"; then
  	  if test -n "$hardcode_libdir_separator"; then
  	    if test -z "$hardcode_libdirs"; then
diff --git a/gcc16-no-add-needed.patch b/gcc9-no-add-needed.patch
similarity index 96%
rename from gcc16-no-add-needed.patch
rename to gcc9-no-add-needed.patch
index 74f5c1f..5817299 100644
--- a/gcc16-no-add-needed.patch
+++ b/gcc9-no-add-needed.patch
@@ -34,4 +34,4 @@
 +#define LINK_EH_SPEC "--no-add-needed %{!static|static-pie:--eh-frame-hdr} "
  #endif
  
- 
+ #define GNU_USER_TARGET_LINK_GCC_C_SEQUENCE_SPEC \
diff --git a/gcc9-rh1574936.patch b/gcc9-rh1574936.patch
new file mode 100644
index 0000000..32db990
--- /dev/null
+++ b/gcc9-rh1574936.patch
@@ -0,0 +1,31 @@
+crt files and statically linked libgcc objects cause false positives
+in annobin coverage, so we add the assembler flag to generate notes
+for them.
+
+The patch also adds notes to libgcc_s.so, but this is harmless because
+these notes only confer that there is no other annobin markup.
+
+2018-07-25  Florian Weimer  <fweimer@redhat.com>
+
+	* Makefile.in (LIBGCC2_CFLAGS, CRTSTUFF_CFLAGS): Add
+	-Wa,--generate-missing-build-notes=yes.
+
+--- libgcc/Makefile.in	2018-01-13 13:05:41.000000000 +0100
++++ libgcc/Makefile.in	2018-07-25 13:15:02.036226940 +0200
+@@ -244,6 +244,7 @@
+ LIBGCC2_CFLAGS = -O2 $(LIBGCC2_INCLUDES) $(GCC_CFLAGS) $(HOST_LIBGCC2_CFLAGS) \
+ 		 $(LIBGCC2_DEBUG_CFLAGS) -DIN_LIBGCC2 \
+ 		 -fbuilding-libgcc -fno-stack-protector \
++		 -Wa,--generate-missing-build-notes=yes \
+ 		 $(INHIBIT_LIBC_CFLAGS)
+ 
+ # Additional options to use when compiling libgcc2.a.
+@@ -297,6 +298,7 @@
+   $(NO_PIE_CFLAGS) -finhibit-size-directive -fno-inline -fno-exceptions \
+   -fno-zero-initialized-in-bss -fno-toplevel-reorder -fno-tree-vectorize \
+   -fbuilding-libgcc -fno-stack-protector $(FORCE_EXPLICIT_EH_REGISTRY) \
++  -Wa,--generate-missing-build-notes=yes \
+   $(INHIBIT_LIBC_CFLAGS)
+ 
+ # Extra flags to use when compiling crt{begin,end}.o.
+
diff --git a/gcc16-sparc-config-detection.patch b/gcc9-sparc-config-detection.patch
similarity index 77%
rename from gcc16-sparc-config-detection.patch
rename to gcc9-sparc-config-detection.patch
index bbe8ec3..bb06b35 100644
--- a/gcc16-sparc-config-detection.patch
+++ b/gcc9-sparc-config-detection.patch
@@ -1,21 +1,21 @@
 --- gcc/config.gcc.jj	2008-04-24 15:42:46.000000000 -0500
 +++ gcc/config.gcc	2008-04-24 15:44:51.000000000 -0500
-@@ -3330,7 +3330,7 @@ sparc-*-rtems*)
- 	tm_file="${tm_file} elfos.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h newlib-stdint.h"
+@@ -2790,7 +2790,7 @@ sparc-*-rtems*)
+ 	tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h newlib-stdint.h"
  	tmake_file="${tmake_file} sparc/t-sparc sparc/t-rtems"
  	;;
 -sparc-*-linux*)
 +sparc-*-linux* | sparcv9-*-linux*)
- 	tm_file="${tm_file} elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/tso.h"
+ 	tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/tso.h"
  	extra_options="${extra_options} sparc/long-double-switch.opt"
  	case ${target} in
-@@ -3384,7 +3384,7 @@ sparc64-*-rtems*)
+@@ -2844,7 +2844,7 @@ sparc64-*-rtems*)
  	extra_options="${extra_options}"
  	tmake_file="${tmake_file} sparc/t-sparc sparc/t-rtems-64"
  	;;
 -sparc64-*-linux*)
 +sparc64*-*-linux*)
- 	tm_file="sparc/biarch64.h ${tm_file} elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/default64.h sparc/linux64.h sparc/tso.h"
+ 	tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/default64.h sparc/linux64.h sparc/tso.h"
  	extra_options="${extra_options} sparc/long-double-switch.opt"
  	tmake_file="${tmake_file} sparc/t-sparc sparc/t-linux64"
 --- libgcc/config.host.jj	2008-04-24 15:46:19.000000000 -0500
diff --git a/isl-rh2155127.patch b/isl-rh2155127.patch
deleted file mode 100644
index 092bddb..0000000
--- a/isl-rh2155127.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From: Sven Verdoolaege <sven.verdoolaege@gmail.com>
-Date: Mon, 6 Jun 2022 12:56:02 +0000 (+0200)
-Subject: update m4/ax_prog_cc_for_build.m4
-X-Git-Tag: isl-0.25~11
-X-Git-Url: https://repo.or.cz/isl.git/commitdiff_plain/b4dcdfadc29a6c9f410a72f345f3f32725b1d38b
-
-update m4/ax_prog_cc_for_build.m4
-
-In particular, update to the latest version from the autoconf archive,
-but preserve the changes from isl-0.22.1-358-gcd42abdf2
-(m4/ax_prog_cc_for_build.m4: do not override host compiler dependency style,
-Tue Jun 9 10:54:10 2020 +0200).
-
-Signed-off-by: Sven Verdoolaege <sven.verdoolaege@gmail.com>
-
---- isl-0.24/m4/ax_prog_cc_for_build.m4.jj	2021-03-02 12:07:09.000000000 +0100
-+++ isl-0.24/m4/ax_prog_cc_for_build.m4	2022-12-20 18:11:18.855777817 +0100
-@@ -32,7 +32,7 @@
- #   and this notice are preserved. This file is offered as-is, without any
- #   warranty.
- 
--#serial 18
-+#serial 21
- 
- AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD])
- AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl
-@@ -44,6 +44,8 @@ dnl Use the standard macros, but make th
- dnl
- pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl
- pushdef([ac_cv_prog_cc_c89], ac_cv_build_prog_cc_c89)dnl
-+pushdef([ac_cv_prog_cc_c99], ac_cv_build_prog_cc_c99)dnl
-+pushdef([ac_cv_prog_cc_c11], ac_cv_build_prog_cc_c11)dnl
- pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl
- pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl
- pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl
-@@ -86,7 +88,21 @@ AS_IF([test -n "$build"],      [ac_build
-       [test -n "$build_alias"],[ac_build_tool_prefix="$build_alias-"])
- 
- AC_LANG_PUSH([C])
-+
-+dnl The pushdef([ac_cv_c_compiler_gnu], ...) currently does not cover
-+dnl the use of this variable in _AC_LANG_COMPILER_GNU called by
-+dnl AC_PROG_CC. Unset this cache variable temporarily as a workaround.
-+was_set_c_compiler_gnu=${[ac_cv_c_compiler_gnu]+y}
-+AS_IF([test ${was_set_c_compiler_gnu}],
-+    [saved_c_compiler_gnu=$[ac_cv_c_compiler_gnu]
-+    AS_UNSET([[ac_cv_c_compiler_gnu]])])
-+
- AC_PROG_CC
-+
-+dnl Restore ac_cv_c_compiler_gnu
-+AS_IF([test ${was_set_c_compiler_gnu}],
-+  [[ac_cv_c_compiler_gnu]=$[saved_c_compiler_gnu]])
-+
- _AC_COMPILER_EXEEXT
- _AC_COMPILER_OBJEXT
- AC_PROG_CPP
---- isl-0.24/configure.jj	2021-04-26 11:13:19.000000000 +0200
-+++ isl-0.24/configure	2022-12-20 18:11:36.882518568 +0100
-@@ -5002,6 +4990,13 @@ ac_compile='$CC_FOR_BUILD -c $CFLAGS_FOR
- ac_link='$CC_FOR_BUILD -o conftest$ac_build_exeext $CFLAGS_FOR_BUILD $CPPFLAGS_FOR_BUILD $LDFLAGS_FOR_BUILD conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_build_c_compiler_gnu
- 
-+
-+was_set_c_compiler_gnu=${ac_cv_c_compiler_gnu+y}
-+if test ${was_set_c_compiler_gnu}; then :
-+  saved_c_compiler_gnu=$ac_cv_c_compiler_gnu
-+    { ac_cv_c_compiler_gnu=; unset ac_cv_c_compiler_gnu;}
-+fi
-+
- ac_ext=c
- ac_cpp='$CPP_FOR_BUILD $CPPFLAGS_FOR_BUILD'
- ac_compile='$CC_FOR_BUILD -c $CFLAGS_FOR_BUILD $CPPFLAGS_FOR_BUILD conftest.$ac_ext >&5'
-@@ -5728,6 +5723,11 @@ else
- fi
- 
- 
-+
-+if test ${was_set_c_compiler_gnu}; then :
-+  ac_cv_c_compiler_gnu=$saved_c_compiler_gnu
-+fi
-+
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
diff --git a/nvptx-tools-build.patch b/nvptx-tools-build.patch
new file mode 100644
index 0000000..53d7483
--- /dev/null
+++ b/nvptx-tools-build.patch
@@ -0,0 +1,11 @@
+--- nvptx-tools/nvptx-as.c.jj	2017-01-20 12:40:18.000000000 +0100
++++ nvptx-tools/nvptx-as.c	2017-01-20 12:43:53.864271442 +0100
+@@ -939,7 +939,7 @@ fork_execute (const char *prog, char *co
+ 	  fatal_error ("%s: %m", errmsg);
+ 	}
+       else
+-	fatal_error (errmsg);
++	fatal_error ("%s", errmsg);
+     }
+   do_wait (prog, pex);
+ }
diff --git a/nvptx-tools-glibc.patch b/nvptx-tools-glibc.patch
new file mode 100644
index 0000000..4b50114
--- /dev/null
+++ b/nvptx-tools-glibc.patch
@@ -0,0 +1,32 @@
+--- nvptx-tools/configure.ac.jj	2017-01-13 12:48:31.000000000 +0100
++++ nvptx-tools/configure.ac	2017-05-03 10:26:57.076092259 +0200
+@@ -66,6 +66,8 @@ CPPFLAGS=$save_CPPFLAGS
+ LDFLAGS=$save_LDFLAGS
+ LIBS=$save_LIBS
+ 
++AC_CHECK_DECLS(getopt)
++
+ AC_CONFIG_SUBDIRS([libiberty])
+ AC_CONFIG_FILES([Makefile dejagnu.exp])
+ AC_OUTPUT
+--- nvptx-tools/configure.jj	2017-01-13 12:48:54.000000000 +0100
++++ nvptx-tools/configure	2017-05-03 10:27:13.503876809 +0200
+@@ -3963,6 +3963,18 @@ CPPFLAGS=$save_CPPFLAGS
+ LDFLAGS=$save_LDFLAGS
+ LIBS=$save_LIBS
+ 
++ac_fn_c_check_decl "$LINENO" "getopt" "ac_cv_have_decl_getopt" "$ac_includes_default"
++if test "x$ac_cv_have_decl_getopt" = x""yes; then :
++  ac_have_decl=1
++else
++  ac_have_decl=0
++fi
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_GETOPT $ac_have_decl
++_ACEOF
++
++
+ 
+ 
+ subdirs="$subdirs libiberty"
diff --git a/nvptx-tools-no-ptxas.patch b/nvptx-tools-no-ptxas.patch
new file mode 100644
index 0000000..28bc597
--- /dev/null
+++ b/nvptx-tools-no-ptxas.patch
@@ -0,0 +1,947 @@
+--- nvptx-tools/configure.ac
++++ nvptx-tools/configure.ac
+@@ -51,6 +51,7 @@ LIBS="$LIBS -lcuda"
+ AC_CHECK_FUNCS([[cuGetErrorName] [cuGetErrorString]])
+ AC_CHECK_DECLS([[cuGetErrorName], [cuGetErrorString]],
+   [], [], [[#include <cuda.h>]])
++AC_CHECK_HEADERS(unistd.h sys/stat.h)
+ 
+ AC_MSG_CHECKING([for extra programs to build requiring -lcuda])
+ NVPTX_RUN=
+--- nvptx-tools/include/libiberty.h
++++ nvptx-tools/include/libiberty.h
+@@ -390,6 +390,17 @@ extern void hex_init (void);
+ /* Save files used for communication between processes.  */
+ #define PEX_SAVE_TEMPS		0x4
+ 
++/* Max number of alloca bytes per call before we must switch to malloc.
++
++   ?? Swiped from gnulib's regex_internal.h header.  Is this actually
++   the case?  This number seems arbitrary, though sane.
++
++   The OS usually guarantees only one guard page at the bottom of the stack,
++   and a page size can be as small as 4096 bytes.  So we cannot safely
++   allocate anything larger than 4096 bytes.  Also care for the possibility
++   of a few compiler-allocated temporary stack slots.  */
++#define MAX_ALLOCA_SIZE	4032
++
+ /* Prepare to execute one or more programs, with standard output of
+    each program fed to standard input of the next.
+    FLAGS	As above.
+--- nvptx-tools/nvptx-as.c
++++ nvptx-tools/nvptx-as.c
+@@ -30,6 +30,9 @@
+ #include <string.h>
+ #include <wait.h>
+ #include <unistd.h>
++#ifdef HAVE_SYS_STAT_H
++#include <sys/stat.h>
++#endif
+ #include <errno.h>
+ #define obstack_chunk_alloc malloc
+ #define obstack_chunk_free free
+@@ -42,6 +45,38 @@
+ 
+ #include "version.h"
+ 
++#ifndef R_OK
++#define R_OK 4
++#define W_OK 2
++#define X_OK 1
++#endif
++
++#ifndef DIR_SEPARATOR
++#  define DIR_SEPARATOR '/'
++#endif
++
++#if defined (_WIN32) || defined (__MSDOS__) \
++    || defined (__DJGPP__) || defined (__OS2__)
++#  define HAVE_DOS_BASED_FILE_SYSTEM
++#  define HAVE_HOST_EXECUTABLE_SUFFIX
++#  define HOST_EXECUTABLE_SUFFIX ".exe"
++#  ifndef DIR_SEPARATOR_2 
++#    define DIR_SEPARATOR_2 '\\'
++#  endif
++#  define PATH_SEPARATOR ';'
++#else
++#  define PATH_SEPARATOR ':'
++#endif
++
++#ifndef DIR_SEPARATOR_2
++#  define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
++#else
++#  define IS_DIR_SEPARATOR(ch) \
++	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
++#endif
++
++#define DIR_UP ".."
++
+ static const char *outname = NULL;
+ 
+ static void __attribute__ ((format (printf, 1, 2)))
+@@ -816,7 +851,7 @@ traverse (void **slot, void *data)
+ }
+ 
+ static void
+-process (FILE *in, FILE *out)
++process (FILE *in, FILE *out, int verify, const char *outname)
+ {
+   symbol_table = htab_create (500, hash_string_hash, hash_string_eq,
+                               NULL);
+@@ -824,6 +859,18 @@ process (FILE *in, FILE *out)
+   const char *input = read_file (in);
+   Token *tok = tokenize (input);
+ 
++  /* By default, when ptxas is not in PATH, do minimalistic verification,
++     just require that the first non-comment directive is .version.  */
++  if (verify < 0)
++    {
++      size_t i;
++      for (i = 0; tok[i].kind == K_comment; i++)
++	;
++      if (tok[i].kind != K_dotted || !is_keyword (&tok[i], "version"))
++	fatal_error ("missing .version directive at start of file '%s'",
++		     outname);
++    }
++
+   do
+     tok = parse_file (tok);
+   while (tok->kind);
+@@ -897,9 +944,83 @@ fork_execute (const char *prog, char *const *argv)
+   do_wait (prog, pex);
+ }
+ 
++/* Determine if progname is available in PATH.  */
++static bool
++program_available (const char *progname)
++{
++  char *temp = getenv ("PATH");
++  if (temp)
++    {
++      char *startp, *endp, *nstore, *alloc_ptr = NULL;
++      size_t prefixlen = strlen (temp) + 1;
++      size_t len;
++      if (prefixlen < 2)
++	prefixlen = 2;
++
++      len = prefixlen + strlen (progname) + 1;
++#ifdef HAVE_HOST_EXECUTABLE_SUFFIX
++      len += strlen (HOST_EXECUTABLE_SUFFIX);
++#endif
++      if (len < MAX_ALLOCA_SIZE)
++	nstore = (char *) alloca (len);
++      else
++	alloc_ptr = nstore = (char *) malloc (len);
++
++      startp = endp = temp;
++      while (1)
++	{
++	  if (*endp == PATH_SEPARATOR || *endp == 0)
++	    {
++	      if (endp == startp)
++		{
++		  nstore[0] = '.';
++		  nstore[1] = DIR_SEPARATOR;
++		  nstore[2] = '\0';
++		}
++	      else
++		{
++		  memcpy (nstore, startp, endp - startp);
++		  if (! IS_DIR_SEPARATOR (endp[-1]))
++		    {
++		      nstore[endp - startp] = DIR_SEPARATOR;
++		      nstore[endp - startp + 1] = 0;
++		    }
++		  else
++		    nstore[endp - startp] = 0;
++		}
++	      strcat (nstore, progname);
++	      if (! access (nstore, X_OK)
++#ifdef HAVE_HOST_EXECUTABLE_SUFFIX
++		  || ! access (strcat (nstore, HOST_EXECUTABLE_SUFFIX), X_OK)
++#endif
++		 )
++		{
++#if defined (HAVE_SYS_STAT_H) && defined (S_ISREG)
++		  struct stat st;
++		  if (stat (nstore, &st) >= 0 && S_ISREG (st.st_mode))
++#endif
++		    {
++		      free (alloc_ptr);
++		      return true;
++		    }
++		}
++
++	      if (*endp == 0)
++		break;
++	      endp = startp = endp + 1;
++	    }
++	  else
++	    endp++;
++	}
++      free (alloc_ptr);
++    }
++  return false;
++}
++
+ static struct option long_options[] = {
+   {"traditional-format",     no_argument, 0,  0 },
+   {"save-temps",  no_argument,       0,  0 },
++  {"verify",  no_argument,       0,  0 },
+   {"no-verify",  no_argument,       0,  0 },
+   {"help", no_argument, 0, 'h' },
+   {"version", no_argument, 0, 'V' },
+@@ -912,7 +1033,7 @@ main (int argc, char **argv)
+   FILE *in = stdin;
+   FILE *out = stdout;
+   bool verbose __attribute__((unused)) = false;
+-  bool verify = true;
++  int verify = -1;
+   const char *smver = "sm_30";
+ 
+   int o;
+@@ -923,7 +1044,9 @@ main (int argc, char **argv)
+ 	{
+ 	case 0:
+ 	  if (option_index == 2)
+-	    verify = false;
++	    verify = 1;
++	  else if (option_index == 3)
++	    verify = 0;
+ 	  break;
+ 	case 'v':
+ 	  verbose = true;
+@@ -948,7 +1071,8 @@ Usage: nvptx-none-as [option...] [asmfile]\n\
+ Options:\n\
+   -o FILE               Write output to FILE\n\
+   -v                    Be verbose\n\
++  --verify              Do verify output is acceptable to ptxas\n\
+   --no-verify           Do not verify output is acceptable to ptxas\n\
+   --help                Print this help and exit\n\
+   --version             Print version number and exit\n\
+ \n\
+@@ -983,11 +1108,17 @@ This program has absolutely no warranty.\n",
+   if (!in)
+     fatal_error ("cannot open input ptx file");
+ 
+-  process (in, out);
+-  if  (outname)
++  if (outname == NULL)
++    verify = 0;
++  else if (verify == -1)
++    if (program_available ("ptxas"))
++      verify = 1;
++
++  process (in, out, verify, outname);
++  if (outname)
+     fclose (out);
+ 
+-  if (verify && outname)
++  if (verify > 0)
+     {
+       struct obstack argv_obstack;
+       obstack_init (&argv_obstack);
+--- nvptx-tools/configure
++++ nvptx-tools/configure
+@@ -168,7 +168,8 @@ test x\$exitcode = x0 || exit 1"
+   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1"
++  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
++test \$(( 1 + 1 )) = 2 || exit 1"
+   if (eval "$as_required") 2>/dev/null; then :
+   as_have_required=yes
+ else
+@@ -552,11 +553,50 @@ PACKAGE_URL=
+ 
+ ac_unique_file="nvptx-tools"
+ ac_unique_file="nvptx-as.c"
++# Factoring default headers for most tests.
++ac_includes_default="\
++#include <stdio.h>
++#ifdef HAVE_SYS_TYPES_H
++# include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_STAT_H
++# include <sys/stat.h>
++#endif
++#ifdef STDC_HEADERS
++# include <stdlib.h>
++# include <stddef.h>
++#else
++# ifdef HAVE_STDLIB_H
++#  include <stdlib.h>
++# endif
++#endif
++#ifdef HAVE_STRING_H
++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
++#  include <memory.h>
++# endif
++# include <string.h>
++#endif
++#ifdef HAVE_STRINGS_H
++# include <strings.h>
++#endif
++#ifdef HAVE_INTTYPES_H
++# include <inttypes.h>
++#endif
++#ifdef HAVE_STDINT_H
++# include <stdint.h>
++#endif
++#ifdef HAVE_UNISTD_H
++# include <unistd.h>
++#endif"
++
+ enable_option_checking=no
+ ac_subst_vars='LTLIBOBJS
+ LIBOBJS
+ subdirs
+ NVPTX_RUN
++EGREP
++GREP
++CPP
+ CUDA_DRIVER_LDFLAGS
+ CUDA_DRIVER_CPPFLAGS
+ AR
+@@ -635,7 +675,8 @@ LIBS
+ CPPFLAGS
+ CXX
+ CXXFLAGS
+-CCC'
++CCC
++CPP'
+ ac_subdirs_all='libiberty'
+ 
+ # Initialize some variables set by options.
+@@ -1267,6 +1308,7 @@ Some influential environment variables:
+               you have headers in a nonstandard directory <include dir>
+   CXX         C++ compiler command
+   CXXFLAGS    C++ compiler flags
++  CPP         C preprocessor
+ 
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+@@ -1575,6 +1617,203 @@ $as_echo "$ac_res" >&6; }
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ 
+ } # ac_fn_c_check_decl
++
++# ac_fn_c_try_cpp LINENO
++# ----------------------
++# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
++ac_fn_c_try_cpp ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  if { { ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
++  ac_status=$?
++  if test -s conftest.err; then
++    grep -v '^ *+' conftest.err >conftest.er1
++    cat conftest.er1 >&5
++    mv -f conftest.er1 conftest.err
++  fi
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then :
++  ac_retval=0
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++    ac_retval=1
++fi
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  return $ac_retval
++
++} # ac_fn_c_try_cpp
++
++# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
++# -------------------------------------------------------
++# Tests whether HEADER exists, giving a warning if it cannot be compiled using
++# the include files in INCLUDES and setting the cache variable VAR
++# accordingly.
++ac_fn_c_check_header_mongrel ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
++$as_echo_n "checking for $2... " >&6; }
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
++fi
++eval ac_res=\$$3
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++else
++  # Is the header compilable?
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
++$as_echo_n "checking $2 usability... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$4
++#include <$2>
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_header_compiler=yes
++else
++  ac_header_compiler=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
++$as_echo "$ac_header_compiler" >&6; }
++
++# Is the header present?
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
++$as_echo_n "checking $2 presence... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <$2>
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
++  ac_header_preproc=yes
++else
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
++$as_echo "$ac_header_preproc" >&6; }
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
++  yes:no: )
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
++$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
++    ;;
++  no:yes:* )
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
++$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
++$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
++$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
++$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
++    ;;
++esac
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
++$as_echo_n "checking for $2... " >&6; }
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
++else
++  eval "$3=\$ac_header_compiler"
++fi
++eval ac_res=\$$3
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++fi
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++
++} # ac_fn_c_check_header_mongrel
++
++# ac_fn_c_try_run LINENO
++# ----------------------
++# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
++# that executables *can* be run.
++ac_fn_c_try_run ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  if { { ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_link") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
++  { { case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; }; then :
++  ac_retval=0
++else
++  $as_echo "$as_me: program exited with status $ac_status" >&5
++       $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++       ac_retval=$ac_status
++fi
++  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  return $ac_retval
++
++} # ac_fn_c_try_run
++
++# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
++# -------------------------------------------------------
++# Tests whether HEADER exists and can be compiled using the include files in
++# INCLUDES, setting the cache variable VAR accordingly.
++ac_fn_c_check_header_compile ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
++$as_echo_n "checking for $2... " >&6; }
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$4
++#include <$2>
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  eval "$3=yes"
++else
++  eval "$3=no"
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++eval ac_res=\$$3
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++
++} # ac_fn_c_check_header_compile
+ cat >config.log <<_ACEOF
+ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
+@@ -3284,6 +3523,418 @@ cat >>confdefs.h <<_ACEOF
+ #define HAVE_DECL_CUGETERRORSTRING $ac_have_decl
+ _ACEOF
+ 
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
++$as_echo_n "checking how to run the C preprocessor... " >&6; }
++# On Suns, sometimes $CPP names a directory.
++if test -n "$CPP" && test -d "$CPP"; then
++  CPP=
++fi
++if test -z "$CPP"; then
++  if test "${ac_cv_prog_CPP+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++      # Double quotes because CPP needs to be expanded
++    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
++    do
++      ac_preproc_ok=false
++for ac_c_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++		     Syntax error
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
++
++else
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether nonexistent headers
++  # can be detected and how.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <ac_nonexistent.h>
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
++  # Broken: success on invalid input.
++continue
++else
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then :
++  break
++fi
++
++    done
++    ac_cv_prog_CPP=$CPP
++
++fi
++  CPP=$ac_cv_prog_CPP
++else
++  ac_cv_prog_CPP=$CPP
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
++$as_echo "$CPP" >&6; }
++ac_preproc_ok=false
++for ac_c_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++		     Syntax error
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
++
++else
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether nonexistent headers
++  # can be detected and how.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <ac_nonexistent.h>
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
++  # Broken: success on invalid input.
++continue
++else
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then :
++
++else
++  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." "$LINENO" 5; }
++fi
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
++$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
++if test "${ac_cv_path_GREP+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -z "$GREP"; then
++  ac_path_GREP_found=false
++  # Loop through the user's path and test for each of PROGNAME-LIST
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_prog in grep ggrep; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
++      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
++      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
++# Check for GNU ac_path_GREP and select it if it is found.
++  # Check for GNU $ac_path_GREP
++case `"$ac_path_GREP" --version 2>&1` in
++*GNU*)
++  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
++*)
++  ac_count=0
++  $as_echo_n 0123456789 >"conftest.in"
++  while :
++  do
++    cat "conftest.in" "conftest.in" >"conftest.tmp"
++    mv "conftest.tmp" "conftest.in"
++    cp "conftest.in" "conftest.nl"
++    $as_echo 'GREP' >> "conftest.nl"
++    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
++    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
++    as_fn_arith $ac_count + 1 && ac_count=$as_val
++    if test $ac_count -gt ${ac_path_GREP_max-0}; then
++      # Best one so far, save it but keep looking for a better one
++      ac_cv_path_GREP="$ac_path_GREP"
++      ac_path_GREP_max=$ac_count
++    fi
++    # 10*(2^10) chars as input seems more than enough
++    test $ac_count -gt 10 && break
++  done
++  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
++esac
++
++      $ac_path_GREP_found && break 3
++    done
++  done
++  done
++IFS=$as_save_IFS
++  if test -z "$ac_cv_path_GREP"; then
++    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++  fi
++else
++  ac_cv_path_GREP=$GREP
++fi
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
++$as_echo "$ac_cv_path_GREP" >&6; }
++ GREP="$ac_cv_path_GREP"
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
++$as_echo_n "checking for egrep... " >&6; }
++if test "${ac_cv_path_EGREP+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
++   then ac_cv_path_EGREP="$GREP -E"
++   else
++     if test -z "$EGREP"; then
++  ac_path_EGREP_found=false
++  # Loop through the user's path and test for each of PROGNAME-LIST
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_prog in egrep; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
++      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
++      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
++# Check for GNU ac_path_EGREP and select it if it is found.
++  # Check for GNU $ac_path_EGREP
++case `"$ac_path_EGREP" --version 2>&1` in
++*GNU*)
++  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
++*)
++  ac_count=0
++  $as_echo_n 0123456789 >"conftest.in"
++  while :
++  do
++    cat "conftest.in" "conftest.in" >"conftest.tmp"
++    mv "conftest.tmp" "conftest.in"
++    cp "conftest.in" "conftest.nl"
++    $as_echo 'EGREP' >> "conftest.nl"
++    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
++    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
++    as_fn_arith $ac_count + 1 && ac_count=$as_val
++    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
++      # Best one so far, save it but keep looking for a better one
++      ac_cv_path_EGREP="$ac_path_EGREP"
++      ac_path_EGREP_max=$ac_count
++    fi
++    # 10*(2^10) chars as input seems more than enough
++    test $ac_count -gt 10 && break
++  done
++  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
++esac
++
++      $ac_path_EGREP_found && break 3
++    done
++  done
++  done
++IFS=$as_save_IFS
++  if test -z "$ac_cv_path_EGREP"; then
++    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++  fi
++else
++  ac_cv_path_EGREP=$EGREP
++fi
++
++   fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
++$as_echo "$ac_cv_path_EGREP" >&6; }
++ EGREP="$ac_cv_path_EGREP"
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
++$as_echo_n "checking for ANSI C header files... " >&6; }
++if test "${ac_cv_header_stdc+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <stdlib.h>
++#include <stdarg.h>
++#include <string.h>
++#include <float.h>
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_header_stdc=yes
++else
++  ac_cv_header_stdc=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++if test $ac_cv_header_stdc = yes; then
++  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <string.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "memchr" >/dev/null 2>&1; then :
++
++else
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
++
++fi
++
++if test $ac_cv_header_stdc = yes; then
++  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <stdlib.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "free" >/dev/null 2>&1; then :
++
++else
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
++
++fi
++
++if test $ac_cv_header_stdc = yes; then
++  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
++  if test "$cross_compiling" = yes; then :
++  :
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <ctype.h>
++#include <stdlib.h>
++#if ((' ' & 0x0FF) == 0x020)
++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
++#else
++# define ISLOWER(c) \
++		   (('a' <= (c) && (c) <= 'i') \
++		     || ('j' <= (c) && (c) <= 'r') \
++		     || ('s' <= (c) && (c) <= 'z'))
++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
++#endif
++
++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
++int
++main ()
++{
++  int i;
++  for (i = 0; i < 256; i++)
++    if (XOR (islower (i), ISLOWER (i))
++	|| toupper (i) != TOUPPER (i))
++      return 2;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++
++else
++  ac_cv_header_stdc=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
++
++fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
++$as_echo "$ac_cv_header_stdc" >&6; }
++if test $ac_cv_header_stdc = yes; then
++
++$as_echo "#define STDC_HEADERS 1" >>confdefs.h
++
++fi
++
++# On IRIX 5.3, sys/types and inttypes.h are conflicting.
++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
++		  inttypes.h stdint.h unistd.h
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
++"
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++
++done
++
++
++for ac_header in unistd.h sys/stat.h
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++
++done
++
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for extra programs to build requiring -lcuda" >&5
+ $as_echo_n "checking for extra programs to build requiring -lcuda... " >&6; }
diff --git a/plans/ci.fmf b/plans/ci.fmf
deleted file mode 100644
index b661134..0000000
--- a/plans/ci.fmf
+++ /dev/null
@@ -1,13 +0,0 @@
-summary: CI Gating Plan
-discover:
-    how: fmf
-    url: https://gitlab.com/redhat/centos-stream/tests/gcc.git
-    filter: 'tag: Fedora-CI-gating'
-execute:
-    how: tmt
-adjust:
-    - prepare+:
-          - name: Add secondary architecture RPMs
-            how: shell
-            script: ./plans/provide_secondary_arch_rpms.sh
-      when: arch == x86_64
diff --git a/plans/provide_secondary_arch_rpms.sh b/plans/provide_secondary_arch_rpms.sh
deleted file mode 100755
index f26a5ab..0000000
--- a/plans/provide_secondary_arch_rpms.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/env bash
-
-# Fedora CI testing systems don't provide a repository with the i686
-# RPMs of the build being tested. As a consequence, most
-#   dnf install -y <some-gcc-rpm>.i686
-# commands (whether being run by a test or by TMT's prepare) will probably
-# fail on a version mismatch with the present x86_64 gcc RPMs. To prevent
-# such failures we provide this script which we recommend to include in every
-# Fedora CI test plan.
-#
-# Implementation notes:
-#
-# * The gcc build being tested in Fedora CI is given via KOJI_TASK_ID. See
-#   https://github.com/fedora-ci/dist-git-pipeline/pull/50 for details.
-#
-# * Currently this script just downloads and installs the i686 RPMs. It
-#   would not be sufficient for tests that uninstall and reinstall those
-#   RPMs. If such a test appears, this script should create a repository.
-#
-# * Fedora CI testing systems seem to have extremely small RAM-based /tmp,
-#   unable to host all the downloaded RPMs, and no other "real" filesystem
-#   than "/". That's the reason for using
-#     mktemp -d --tmpdir=/
-
-set -x
-
-true "V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V"
-
-echo "KOJI_TASK_ID=$KOJI_TASK_ID"
-
-. /etc/os-release
-
-echo "ID=$ID"
-echo "arch=$(arch)"
-echo "KOJI_TASK_ID=$KOJI_TASK_ID"
-
-if [[ "$ID" = fedora ]] && [[ "$(arch)" = x86_64 ]] && [[ -n "$KOJI_TASK_ID" ]]; then
-
-    if tmpd=$(mktemp -d --tmpdir=/) && pushd "$tmpd"; then
-
-        # Download
-        rpm -q koji || dnf -y install koji
-        koji download-task "$KOJI_TASK_ID" --noprogress --arch={x86_64,i686,noarch}
-
-        # Remove conflicting RPMs
-        rm -f ./*debuginfo* ./*debugsource*
-        rm -f gcc-[0-9]*.i686.*
-        rm -f ./*docs*.i686.*
-
-        # Install
-        ls
-        dnf -y install ./*.rpm
-
-        # Clean up
-        # shellcheck disable=SC2164
-        popd
-        rm -rf "$tmpd"
-    fi
-
-else
-    echo "Not applicable"
-fi
-
-true "^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^"
diff --git a/rpminspect.yaml b/rpminspect.yaml
deleted file mode 100644
index f31bc02..0000000
--- a/rpminspect.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-inspections:
-    # GCC subpackages are inter-dependent but without requesting an explicit
-    # version - which rpmdeps dislikes and creates huge reports. We can't fix
-    # it easily and it's not a practical problem anyway. Unfortunately we
-    # can't tell rpmdeps to ignore just that particular warning. Switching off
-    # the rpmdeps checks looks like a lesser evil.
-    rpmdeps: off
-
-badfuncs:
-    # GCC doesn't use the so called bad functions "much". If they appear then
-    # - it is instrumenting them in sanitizers
-    # - in languages that don't move further downstream.
-    # We are OK with that.
-    ignore:
-      - /usr/lib*/libasan.so.*.*.*
-      - /usr/lib*/libtsan.so.*.*.*
-      - /usr/lib*/libgnat-*.so
-      - /usr/lib*/libgphobos.so.*.*.*
-      - /usr/lib*/libm2iso.so.*.*.*
-      - /usr/lib*/libm2pim.so.*.*.*
-
-pathmigration:
-    # Incomplete UsrMove, known but not planned at the moment
-    ignore:
-      - /lib*/libgcc_s-*.so.*
-      - /lib*/libgcc_s.so.*
-
-debuginfo:
-    # Skip the Go binaries, they ship unstripped
-    ignore:
-      - /usr/bin/go.gcc
-      - /usr/bin/gofmt.gcc
-      - /usr/lib*/libgo.so.*.*.*
-      - /usr/libexec/gcc/*-redhat-linux/*/buildid
-      - /usr/libexec/gcc/*-redhat-linux/*/cgo
-      - /usr/libexec/gcc/*-redhat-linux/*/test2json
-      - /usr/libexec/gcc/*-redhat-linux/*/vet
diff --git a/sources b/sources
index f1dba4c..6928580 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
-SHA512 (gcc-16.0.1-20260115.tar.xz) = 51ab079dedde5547caba601ce03954d4c5b2bf687538f106d3e851a8918162017fe65817d9e22fd115cf4d4f970bfba6a70a34db183141ce28c5c203a68eec0b
-SHA512 (isl-0.24.tar.bz2) = aab3bddbda96b801d0f56d2869f943157aad52a6f6e6a61745edd740234c635c38231af20bc3f1a08d416a5e973a90e18249078ed8e4ae2f1d5de57658738e95
-SHA512 (newlib-cygwin-d35cc82b5ec15bb8a5fe0fe11e183d1887992e99.tar.xz) = ef9495745a96d1d76f9f425c4a48c807fface36a1aa92351c5d024103678d144d046e8de55d195103784472c14874e29e4b9284d5d6a2e7bb27fd98c8455a881
-SHA512 (nvptx-tools-a0c1fff6534a4df9fb17937c3c4a4b1071212029.tar.xz) = 7f862986065028df70c843fc3f2c89e200a76b48ad0bd51c749ac8a5aab7be0ebdf35be182fad2407b3281615e75be1ac6833ab6a5130ae9920169a0412f94f0
+SHA512 (gcc-9.3.1-20200408.tar.xz) = 10518ee02087fd37d48bdd52e804dc384357e8744dd064b6b5042b826869d2ec75861c9b4f2dd73ad76cfb619558e0b13735979e3badb920ef029b248fc875a8
+SHA512 (nvptx-newlib-aadc8eb0ec43b7cd0dd2dfb484bae63c8b05ef24.tar.xz) = 94f7089365296f7dfa485107b4143bebc850a81586f3460fd896bbbb6ba099a00217d4042133424fd2183b352132f4fd367e6a60599bdae2a26dfd48a77d0e04
+SHA512 (nvptx-tools-c28050f60193b3b95a18866a96f03334e874e78f.tar.xz) = a688cb12cf805950a5abbb13b52f45c81dbee98e310b7ed57ae20e76dbfa5964a16270148374a6426d177db71909d28360490f091c86a5d19d4faa5127beeee1
diff --git a/update-gcc.sh b/update-gcc.sh
index 47d7d70..eda08ae 100755
--- a/update-gcc.sh
+++ b/update-gcc.sh
@@ -1,36 +1,7 @@
 #!/bin/sh
-if [ "$#" -eq 0 ]; then
-  echo "Usage: ./update-gcc.sh gcc/redhat/heads/gcc-NN-branch_commit_hash [git_reference_dir_to_speed_up]"
-  exit 1
-fi
-export LC_ALL=C
-if ! [ -f gcc.spec ]; then echo Must be run in the directory with gcc.spec file.; exit 1; fi
-if [ -d gcc-dir.tmp ]; then echo gcc-dir.tmp already exists.; exit 1; fi
-v=`sed -n 's/^%global gcc_version //p' gcc.spec`
-p=`sed -n 's/^%global gitrev //p' gcc.spec`
-h=$1
-if [ "$#" -ge 2 ]; then
-  git clone --dissociate --reference $2 https://gcc.gnu.org/git/gcc.git gcc-dir.tmp
-else
-  git clone https://gcc.gnu.org/git/gcc.git gcc-dir.tmp
-fi
-git --git-dir=gcc-dir.tmp/.git fetch origin $h
+[ -d gcc-dir.tmp ] && echo gcc-dir.tmp already exists && exit 1
+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'`
-cd gcc-dir.tmp
-git diff $p..$h > P1
-git log --format=%B `git log --format='%ae %H' $p..$h | awk '/^gccadmin@gcc.gnu.org/{print $2;exit 0}'`..$h > P2
-diff -up /dev/null P2 >> P1
-sed -n 's,^+[[:blank:]]\+PR \([a-z0-9+-]\+/[0-9]\+\)$,\1,p' P1 | sed 's/ - .*$//;s/[: ;.]//g' | LC_ALL=C sort -u -t / -k 1,1 -k 2,2n > P3
-> P4
-for i in `cat P3`; do if grep -F $i ../gcc.spec >/dev/null; then echo $i already recorded.; else echo $i >> P4; fi; done
-case "$v" in
-  *.0.*) echo "- update from trunk" > P5;;
-  *) echo "- update from releases/gcc-`echo $v | sed 's/\..*$//'` branch" > P5;;
-esac
-echo `cat P4` | sed 's/ /, /g' | fold -w 71 -s | sed '1s/^/  - PRs /;2,$s/^/	/;s/, $/,/' >> P5
-echo >> P5
-cd ..
-sed -i -e '/^%global gitrev /s/ [0-9a-f]\+$/ '$h'/;/^%global DATE /s/ [0-9]\+$/ '$d'/;/^%changelog$/r gcc-dir.tmp/P5' gcc.spec
-git --git-dir=gcc-dir.tmp/.git archive --prefix=gcc-$v-$d/ $h | xz -9e > gcc-$v-$d.tar.xz
+git --git-dir=gcc-dir.tmp/.git archive --prefix=gcc-9.3.1-$d/ $1 | xz -9e > gcc-9.3.1-$d.tar.xz
 rm -rf gcc-dir.tmp
-fedpkg new-sources gcc-$v-$d.tar.xz `sed 's/SHA512 (\(.*\)) = [0-9a-f]\+$/\1/' sources | grep -v '^gcc-'`