diff --git a/.gitignore b/.gitignore
index a02dee0..b67c902 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,82 +1,32 @@
-/gcc-10.0.1-20200118.tar.xz
-/newlib-cygwin-50e2a63b04bdd018484605fbb954fd1bd5147fa0.tar.xz
-/nvptx-tools-5f6f343a302d620b0868edab376c00b15741e39e.tar.xz
-/gcc-10.0.1-20200121.tar.xz
-/gcc-10.0.1-20200123.tar.xz
-/gcc-10.0.1-20200126.tar.xz
-/gcc-10.0.1-20200130.tar.xz
-/gcc-10.0.1-20200216.tar.xz
-/gcc-10.0.1-20200311.tar.xz
-/gcc-10.0.1-20200325.tar.xz
-/gcc-10.0.1-20200328.tar.xz
-/gcc-10.0.1-20200420.tar.xz
-/gcc-10.0.1-20200501.tar.xz
-/gcc-10.1.1-20200507.tar.xz
-/gcc-10.1.1-20200618.tar.xz
-/gcc-10.2.1-20200723.tar.xz
-/gcc-10.2.1-20200804.tar.xz
-/gcc-10.2.1-20200826.tar.xz
-/gcc-10.2.1-20200916.tar.xz
-/gcc-10.2.1-20201005.tar.xz
-/gcc-10.2.1-20201016.tar.xz
-/gcc-10.2.1-20201102.tar.xz
-/gcc-10.2.1-20201112.tar.xz
-/gcc-10.2.1-20201125.tar.xz
-/gcc-11.0.0-20201204.tar.xz
-/gcc-11.0.0-20201216.tar.xz
-/gcc-11.0.0-20201217.tar.xz
-/gcc-11.0.0-20201223.tar.xz
-/gcc-11.0.0-20210109.tar.xz
-/gcc-11.0.0-20210113.tar.xz
-/gcc-11.0.0-20210116.tar.xz
-/gcc-11.0.0-20210119.tar.xz
-/gcc-11.0.0-20210123.tar.xz
-/gcc-11.0.0-20210130.tar.xz
-/gcc-11.0.0-20210210.tar.xz
-/gcc-11.0.0-20210225.tar.xz
-/gcc-11.0.1-20210307.tar.xz
-/gcc-11.0.1-20210319.tar.xz
-/isl-0.18.tar.bz2
-/gcc-11.0.1-20210324.tar.xz
-/gcc-11.0.1-20210405.tar.xz
-/gcc-11.0.1-20210418.tar.xz
-/gcc-11.0.1-20210422.tar.xz
-/gcc-11.0.1-20210423.tar.xz
-/gcc-11.1.1-20210428.tar.xz
-/gcc-11.1.1-20210512.tar.xz
-/gcc-11.1.1-20210531.tar.xz
-/gcc-11.1.1-20210617.tar.xz
-/gcc-11.1.1-20210623.tar.xz
-/gcc-11.1.1-20210726.tar.xz
-/gcc-11.2.1-20210728.tar.xz
-/gcc-11.2.1-20210823.tar.xz
-/gcc-11.2.1-20211012.tar.xz
-/gcc-11.2.1-20211018.tar.xz
-/gcc-11.2.1-20211019.tar.xz
-/gcc-11.2.1-20211203.tar.xz
-/gcc-12.0.0-20220108.tar.xz
-/gcc-12.0.0-20220112.tar.xz
-/gcc-12.0.0-20220115.tar.xz
-/gcc-12.0.1-20220118.tar.xz
-/gcc-12.0.1-20220125.tar.xz
-/gcc-12.0.1-20220129.tar.xz
-/gcc-12.0.1-20220202.tar.xz
-/gcc-12.0.1-20220205.tar.xz
-/gcc-12.0.1-20220212.tar.xz
-/gcc-12.0.1-20220214.tar.xz
-/gcc-12.0.1-20220222.tar.xz
-/gcc-12.0.1-20220306.tar.xz
-/gcc-12.0.1-20220308.tar.xz
-/gcc-12.0.1-20220401.tar.xz
-/gcc-12.0.1-20220411.tar.xz
-/gcc-12.0.1-20220413.tar.xz
-/gcc-12.0.1-20220429.tar.xz
-/gcc-12.1.1-20220507.tar.xz
-/gcc-12.1.1-20220628.tar.xz
-/gcc-12.1.1-20220810.tar.xz
-/gcc-12.2.1-20220819.tar.xz
-/gcc-12.2.1-20221103.tar.xz
 /isl-0.24.tar.bz2
-/newlib-cygwin-a8526cb52bedabd4d6ba4b227a5185627f871aa1.tar.xz
-/nvptx-tools-472b6e78b3ba918d727698f79911360b7c808247.tar.xz
-/gcc-12.2.1-20221121.tar.xz
+/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
diff --git a/gcc.spec b/gcc.spec
index 4877961..71e5d1d 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -1,16 +1,18 @@
-%global DATE 20221121
-%global gitrev b3f5a0d53b84ed27cf00cfa2b9c3e2c78935c07d
-%global gcc_version 12.2.1
-%global gcc_major 12
+%global DATE 20260115
+%global gitrev 1a9a51aca25eaad91d80869c43859274fe5e1096
+%global gcc_version 16.0.1
+%global gcc_major 16
 # 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 4
-%global nvptx_tools_gitrev 472b6e78b3ba918d727698f79911360b7c808247
-%global newlib_cygwin_gitrev a8526cb52bedabd4d6ba4b227a5185627f871aa1
+%global gcc_release 0
+%global nvptx_tools_gitrev a0c1fff6534a4df9fb17937c3c4a4b1071212029
+%global newlib_cygwin_gitrev d35cc82b5ec15bb8a5fe0fe11e183d1887992e99
 %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).
@@ -24,6 +26,13 @@
 %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
 %global multilib_64_archs sparc64 ppc64 ppc64p7 s390x x86_64
 %else
@@ -34,6 +43,9 @@
 %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
 %global build_ada 1
@@ -51,28 +63,44 @@
 %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
+%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 riscv64
 %global build_libasan 1
 %else
 %global build_libasan 0
 %endif
-%ifarch x86_64 ppc64 ppc64le aarch64 s390x
+%ifarch x86_64 aarch64
+%global build_libhwasan 1
+%else
+%global build_libhwasan 0
+%endif
+%ifarch x86_64 ppc64 ppc64le aarch64 s390x riscv64
 %global build_libtsan 1
 %else
 %global build_libtsan 0
 %endif
-%ifarch x86_64 ppc64 ppc64le aarch64 s390x
+%ifarch x86_64 ppc64 ppc64le aarch64 s390x riscv64
 %global build_liblsan 1
 %else
 %global build_liblsan 0
 %endif
-%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64
+%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 riscv64
 %global build_libubsan 1
 %else
 %global build_libubsan 0
@@ -82,7 +110,7 @@
 %else
 %global build_libatomic 0
 %endif
-%ifarch %{ix86} x86_64 %{arm} alpha ppc ppc64 ppc64le ppc64p7 s390 s390x aarch64
+%ifarch %{ix86} x86_64 %{arm} alpha ppc ppc64 ppc64le ppc64p7 s390 s390x aarch64 riscv64
 %global build_libitm 1
 %else
 %global build_libitm 0
@@ -93,7 +121,7 @@
 %global build_isl 1
 %endif
 %global build_libstdcxx_docs 1
-%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 %{mips}
+%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 %{mips} riscv64
 %global attr_ifunc 1
 %else
 %global attr_ifunc 0
@@ -103,6 +131,11 @@
 %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
 %ifarch s390x
 %global multilib_32_arch s390
@@ -125,29 +158,35 @@
 Summary: Various compilers (C, C++, Objective-C, ...)
 Name: gcc
 Version: %{gcc_version}
-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
+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 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
+# 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.
 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 git://github.com/MentorEmbedded/nvptx-tools.git nvptx-tools-dir.tmp
+# 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
 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 git://sourceware.org/git/newlib-cygwin.git newlib-cygwin-dir.tmp
+# 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
@@ -167,11 +206,8 @@ 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
-%if 0%{?fedora} >= 29 || 0%{?rhel} > 7
-BuildRequires: binutils >= 2.31
-%else
-BuildRequires: binutils >= 2.24
-%endif
+# Need binutils which support .base64 >= 2.43
+BuildRequires: binutils >= 2.43
 # While gcc doesn't include statically linked binaries, during testing
 # -static is used several times.
 BuildRequires: glibc-static
@@ -184,6 +220,9 @@ BuildRequires: gcc, gcc-c++, make
 %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
@@ -197,9 +236,11 @@ BuildRequires: libzstd-devel
 # Make sure glibc supports TFmode long double
 BuildRequires: glibc >= 2.3.90-35
 %endif
-%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
+%ifarch %{multilib_64_archs}
+BuildRequires: (glibc32 or glibc-devel(%{__isa_name}-32))
+%endif
+%ifarch sparcv9 ppc
+BuildRequires: (glibc64 or glibc-devel(%{__isa_name}-64))
 %endif
 %if %{build_ada}
 # Ada requires Ada to build
@@ -216,6 +257,9 @@ BuildRequires: libunwind >= 0.98
 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
@@ -233,11 +277,8 @@ 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
-%if 0%{?fedora} >= 29 || 0%{?rhel} > 7
-Requires: binutils >= 2.31
-%else
-Requires: binutils >= 2.24
-%endif
+# Need binutils that support .base64 >= 2.43
+Requires: binutils >= 2.43
 # Make sure gdb will understand DW_FORM_strp
 Conflicts: gdb < 5.1-2
 Requires: glibc-devel >= 2.2.90-12
@@ -252,6 +293,11 @@ 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}
@@ -264,23 +310,23 @@ Provides: bundled(libbacktrace)
 Provides: bundled(libffi)
 Provides: gcc(major) = %{gcc_major}
 
-Patch0: gcc12-hack.patch
-Patch2: gcc12-sparc-config-detection.patch
-Patch3: gcc12-libgomp-omp_h-multilib.patch
-Patch4: gcc12-libtool-no-rpath.patch
-Patch5: gcc12-isl-dl.patch
-Patch6: gcc12-isl-dl2.patch
-Patch7: gcc12-libstdc++-docs.patch
-Patch8: gcc12-no-add-needed.patch
-Patch9: gcc12-Wno-format-security.patch
-Patch10: gcc12-rh1574936.patch
-Patch11: gcc12-d-shared-libphobos.patch
-Patch12: gcc12-pr107468.patch
+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
 
-Patch100: gcc12-fortran-fdec-duplicates.patch
-Patch101: gcc12-fortran-flogical-as-integer.patch
-Patch102: gcc12-fortran-fdec-override-kind.patch
-Patch103: gcc12-fortran-fdec-non-logical-if.patch
+Patch50: isl-rh2155127.patch
+
+Patch100: gcc16-fortran-fdec-duplicates.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -302,7 +348,7 @@ Patch103: gcc12-fortran-fdec-non-logical-if.patch
 %if %{build_go}
 # Avoid stripping these libraries and binaries.
 %global __os_install_post \
-chmod 644 %{buildroot}%{_prefix}/%{_lib}/libgo.so.21.* \
+chmod 644 %{buildroot}%{_prefix}/%{_lib}/libgo.so.25.* \
 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 \
@@ -310,7 +356,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.21.* \
+chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgo.so.25.* \
 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 \
@@ -321,26 +367,26 @@ chmod 755 %{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}
 %endif
 
 %description
-The gcc package contains the GNU Compiler Collection version 12.
+The gcc package contains the GNU Compiler Collection version %{gcc_major}.
 You'll need this package in order to compile C code.
 
 %package -n libgcc
-Summary: GCC version 12 shared support library
+Summary: GCC version %{gcc_major} shared support library
 Autoreq: false
 %if !%{build_ada}
 Obsoletes: libgnat < %{version}-%{release}
 %endif
-Obsoletes: libmudflap
-Obsoletes: libmudflap-devel
-Obsoletes: libmudflap-static
+Obsoletes: libmudflap < %{version}-%{release}
+Obsoletes: libmudflap-devel < %{version}-%{release}
+Obsoletes: libmudflap-static < %{version}-%{release}
 Obsoletes: libgcj < %{version}-%{release}
 Obsoletes: libgcj-devel < %{version}-%{release}
 Obsoletes: libgcj-src < %{version}-%{release}
 %ifarch %{ix86} x86_64
-Obsoletes: libcilkrts
-Obsoletes: libcilkrts-static
-Obsoletes: libmpx
-Obsoletes: libmpx-static
+Obsoletes: libcilkrts < %{version}-%{release}
+Obsoletes: libcilkrts-static < %{version}-%{release}
+Obsoletes: libmpx < %{version}-%{release}
+Obsoletes: libmpx-static < %{version}-%{release}
 %endif
 
 %description -n libgcc
@@ -365,6 +411,12 @@ 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
@@ -442,9 +494,11 @@ 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
@@ -489,15 +543,96 @@ 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 v4.5 shared support library
+Summary: GCC OpenMP v5.2 shared support library
 
 %description -n libgomp
 This package contains GCC shared support library which is needed
-for OpenMP v4.5 support.
+for OpenMP v5.2 support.
 
 %package -n libgomp-offload-nvptx
-Summary: GCC OpenMP v4.5 plugin for offloading to NVPTX
+Summary: GCC OpenMP v5.2 plugin for offloading to NVPTX
 Requires: libgomp = %{version}-%{release}
 
 %description -n libgomp-offload-nvptx
@@ -505,6 +640,17 @@ 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}
@@ -531,6 +677,20 @@ 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
 
@@ -586,13 +746,6 @@ 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
 
@@ -607,6 +760,21 @@ 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
 
@@ -772,6 +940,18 @@ 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}
@@ -786,30 +966,22 @@ so that there cannot be any synchronization problems.
 
 %prep
 %setup -q -n gcc-%{version}-%{DATE} -a 1 -a 2 -a 3
-%patch0 -p0 -b .hack~
-%patch2 -p0 -b .sparc-config-detection~
-%patch3 -p0 -b .libgomp-omp_h-multilib~
-%patch4 -p0 -b .libtool-no-rpath~
+%autopatch -p0 -m 0 -M 4
 %if %{build_isl}
-%patch5 -p0 -b .isl-dl~
-%patch6 -p0 -b .isl-dl2~
+%autopatch -p0 -m 5 -M 6
 %endif
 %if %{build_libstdcxx_docs}
-%patch7 -p0 -b .libstdc++-docs~
+%autopatch -p0 7
 %endif
-%patch8 -p0 -b .no-add-needed~
-%patch9 -p0 -b .Wno-format-security~
+%autopatch -p0 -m 8 -M 9
 %if 0%{?fedora} >= 29 || 0%{?rhel} > 7
-%patch10 -p0 -b .rh1574936~
+%autopatch -p0 10
 %endif
-%patch11 -p0 -b .d-shared-libphobos~
-%patch12 -p0 -b .pr107468~
+%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
 
 %if 0%{?rhel} >= 9
-%patch100 -p1 -b .fortran-fdec-duplicates~
-%patch101 -p1 -b .fortran-flogical-as-integer~
-%patch102 -p1 -b .fortran-fdec-override-kind~
-%patch103 -p1 -b .fortran-fdec-non-logical-if~
+%autopatch -p1 100
 %endif
 
 %ifarch %{arm}
@@ -820,14 +992,12 @@ rm -f libphobos/testsuite/libphobos.gc/forkgc2.d
 
 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/context->report_bug = false;/context->report_bug = true;/' gcc/diagnostic.cc
+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
@@ -856,11 +1026,15 @@ export CONFIG_SITE=NONE
 
 CC=gcc
 CXX=g++
-OPT_FLAGS=`echo %{optflags}|sed -e 's/\(-Wp,\)\?-D_FORTIFY_SOURCE=[12]//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 $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'`
@@ -903,7 +1077,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=http://bugzilla.redhat.com/bugzilla \
+	--with-bugurl=%dist_bug_report_url \
 	--enable-checking=release --with-system-zlib \
 	--with-gcc-major-version-only --without-isl
 make %{?_smp_mflags}
@@ -911,6 +1085,42 @@ 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}
@@ -923,16 +1133,23 @@ ISL_FLAG_PIC=-fPIC
 ISL_FLAG_PIC=-fpic
 %endif
 cd isl-build
-sed -i 's|libisl\([^-]\)|libgcc12privateisl\1|g' \
+
+%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}
+make %{?_smp_mflags} CFLAGS="${CFLAGS:-%optflags} $ISL_FLAG_PIC"
 make install
 cd ../isl-install/lib
-rm libgcc12privateisl.so{,.23}
-mv libgcc12privateisl.so.23.1.0 libisl.so.23
+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
@@ -941,6 +1158,9 @@ enablelgo=
 enablelada=
 enablelobjc=
 enableld=
+enablelm2=
+enablelcob=
+enablela68=
 %if %{build_objc}
 enablelobjc=,objc,obj-c++
 %endif
@@ -953,9 +1173,25 @@ 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=http://bugzilla.redhat.com/bugzilla \
+	--with-bugurl=%dist_bug_report_url \
 	--enable-shared --enable-threads=posix --enable-checking=release \
 %ifarch ppc64le
 	--enable-targets=powerpcle-linux \
@@ -975,7 +1211,7 @@ 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 \
+	--enable-libstdcxx-backtrace --with-libstdcxx-zoneinfo=%{_datadir}/zoneinfo \
 %ifnarch %{mips}
 	--with-linker-hash-style=gnu \
 %endif
@@ -985,9 +1221,11 @@ CONFIGURE_OPTS="\
 %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 --enable-offload-defaulted \
+	--without-cuda-driver \
 %endif
 %if 0%{?fedora} >= 21 || 0%{?rhel} >= 7
 %if %{attr_ifunc}
@@ -1024,8 +1262,12 @@ CONFIGURE_OPTS="\
 %endif
 %endif
 %ifarch ppc64le
-%if 0%{?rhel} == 9
+%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
@@ -1036,6 +1278,9 @@ CONFIGURE_OPTS="\
 %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}
@@ -1043,7 +1288,11 @@ CONFIGURE_OPTS="\
 %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
@@ -1059,7 +1308,7 @@ CONFIGURE_OPTS="\
 %if 0%{?rhel} >= 7
 %if 0%{?rhel} > 7
 %if 0%{?rhel} > 8
-%if 0%{?rhel} == 9
+%if 0%{?rhel} >= 9
 	--with-arch=z14 --with-tune=z15 \
 %else
 	--with-arch=z13 --with-tune=arch13 \
@@ -1071,11 +1320,15 @@ CONFIGURE_OPTS="\
 	--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
@@ -1099,6 +1352,19 @@ CONFIGURE_OPTS="\
 %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
 	"
 
@@ -1107,7 +1373,7 @@ 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},lto \
+	--enable-languages=c,c++,fortran${enablelobjc}${enablelada}${enablelgo}${enableld}${enablelm2}${enablelcob}${enablela68},lto \
 	$CONFIGURE_OPTS
 
 %ifarch sparc sparcv9 sparc64
@@ -1128,7 +1394,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 $CONFIGURE_OPTS
+	--enable-languages=jit --enable-libgdiagnostics $CONFIGURE_OPTS
 make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS" all-gcc
 cp -a gcc/libgccjit.so* ../gcc/
 cd ../gcc/
@@ -1163,7 +1429,7 @@ cd ../..
 
 # Copy various doc files here and there
 cd ..
-mkdir -p rpm.doc/gfortran rpm.doc/objc rpm.doc/gdc rpm.doc/libphobos
+mkdir -p rpm.doc/{gfortran,objc,gdc,libphobos,gm2,libgm2,libgdiagnostics-devel,gcobol,libgcobol,algol68,libga68}
 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}
 
@@ -1191,10 +1457,36 @@ done)
 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)
+%endif
 %if %{build_libquadmath}
 (cd libquadmath; for i in ChangeLog* COPYING.LIB; do
 	cp -p $i ../rpm.doc/libquadmath/$i.libquadmath
-done)
+done;
+sed -n '/==========/,/==========/{/==========/d;s/^ \* *//p}' math/cosq.c \
+  > ../rpm.doc/libquadmath/LICENSE.SunPro)
 %endif
 %if %{build_libitm}
 (cd libitm; for i in ChangeLog*; do
@@ -1209,6 +1501,8 @@ 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
@@ -1228,7 +1522,8 @@ 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-annocheck --without-tests --without-docs --disable-rpath --without-debuginfod \
+	      --without-clang-plugin --without-llvm-plugin
 make
 cd ../..
 %endif
@@ -1260,6 +1555,7 @@ 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}
@@ -1275,6 +1571,44 @@ 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}
@@ -1302,7 +1636,9 @@ 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}
@@ -1347,12 +1683,10 @@ for f in `find %{buildroot}%{_prefix}/include/c++/%{gcc_major}/%{gcc_target_plat
 done
 
 # Nuke bits/*.h.gch dirs
-# 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
+# 1) sometimes it is hard to match the exact options used for building
 #    libstdc++-v3 or they aren't desirable
-# 3) there are multilib issues, conflicts etc. with this
-# 4) it is huge
+# 2) there are multilib issues, conflicts etc. with this
+# 3) 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
@@ -1364,7 +1698,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 \*~ | xargs rm
+find ../rpm.doc/libstdc++-v3 -name \*~ -o -name \*.orig | xargs rm -f
 %endif
 
 %ifarch sparcv9 sparc64
@@ -1402,6 +1736,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
@@ -1417,6 +1757,11 @@ 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
@@ -1428,6 +1773,11 @@ 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
@@ -1440,6 +1790,11 @@ 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/
@@ -1460,18 +1815,8 @@ 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}/
-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
+%py_byte_compile %{python3} %{buildroot}%{_prefix}/share/gcc-%{gcc_major}/python/
+%py_byte_compile %{python3} %{buildroot}%{_datadir}/gdb/auto-load/%{_prefix}/%{_lib}/
 
 rm -f $FULLEPATH/libgccjit.so
 cp -a objlibgccjit/gcc/libgccjit.so* %{buildroot}%{_prefix}/%{_lib}/
@@ -1479,6 +1824,15 @@ 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}
@@ -1488,20 +1842,37 @@ 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.21.* libgo.so
+ln -sf ../../../libgo.so.25.* libgo.so
 %endif
 %if %{build_libquadmath}
 ln -sf ../../../libquadmath.so.0.* libquadmath.so
 %endif
 %if %{build_d}
-ln -sf ../../../libgdruntime.so.3.* libgdruntime.so
-ln -sf ../../../libgphobos.so.3.* libgphobos.so
+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
 %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
@@ -1518,20 +1889,37 @@ 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.21.* libgo.so
+ln -sf ../../../../%{_lib}/libgo.so.25.* libgo.so
 %endif
 %if %{build_libquadmath}
 ln -sf ../../../../%{_lib}/libquadmath.so.0.* libquadmath.so
 %endif
 %if %{build_d}
-ln -sf ../../../../%{_lib}/libgdruntime.so.3.* libgdruntime.so
-ln -sf ../../../../%{_lib}/libgphobos.so.3.* libgphobos.so
+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
 %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
@@ -1545,6 +1933,11 @@ rm -f libtsan.so
 echo 'INPUT ( %{_prefix}/%{_lib}/'`echo ../../../../%{_lib}/libtsan.so.2.* | 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
@@ -1553,7 +1946,7 @@ 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++_libbacktrace.*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}
@@ -1567,11 +1960,25 @@ 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 $FULLLPATH/
+mv -f %{buildroot}%{_prefix}/%{_lib}/libatomic.*a $FULLPATH/
 %endif
 %if %{build_libasan}
 mv -f %{buildroot}%{_prefix}/%{_lib}/libasan.*a $FULLLPATH/
@@ -1582,6 +1989,9 @@ 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
@@ -1603,28 +2013,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-12.so
+ln -sf ../../../../../libgnarl-*.so libgnarl-%{gcc_major}.so
 ln -sf ../../../../../libgnat-*.so libgnat.so
-ln -sf ../../../../../libgnat-*.so libgnat-12.so
+ln -sf ../../../../../libgnat-*.so libgnat-%{gcc_major}.so
 else
 ln -sf ../../../../../../%{_lib}/libgnarl-*.so libgnarl.so
-ln -sf ../../../../../../%{_lib}/libgnarl-*.so libgnarl-12.so
+ln -sf ../../../../../../%{_lib}/libgnarl-*.so libgnarl-%{gcc_major}.so
 ln -sf ../../../../../../%{_lib}/libgnat-*.so libgnat.so
-ln -sf ../../../../../../%{_lib}/libgnat-*.so libgnat-12.so
+ln -sf ../../../../../../%{_lib}/libgnat-*.so libgnat-%{gcc_major}.so
 fi
 popd
 else
 pushd $FULLPATH/adalib
 if [ "%{_lib}" = "lib" ]; then
 ln -sf ../../../../libgnarl-*.so libgnarl.so
-ln -sf ../../../../libgnarl-*.so libgnarl-12.so
+ln -sf ../../../../libgnarl-*.so libgnarl-%{gcc_major}.so
 ln -sf ../../../../libgnat-*.so libgnat.so
-ln -sf ../../../../libgnat-*.so libgnat-12.so
+ln -sf ../../../../libgnat-*.so libgnat-%{gcc_major}.so
 else
 ln -sf ../../../../../%{_lib}/libgnarl-*.so libgnarl.so
-ln -sf ../../../../../%{_lib}/libgnarl-*.so libgnarl-12.so
+ln -sf ../../../../../%{_lib}/libgnarl-*.so libgnarl-%{gcc_major}.so
 ln -sf ../../../../../%{_lib}/libgnat-*.so libgnat.so
-ln -sf ../../../../../%{_lib}/libgnat-*.so libgnat-12.so
+ln -sf ../../../../../%{_lib}/libgnat-*.so libgnat-%{gcc_major}.so
 fi
 popd
 fi
@@ -1639,8 +2049,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.21.* | sed 's,^.*libg,libg,'`' )' > libgo.so
-echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libgo.so.21.* | sed 's,^.*libg,libg,'`' )' > 64/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
 %endif
 %if %{build_libquadmath}
 rm -f libquadmath.so
@@ -1649,10 +2059,30 @@ 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.3.* | sed 's,^.*libg,libg,'`' )' > libgdruntime.so
-echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libgdruntime.so.3.* | sed 's,^.*libg,libg,'`' )' > 64/libgdruntime.so
-echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libgphobos.so.3.* | sed 's,^.*libg,libg,'`' )' > libgphobos.so
-echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libgphobos.so.3.* | sed 's,^.*libg,libg,'`' )' > 64/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
 %endif
 %if %{build_libitm}
 rm -f libitm.so
@@ -1663,6 +2093,18 @@ 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
@@ -1685,8 +2127,8 @@ 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++_libbacktrace.a libstdc++_libbacktrace.a
-ln -sf ../lib64/libstdc++_libbacktrace.a 64/libstdc++_libbacktrace.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}
@@ -1699,14 +2141,24 @@ 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
@@ -1740,8 +2192,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.21.* | sed 's,^.*libg,libg,'`' )' > libgo.so
-echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libgo.so.21.* | sed 's,^.*libg,libg,'`' )' > 32/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
 %endif
 %if %{build_libquadmath}
 rm -f libquadmath.so
@@ -1750,10 +2202,30 @@ 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.3.* | sed 's,^.*libg,libg,'`' )' > libgdruntime.so
-echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libgdruntime.so.3.* | sed 's,^.*libg,libg,'`' )' > 32/libgdruntime.so
-echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libgphobos.so.3.* | sed 's,^.*libg,libg,'`' )' > libgphobos.so
-echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libgphobos.so.3.* | sed 's,^.*libg,libg,'`' )' > 32/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
 %endif
 %if %{build_libitm}
 rm -f libitm.so
@@ -1764,6 +2236,18 @@ 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
@@ -1788,8 +2272,8 @@ 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++_libbacktrace.a 32/libstdc++_libbacktrace.a
-ln -sf lib64/libstdc++_libbacktrace.a libstdc++_libbacktrace.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}
@@ -1802,14 +2286,24 @@ 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
@@ -1837,7 +2331,7 @@ 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++_libbacktrace.a 32/libstdc++_libbacktrace.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
@@ -1846,12 +2340,20 @@ 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
@@ -1872,7 +2374,8 @@ 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%{?_enable_debug_packages}
+%if 0
 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 \
@@ -1884,8 +2387,9 @@ 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 libquadmath.a -o -name libstdc++.a \
-		-o -name libstdc++fs.a -o -name libstdc++_libbacktrace.a -o -name libsupc++.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 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
@@ -1895,10 +2399,11 @@ 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 libgdruntime.a -o -name libgphobos.a -o -name libm2\*.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 libubsan.a -o -name liblsan.a -o -name libcc1.a \
+		    -o -name libgcobol.a \) \
 		 -a -type f`
 popd
 chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgfortran.so.5.*
@@ -1908,8 +2413,19 @@ 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.3.*
-chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgphobos.so.3.*
+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.*
 %endif
 %if %{build_libitm}
 chmod 755 %{buildroot}%{_prefix}/%{_lib}/libitm.so.1.*
@@ -1926,12 +2442,15 @@ chmod 755 %{buildroot}%{_prefix}/%{_lib}/libubsan.so.1.*
 %if %{build_libtsan}
 chmod 755 %{buildroot}%{_prefix}/%{_lib}/libtsan.so.2.*
 %endif
+%if %{build_libhwasan}
+chmod 755 %{buildroot}%{_prefix}/%{_lib}/libhwasan.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.21.*
+chmod 644 %{buildroot}%{_prefix}/%{_lib}/libgo.so.25.*
 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
@@ -1948,8 +2467,6 @@ 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|'`
@@ -1993,7 +2510,6 @@ 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 || :
@@ -2002,6 +2518,10 @@ 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
@@ -2025,7 +2545,31 @@ rm -rf %{buildroot}%{_prefix}/lib64/go/%{gcc_major}/%{gcc_target_platform}
 %endif
 %endif
 
-rm -f %{buildroot}%{mandir}/man3/ffi*
+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*
 
 # Help plugins find out nvra.
 echo gcc-%{version}-%{release}.%{_arch} > $FULLPATH/rpmver
@@ -2050,9 +2594,9 @@ 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/'{,-fstack-protector-strong}'" || :
+     RUNTESTFLAGS="--target_board=unix/'{-foffload=disable,-fstack-protector-strong/-foffload=disable}'" || :
 %else
-     RUNTESTFLAGS="--target_board=unix/'{,-fstack-protector}'" || :
+     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
@@ -2110,28 +2654,20 @@ 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 ("/sbin/ldconfig", "x") then
-  local pid = posix.fork ()
-  if pid == 0 then
-    posix.exec ("/sbin/ldconfig")
-  elseif pid ~= -1 then
-    posix.wait (pid)
-  end
+if posix.access ("%ldconfig", "x") then
+  rpm.execute ("%ldconfig")
 end
 
 %postun -n libgcc -p <lua>
-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
+if posix.access ("%ldconfig", "x") then
+  rpm.execute ("%ldconfig")
 end
+}
 
 %ldconfig_scriptlets -n libstdc++
 
@@ -2141,6 +2677,8 @@ end
 
 %ldconfig_scriptlets -n libgphobos
 
+%ldconfig_scriptlets -n libgm2
+
 %ldconfig_scriptlets -n libgnat
 
 %ldconfig_scriptlets -n libgomp
@@ -2149,6 +2687,8 @@ end
 
 %ldconfig_scriptlets -n libgccjit
 
+%ldconfig_scriptlets -n libgdiagnostics
+
 %ldconfig_scriptlets -n libquadmath
 
 %ldconfig_scriptlets -n libitm
@@ -2163,6 +2703,8 @@ end
 
 %ldconfig_scriptlets -n liblsan
 
+%ldconfig_scriptlets -n libhwasan
+
 %ldconfig_scriptlets -n libgo
 
 %files -f %{name}.lang
@@ -2225,6 +2767,8 @@ end
 %{_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
@@ -2260,9 +2804,7 @@ 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
@@ -2284,8 +2826,6 @@ 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
@@ -2322,6 +2862,33 @@ end
 %{_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
@@ -2366,6 +2933,10 @@ end
 %{_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
@@ -2376,6 +2947,14 @@ 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
@@ -2385,6 +2964,7 @@ 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
@@ -2404,6 +2984,7 @@ 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}
@@ -2417,6 +2998,8 @@ 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
@@ -2435,6 +3018,7 @@ 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}
@@ -2448,6 +3032,8 @@ 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
@@ -2471,6 +3057,8 @@ 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
@@ -2483,7 +3071,10 @@ 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
@@ -2497,12 +3088,16 @@ 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
 
@@ -2540,7 +3135,7 @@ end
 %{_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++_libbacktrace.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}
@@ -2548,7 +3143,7 @@ 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++_libbacktrace.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}
@@ -2557,7 +3152,7 @@ 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++_libbacktrace.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*
@@ -2587,19 +3182,20 @@ 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++_libbacktrace.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++_libbacktrace.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++_libbacktrace.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libstdc++exp.a
 %endif
 %doc rpm.doc/changelogs/libstdc++-v3/ChangeLog* libstdc++-v3/README*
 
@@ -2770,8 +3366,8 @@ end
 %doc rpm.doc/gdc/*
 
 %files -n libgphobos
-%{_prefix}/%{_lib}/libgdruntime.so.3*
-%{_prefix}/%{_lib}/libgphobos.so.3*
+%{_prefix}/%{_lib}/libgdruntime.so.6*
+%{_prefix}/%{_lib}/libgphobos.so.6*
 %doc rpm.doc/libphobos/*
 
 %files -n libgphobos-static
@@ -2794,6 +3390,133 @@ 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
@@ -2955,22 +3678,6 @@ 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
 
@@ -3036,6 +3743,20 @@ 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*
@@ -3096,7 +3817,8 @@ end
 %doc rpm.doc/go/*
 
 %files -n libgo
-%attr(755,root,root) %{_prefix}/%{_lib}/libgo.so.21*
+%{_prefix}/%{_lib}/libgo.so.25
+%attr(755,root,root) %{_prefix}/%{_lib}/libgo.so.25.*
 %doc rpm.doc/libgo/*
 
 %files -n libgo-devel
@@ -3157,6 +3879,15 @@ 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}
@@ -3203,6 +3934,30 @@ 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
@@ -3215,461 +3970,94 @@ end
 %endif
 
 %changelog
-* Mon Nov 21 2022 Jakub Jelinek <jakub@redhat.com> 12.2.1-4
-- update from releases/gcc-12 branch
-  - PRs c++/104066, c++/105774, c++/106829, c++/107358, c/41041, c/106981,
-	c/107001, libstdc++/95048, libstdc++/103295, target/104688,
-	target/107183, target/107304, target/107404, target/107713,
-	target/107748, tree-optimization/107121, tree-optimization/107206
-- fix up std::from_chars behavior in rounding modes other than FE_TONEAREST
-  (PR libstdc++/107468)
-
-* Thu Nov  3 2022 Jakub Jelinek <jakub@redhat.com> 12.2.1-3
-- update from releases/gcc-12 branch
-  - PRs c++/93259, c++/105774, c++/106759, c++/106829, c++/106893, c++/106925,
-	c++/107358, c/106947, c/106981, c/107001, fortran/82868,
-	fortran/100029, fortran/100040, fortran/100097, fortran/100098,
-	fortran/100103, fortran/100132, fortran/100136, fortran/100245,
-	fortran/103413, fortran/103694, fortran/105012, fortran/105633,
-	fortran/106566, fortran/106579, fortran/106817, fortran/106857,
-	fortran/106985, fortran/106986, fortran/107054, libstdc++/105678,
-	libstdc++/106320, libstdc++/106589, libstdc++/106607,
-	libstdc++/106695, lto/107418, middle-end/106548, middle-end/106982,
-	other/106782, rtl-optimization/106187, target/96072, target/99184,
-	target/99685, target/100645, target/101322, target/103353,
-	target/104482, target/105421, target/105463, target/105485,
-	target/106017, target/106355, target/106459, target/106491,
-	target/106524, target/106704, target/106714, target/106721,
-	target/107061, target/107064, target/107248, target/107364,
-	tree-optimization/102892, tree-optimization/105937,
-	tree-optimization/106322, tree-optimization/106809,
-	tree-optimization/106841, tree-optimization/106860,
-	tree-optimization/106892, tree-optimization/106922,
-	tree-optimization/106934, tree-optimization/107107,
-	tree-optimization/107121, tree-optimization/107160,
-	tree-optimization/107212, tree-optimization/107254,
-	tree-optimization/107323
-
-* Wed Sep  7 2022 Kalev Lember <klember@redhat.com> 12.2.1-2
-- enable GDC on aarch64
-
-* Fri Aug 19 2022 Jakub Jelinek <jakub@redhat.com> 12.2.1-1
-- update from releases/gcc-12 branch
-  - GCC 12.2 release
-  - PRs c++/67048, c++/106369, c/106016, d/106623, d/106638, lto/106334,
-	lto/106540, middle-end/106492, tree-optimization/106513
-- fix an if-conversion wrong-code bug (PR rtl-optimization/106590)
-- implement C++23 P2327R1 - de-deprecating volatile compound operations - as
-  a DR
-
-* Wed Aug 10 2022 Jakub Jelinek <jakub@redhat.com> 12.1.1-4
-- update from releases/gcc-12 branch
-  - PRs analyzer/105285, analyzer/106204, analyzer/106225, c++/53164,
-	c++/96363, c++/100374, c++/105541, c++/105626, c++/105634, c++/105637,
-	c++/105758, c++/105842, c++/105848, c++/105912, c++/106024,
-	c++/106102, c++/106230, c++/106311, c++/106361, d/106139, d/106555,
-	d/106563, debug/106261, fortran/101330, fortran/103137,
-	fortran/103138, fortran/103504, fortran/103693, fortran/104313,
-	fortran/105243, fortran/105691, fortran/105813, fortran/105954,
-	fortran/106121, libfortran/106079, libstdc++/88881, libstdc++/100823,
-	libstdc++/104443, libstdc++/105844, libstdc++/105880,
-	libstdc++/105957, libstdc++/105995, libstdc++/106162,
-	libstdc++/106248, lto/106129, middle-end/105965, middle-end/106027,
-	middle-end/106144, middle-end/106331, middle-end/106449,
-	preprocessor/97498, rtl-optimization/105041, rtl-optimization/106032,
-	target/103722, target/105459, target/105930, target/105991,
-	target/106091, target/106097, target/106122, testsuite/106345,
-	tree-optimization/105665, tree-optimization/105860,
-	tree-optimization/105946, tree-optimization/105969,
-	tree-optimization/105971, tree-optimization/106063,
-	tree-optimization/106087, tree-optimization/106112,
-	tree-optimization/106114, tree-optimization/106131,
-	tree-optimization/106189
-
-* Thu Jun 30 2022 Jakub Jelinek <jakub@redhat.com> 12.1.1-3
-- fix up libtsan on s390x
-
-* Tue Jun 28 2022 Jakub Jelinek <jakub@redhat.com> 12.1.1-2
-- update from releases/gcc-12 branch
-  - PRs c++/49387, c++/102307, c++/102651, c++/104470, c++/105491, c++/105589,
-	c++/105623, c++/105652, c++/105655, c++/105725, c++/105734,
-	c++/105756, c++/105761, c++/105779, c++/105795, c++/105852,
-	c++/105871, c++/105885, c++/105908, c++/105925, c++/105931,
-	c++/105964, c++/106001, c/105635, d/105544, fortran/105230,
-	gcov-profile/105535, ipa/100413, ipa/105600, ipa/105639, ipa/105739,
-	libgomp/105745, libgomp/106045, libstdc++/104731, libstdc++/105284,
-	libstdc++/105671, libstdc++/105681, middle-end/105537,
-	middle-end/105604, middle-end/105711, middle-end/105951,
-	middle-end/105998, middle-end/106030, other/105527,
-	preprocessor/105732, rtl-optimization/105455, rtl-optimization/105559,
-	rtl-optimization/105577, sanitizer/105714, sanitizer/105729,
-	target/101891, target/104871, target/105162, target/105209,
-	target/105292, target/105472, target/105556, target/105599,
-	target/105854, target/105879, target/105953, target/105960,
-	target/105970, target/105981, target/106096, tree-optimization/103116,
-	tree-optimization/105431, tree-optimization/105458,
-	tree-optimization/105528, tree-optimization/105562,
-	tree-optimization/105618, tree-optimization/105726,
-	tree-optimization/105736, tree-optimization/105786,
-	tree-optimization/105940
-- enable tsan and lsan on s390x (#2101610)
-- trim RHEL fortran patches
-- fix nvptx build (PRs bootstrap/105551, target/105938)
-
-* Sat May  7 2022 Jakub Jelinek <jakub@redhat.com> 12.1.1-1
-- update from releases/gcc-12 branch
-  - GCC 12.1 release
-  - PRs c++/105476, libstdc++/103911, libstdc++/105441, libstdc++/105502,
-	middle-end/105376, middle-end/105461, target/102059, testsuite/105433,
-	tree-optimization/105394, tree-optimization/105437,
-	tree-optimization/105484
-
-* Thu May  5 2022 Stephen Gallagher <sgallagh@redhat.com> 12.0.1-0.18
-- fix annobin plugin conditional to build for ELN
-
-* Fri Apr 29 2022 Jakub Jelinek <jakub@redhat.com> 12.0.1-0.17
-- update from trunk and releases/gcc-12 branch
-  - GCC 12.1-rc1
-  - PRs analyzer/105252, analyzer/105264, analyzer/105365, analyzer/105366,
-	c++/65211, c++/82980, c++/86193, c++/90107, c++/97219, c++/100838,
-	c++/101442, c++/101698, c++/102629, c++/102804, c++/102987,
-	c++/103868, c++/104051, c++/104624, c++/104646, c++/104996,
-	c++/105256, c++/105265, c++/105268, c++/105287, c++/105289,
-	c++/105297, c++/105301, c++/105304, c++/105321, c++/105322,
-	c++/105353, c++/105386, c++/105398, c++/105425, c++/105426,
-	debug/105089, debug/105203, fortran/70673, fortran/78054,
-	fortran/102043, fortran/103662, fortran/104717, fortran/105242,
-	fortran/105310, fortran/105379, fortran/105381, gcov-profile/105282,
-	ipa/103818, ipa/105306, libgomp/105358, libstdc++/93602,
-	libstdc++/99290, libstdc++/102994, libstdc++/104858,
-	libstdc++/105269, libstdc++/105324, libstdc++/105375,
-	libstdc++/105417, lto/105364, lto/105399, middle-end/104492,
-	rtl-optimization/105231, rtl-optimization/105314,
-	rtl-optimization/105333, sanitizer/105396, target/89125,
-	target/103197, target/104676, target/105247, target/105257,
-	target/105271, target/105331, target/105334, target/105338,
-	target/105339, target/105349, target/105367, testsuite/105266,
-	tree-optimization/100810, tree-optimization/103941,
-	tree-optimization/104010, tree-optimization/105219,
-	tree-optimization/105254, tree-optimization/105276,
-	tree-optimization/105312, tree-optimization/105368,
-	tree-optimization/105374
-
-* Wed Apr 13 2022 Jakub Jelinek <jakub@redhat.com> 12.0.1-0.16
+* Thu Jan 15 2026 Jakub Jelinek <jakub@redhat.com> 16.0.1-0.3
 - update from trunk
-  - PRs c++/97296, c++/98249, c++/100111, c++/103105, c++/104142, c++/104669,
-	c++/105223, c++/105233, c++/105245, jit/104071, jit/104072,
-	jit/104073, jit/104293, middle-end/105253, middle-end/105259,
-	rtl-optimization/105211, target/95325, target/97348, target/101755,
-	target/102146, target/103623, target/104144, target/104894,
-	target/105213, target/105214, target/105234, testsuite/105183,
-	tree-optimization/104912, tree-optimization/105226,
-	tree-optimization/105232, tree-optimization/105235,
-	tree-optimization/105250, tree-optimization/105263
+  - 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
 
-* Mon Apr 11 2022 Jakub Jelinek <jakub@redhat.com> 12.0.1-0.15
+* Tue Jan 13 2026 Jakub Jelinek <jakub@redhat.com> 16.0.1-0.2
 - update from trunk
-  - PRs analyzer/102208, analyzer/103892, c++/91618, c++/92385, c++/96604,
-	c++/96645, c++/99479, c++/100370, c++/100608, c++/101051, c++/101677,
-	c++/101717, c++/101894, c++/103328, c++/103852, c++/104668,
-	c++/104702, c++/105110, c++/105143, c++/105186, c++/105187,
-	c++/105191, c/105149, c/105151, d/104740, driver/105096,
-	fortran/104210, fortran/105138, fortran/105184, ipa/103376,
-	ipa/104303, ipa/105166, jit/102824, libstdc++/105031,
-	libstdc++/105128, libstdc++/105146, libstdc++/105153,
-	libstdc++/105154, middle-end/105140, middle-end/105165,
-	rtl-optimization/104985, target/101908, target/102024, target/103147,
-	target/104049, target/104253, target/104409, target/104853,
-	target/104897, target/104987, target/105002, target/105069,
-	target/105123, target/105139, target/105144, target/105147,
-	target/105157, target/105197, testsuite/103196, testsuite/105095,
-	testsuite/105122, testsuite/105196, tree-optimization/102586,
-	tree-optimization/103761, tree-optimization/104639,
-	tree-optimization/104645, tree-optimization/105132,
-	tree-optimization/105142, tree-optimization/105148,
-	tree-optimization/105150, tree-optimization/105163,
-	tree-optimization/105173, tree-optimization/105175,
-	tree-optimization/105185, tree-optimization/105189,
-	tree-optimization/105198, tree-optimization/105218
-- build annobin gcc plugin as part of gcc build into gcc-plugin-annobin
-  subpackage
+  - 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
 
-* Sun Apr  3 2022 Jakub Jelinek <jakub@redhat.com> 12.0.1-0.14
+* Mon Jan 12 2026 Jakub Jelinek <jakub@redhat.com> 16.0.1-0.1
 - update from trunk
-  - revert delayed parse DMI change (PR c++/96645)
-- fix up aarch64 make install
+  - 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
 
-* Fri Apr  1 2022 Jakub Jelinek <jakub@redhat.com> 12.0.1-0.13
+* Sat Jan 10 2026 Jakub Jelinek <jakub@redhat.com> 16.0.0-0.5
 - update from trunk
-  - PRs ada/104767, ada/104861, analyzer/95000, analyzer/99771,
-	analyzer/103533, analyzer/104308, analyzer/104793, analyzer/104863,
-	analyzer/104943, analyzer/104954, analyzer/104955, analyzer/104979,
-	analyzer/104997, analyzer/105017, analyzer/105057, analyzer/105074,
-	analyzer/105087, c++/39751, c++/58646, c++/59426, c++/65396,
-	c++/71637, c++/84964, c++/87820, c++/92918, c++/93280, c++/95999,
-	c++/96329, c++/96437, c++/96440, c++/96645, c++/96780, c++/98644,
-	c++/99445, c++/100474, c++/101030, c++/101515, c++/101767, c++/102045,
-	c++/102071, c++/102123, c++/102137, c++/102489, c++/102538,
-	c++/102740, c++/102869, c++/102990, c++/103177, c++/103291,
-	c++/103299, c++/103337, c++/103455, c++/103460, c++/103769,
-	c++/103943, c++/103968, c++/104008, c++/104108, c++/104284,
-	c++/104476, c++/104527, c++/104568, c++/104583, c++/104608,
-	c++/104620, c++/104622, c++/104623, c++/104641, c++/104752,
-	c++/104806, c++/104823, c++/104846, c++/104847, c++/104944,
-	c++/104994, c++/105003, c++/105006, c++/105035, c++/105050,
-	c++/105061, c++/105064, c++/105067, c++/105092, c/82283, c/84685,
-	c/98198, c/104711, d/103528, d/104911, d/105004, debug/104564,
-	debug/104778, fortran/50549, fortran/100892, fortran/103039,
-	fortran/103560, fortran/103691, fortran/104126, fortran/104570,
-	fortran/104571, fortran/104811, fortran/104849, fortran/104999,
-	ipa/102513, ipa/103083, ipa/103171, ipa/104813, jit/63854,
-	libgcc/86224, libgomp/105042, libstdc++/92546, libstdc++/103407,
-	libstdc++/104242, libstdc++/104859, libstdc++/104866,
-	libstdc++/104870, libstdc++/104875, libstdc++/104990,
-	libstdc++/105021, libstdc++/105027, lto/102426, middle-end/90115,
-	middle-end/98420, middle-end/99578, middle-end/100680,
-	middle-end/102330, middle-end/103597, middle-end/104086,
-	middle-end/104285, middle-end/104436, middle-end/104774,
-	middle-end/104786, middle-end/104869, middle-end/104885,
-	middle-end/104892, middle-end/104966, middle-end/104971,
-	middle-end/104975, middle-end/105032, middle-end/105049, other/65095,
-	other/102664, other/104899, other/105114, rtl-optimization/103775,
-	rtl-optimization/104814, rtl-optimization/104961,
-	rtl-optimization/104989, rtl-optimization/105028,
-	rtl-optimization/105091, sanitizer/105093, target/86722, target/91229,
-	target/94680, target/96882, target/99754, target/102125,
-	target/102215, target/102772, target/102986, target/103074,
-	target/104004, target/104666, target/104688, target/104714,
-	target/104762, target/104783, target/104790, target/104815,
-	target/104818, target/104829, target/104840, target/104842,
-	target/104857, target/104868, target/104882, target/104890,
-	target/104898, target/104902, target/104903, target/104910,
-	target/104916, target/104923, target/104925, target/104946,
-	target/104952, target/104957, target/104963, target/104967,
-	target/104974, target/104976, target/104977, target/104978,
-	target/104982, target/104998, target/105000, target/105011,
-	target/105052, target/105058, target/105066, target/105068,
-	testsuite/102841, testsuite/104759, testsuite/105055,
-	testsuite/105085, tree-optimization/80334, tree-optimization/84201,
-	tree-optimization/90356, tree-optimization/98335,
-	tree-optimization/100834, tree-optimization/101895,
-	tree-optimization/102008, tree-optimization/102586,
-	tree-optimization/102645, tree-optimization/102943,
-	tree-optimization/104645, tree-optimization/104755,
-	tree-optimization/104851, tree-optimization/104880,
-	tree-optimization/104941, tree-optimization/104942,
-	tree-optimization/104960, tree-optimization/104970,
-	tree-optimization/105012, tree-optimization/105053,
-	tree-optimization/105056, tree-optimization/105070,
-	tree-optimization/105080, tree-optimization/105094,
-	tree-optimization/105109
+  - 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
 
-* Tue Mar  8 2022 Jakub Jelinek <jakub@redhat.com> 12.0.1-0.12
-- fix up promoted SUBREG handling (#2045160, PR rtl-optimization/104839)
-- fix up check for asm goto (PR rtl-optimization/104777)
-
-* Tue Mar  8 2022 Jakub Jelinek <jakub@redhat.com> 12.0.1-0.11
+* Sat Jan  3 2026 Jakub Jelinek <jakub@redhat.com> 16.0.0-0.4
 - update from trunk
-  - PRs analyzer/101983, fortran/99585, fortran/104430, libstdc++/104807,
-	middle-end/104381, target/99297, target/104779, target/104794,
-	target/104797, translation/90148, translation/104552,
-	tree-optimization/104782, tree-optimization/104825
-- fix build on i686 where gnat1 was hanging (PR target/104838,
-  PR target/104781)
+  - 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
 
-* Sun Mar  6 2022 Jakub Jelinek <jakub@redhat.com> 12.0.1-0.10
+* Sat Dec 20 2025 Jakub Jelinek <jakub@redhat.com> 16.0.0-0.3
 - update from trunk
-  - PRs analyzer/103521, analyzer/104434, c++/70077, c++/79493, c++/103443,
-	c++/104618, c++/104667, c++/104682, c/104627, c/104633, d/104659,
-	d/104736, debug/100541, fortran/84519, fortran/104131, fortran/104573,
-	fortran/104619, gcov-profile/104677, ipa/104533, ipa/104648,
-	libstdc++/96526, libstdc++/104602, libstdc++/104748, middle-end/80270,
-	middle-end/100400, middle-end/102276, middle-end/103836,
-	middle-end/103984, middle-end/104061, middle-end/104132,
-	middle-end/104133, middle-end/104529, middle-end/104540,
-	middle-end/104550, middle-end/104558, middle-end/104679,
-	middle-end/104721, middle-end/104757, middle-end/104761,
-	middle-end/104784, rtl-optimization/104154, rtl-optimization/104589,
-	rtl-optimization/104637, rtl-optimization/104686, target/87496,
-	target/88134, target/99555, target/100757, target/101325,
-	target/102429, target/103302, target/104121, target/104208,
-	target/104489, target/104656, target/104664, target/104674,
-	target/104681, target/104698, target/104704, target/104724,
-	target/104726, target/104758, testsuite/100407, testsuite/104687,
-	testsuite/104725, testsuite/104727, testsuite/104728,
-	testsuite/104730, testsuite/104732, testsuite/104791,
-	tree-optimization/91384, tree-optimization/101636,
-	tree-optimization/103037, tree-optimization/103845,
-	tree-optimization/103856, tree-optimization/104601,
-	tree-optimization/104644, tree-optimization/104675,
-	tree-optimization/104676, tree-optimization/104700,
-	tree-optimization/104715, tree-optimization/104716
-- fix constraints on s390x conditional trap (PR target/104775)
+  - 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 Feb 22 2022 Jakub Jelinek <jakub@redhat.com> 12.0.1-0.9
-- update from trunk
-  - PRs analyzer/104524, analyzer/104560, analyzer/104576, c++/85493,
-	c++/90451, c++/94944, c++/95036, c++/104107, c++/104507, c++/104539,
-	c++/104565, c/104506, c/104510, c/104531, c/104532, debug/104517,
-	debug/104557, fortran/77693, fortran/104211, libstdc++/104542,
-	libstdc++/104559, lto/104617, middle-end/104355, middle-end/104522,
-	rtl-optimization/104447, rtl-optimization/104498,
-	rtl-optimization/104544, sanitizer/102656, target/99708, target/99881,
-	target/100056, target/100874, target/103069, target/104253,
-	target/104257, target/104335, target/104440, target/104448,
-	target/104536, target/104581, target/104598, target/104612,
-	testsuite/104146, tree-optimization/96881, tree-optimization/103771,
-	tree-optimization/104519, tree-optimization/104526,
-	tree-optimization/104543, tree-optimization/104551,
-	tree-optimization/104582, tree-optimization/104604
-
-* Mon Feb 14 2022 Jakub Jelinek <jakub@redhat.com> 12.0.1-0.8
-- update from trunk
-  - PRs ada/97504, ada/98724, c/104505, fortran/104228, libstdc++/100912,
-	middle-end/104497, tree-optimization/104511, tree-optimization/104528
-  - fix handling of return in arm constexpr ctors and on all arches return in
-    constexpr dtors (PR c++/104513)
-
-* Sat Feb 12 2022 Jakub Jelinek <jakub@redhat.com> 12.0.1-0.7
-- update from trunk
-  - PRs analyzer/98797, analyzer/101081, analyzer/102052, analyzer/103872,
-	analyzer/104274, analyzer/104417, analyzer/104452, c++/80951,
-	c++/96242, c++/96876, c++/102204, c++/103706, c++/103752, c++/104033,
-	c++/104379, c++/104403, c++/104410, c++/104425, c++/104432,
-	c++/104472, c/104427, debug/104407, fortran/66193, fortran/104329,
-	libgomp/104385, libstdc++/104442, middle-end/100775,
-	middle-end/104402, middle-end/104446, middle-end/104450,
-	middle-end/104464, middle-end/104467, middle-end/104496,
-	rtl-optimization/104059, rtl-optimization/104153,
-	rtl-optimization/104198, rtl-optimization/104400,
-	rtl-optimization/104459, sanitizer/104449, target/35513, target/79754,
-	target/97005, target/97040, target/100593, target/102140,
-	target/103627, target/104117, target/104283, target/104327,
-	target/104345, target/104364, target/104441, target/104451,
-	target/104453, target/104456, target/104458, target/104462,
-	target/104469, target/104474, target/104502, testsuite/104481,
-	tree-optimization/102832, tree-optimization/104288,
-	tree-optimization/104373, tree-optimization/104420,
-	tree-optimization/104445, tree-optimization/104466,
-	tree-optimization/104479, tree-optimization/104499
-
-* Sat Feb  5 2022 Jakub Jelinek <jakub@redhat.com> 12.0.1-0.6
-- update from trunk
-  - PRs analyzer/104369, c++/92385, c++/104079, c++/104300, c++/104302,
-	debug/104337, debug/104366, fortran/104311, fortran/104328,
-	middle-end/90348, middle-end/104092, middle-end/104260,
-	rtl-optimization/101885, target/95082, target/100808, target/103686,
-	target/104219, target/104362, target/104380, tree-optimization/103641,
-	tree-optimization/104119, tree-optimization/104356,
-	tree-optimization/104389
-
-* Wed Feb  2 2022 Jakub Jelinek <jakub@redhat.com> 12.0.1-0.5
-- update from trunk
-  - PRs analyzer/104270, c++/101874, c++/102414, c++/102434, c++/103186,
-	c++/104291, c++/104294, d/104287, demangler/98886, demangler/99935,
-	fortran/104331, libstdc++/101831, libstdc++/104301, lto/104333,
-	middle-end/104232, middle-end/104307, middle-end/95115,
-	preprocessor/104147, rtl-optimization/101260, target/94372,
-	target/100428, target/104189, target/104298, target/104323,
-	tree-optimization/95424, tree-optimization/100499,
-	tree-optimization/102819, tree-optimization/103169,
-	tree-optimization/103514, tree-optimization/104279,
-	tree-optimization/104280, tree-optimization/104281
-- fix a VRP bug with 1-3 bit precision types (PR tree-optimization/104334)
-
-* Sat Jan 29 2022 Jakub Jelinek <jakub@redhat.com> 12.0.1-0.4
-- update from trunk
-  - PRs ada/104258, analyzer/104224, analyzer/104247, bootstrap/67102,
-	c++/51344, c++/59950, c++/82632, c++/92752, c++/92944, c++/99895,
-	c++/100030, c++/100198, c++/100282, c++/101532, c++/101988,
-	c++/103057, c++/103341, c++/103678, c++/104206, c++/104225,
-	c++/104226, c++/104235, c++/104245, fortran/84784, fortran/103790,
-	fortran/104128, fortran/104212, fortran/104227, libfortran/104233,
-	libstdc++/100516, libstdc++/104161, libstdc++/104217,
-	libstdc++/104259, lto/104237, middle-end/103642, target/103702,
-	target/104201, target/104213, target/104239, testsuite/70230,
-	tree-optimization/104196, tree-optimization/104203,
-	tree-optimization/104263, tree-optimization/104267, web/104254
-- configure with --enable-libstdcxx-backtrace and package
-  libstdc++_libbacktrace.a
-
-* Tue Jan 25 2022 Jakub Jelinek <jakub@redhat.com> 12.0.1-0.3
-- update from trunk
-  - PRs ada/103538, analyzer/94362, analyzer/103685, analyzer/104062,
-	analyzer/104089, analyzer/104150, analyzer/104159, bootstrap/104135,
-	bootstrap/104170, c++/20040, c++/55227, c++/91911, c++/101072,
-	c++/101405, c++/101715, c++/102300, c++/102338, c++/103631,
-	c++/103672, c++/103681, c++/104025, c++/104055, c++/104084,
-	c++/104134, c++/104139, c++/104148, c++/104173, c++/104182,
-	c++/104197, c/104115, debug/103874, fortran/102621, fortran/103695,
-	fortran/104127, libgcc/104207, libstdc++/87193, libstdc++/104019,
-	libstdc++/104032, libstdc++/104099, libstdc++/104101,
-	libstdc++/104123, libstdc++/104174, middle-end/100786,
-	middle-end/102860, middle-end/104069, middle-end/104076,
-	middle-end/104140, other/104176, other/104181, preprocessor/104030,
-	rtl-optimization/102478, sanitizer/99673, sanitizer/104158,
-	target/64821, target/94193, target/100784, target/102517,
-	target/103676, target/103771, target/104090, target/104136,
-	target/104188, testsuite/102833, testsuite/103763, testsuite/104021,
-	testsuite/104022, testsuite/104109, tree-optimization/100089,
-	tree-optimization/100740, tree-optimization/101508,
-	tree-optimization/101972, tree-optimization/102087,
-	tree-optimization/102131, tree-optimization/103721,
-	tree-optimization/103997, tree-optimization/104112,
-	tree-optimization/104114, tree-optimization/104152,
-	tree-optimization/104156, tree-optimization/104214
-  - don't emit C++ mangling aliases for compatibility with GCC 8.1 ppc64le
-    IEEE quad long double (PR target/104172)
-- mark IEEE quad long double in DWARF as implicit typedef to _Float128
-  (PR debug/104194)
-
-* Tue Jan 18 2022 Jakub Jelinek <jakub@redhat.com> 12.0.1-0.2
-- update from trunk
-  - PRs c++/104007, c++/104074, fortran/103692, ipa/103989, libstdc++/101124,
-	libstdc++/104098, middle-end/103163, tree-optimization/103987,
-	tree-optimization/104038
-- default to -mabi=ieeelongdouble on ppc64le
-- fix -Wdangling-pointer with -fsanitize=address (PR middle-end/104103)
-- fix -masm=intel (PR target/104104)
-
-* Tue Jan 18 2022 Jakub Jelinek <jakub@redhat.com> 12.0.1-0.1
-- update from trunk
-  - PRs c++/104031, c/63272, fortran/83079, fortran/87711, fortran/97896,
-	libstdc++/103650, libstdc++/104080, middle-end/101292, target/103124,
-	target/103973, target/104005, testsuite/104035, testsuite/104037,
-	tree-optimization/80532, tree-optimization/101941,
-	tree-optimization/104064
-
-* Sat Jan 15 2022 Jakub Jelinek <jakub@redhat.com> 12.0.0-0.5
-- update from trunk
-  - PRs ada/104027, analyzer/104029, c++/70417, c++/103705, c++/103991,
-	c/104002, fortran/67804, fortran/99256, fortran/103782,
-	libfortran/104006, libstdc++/91260, libstdc++/91383, libstdc++/95065,
-	libstdc++/103992, middle-end/100280, middle-end/101475,
-	middle-end/104026, target/94790, target/98737, target/100637,
-	target/103935, target/103941, target/104001, target/104003,
-	target/104014, tree-optimization/83072, tree-optimization/83073,
-	tree-optimization/96707, tree-optimization/97909,
-	tree-optimization/102192, tree-optimization/103989,
-	tree-optimization/104009, tree-optimization/104015
-- include rs6000-vecdefines.h on ppc* (#2040825)
-
-* Wed Jan 12 2022 Jakub Jelinek <jakub@redhat.com> 12.0.0-0.4
-- update from trunk
-  - PRs ada/79724, analyzer/102692, analyzer/103940, c++/89074, c++/103480,
-	c++/100588, c++/101597, c++/103783, c++/103831, c++/103879,
-	c++/103912, c++/103946, c/101537, c/103881, fortran/82207,
-	fortran/101762, fortran/103366, fortran/103777, fortran/103789,
-	libstdc++/77760, libstdc++/100017, libstdc++/103726, libstdc++/103866,
-	libstdc++/103891, libstdc++/103955, middle-end/70090,
-	middle-end/101530, rtl-optimization/98782, rtl-optimization/103974,
-	target/53652, target/102024, target/102239, target/103465,
-	target/103804, target/103861, testsuite/102935, testsuite/103820,
-	tree-optimization/76174, tree-optimization/83541,
-	tree-optimization/100359, tree-optimization/103551,
-	tree-optimization/103821, tree-optimization/103948,
-	tree-optimization/103961, tree-optimization/103971,
-	tree-optimization/103977, tree-optimization/103990
-
-* Sat Jan  8 2022 Jakub Jelinek <jakub@redhat.com> 12.0.0-0.3
+* Thu Dec 18 2025 Jakub Jelinek <jakub@redhat.com> 16.0.0-0.2
 - new package
diff --git a/gcc12-fortran-fdec-non-logical-if.patch b/gcc12-fortran-fdec-non-logical-if.patch
deleted file mode 100644
index a3a830c..0000000
--- a/gcc12-fortran-fdec-non-logical-if.patch
+++ /dev/null
@@ -1,378 +0,0 @@
-From cc87ddb841017bb0976b05091733609ee17d7f05 Mon Sep 17 00:00:00 2001
-From: Mark Eggleston <markeggleston@gcc.gnu.org>
-Date: Fri, 22 Jan 2021 13:15:17 +0000
-Subject: [PATCH 07/10] Allow non-logical expressions in IF statements
-
-Use -fdec-non-logical-if to enable feature. Also enabled using -fdec.
----
- gcc/fortran/lang.opt                          |  4 ++
- gcc/fortran/options.cc                        |  1 +
- gcc/fortran/resolve.cc                        | 60 ++++++++++++++++---
- ...gical_expressions_if_statements_blocks_1.f | 25 ++++++++
- ...gical_expressions_if_statements_blocks_2.f | 25 ++++++++
- ...gical_expressions_if_statements_blocks_3.f | 25 ++++++++
- ...gical_expressions_if_statements_blocks_4.f | 45 ++++++++++++++
- ...gical_expressions_if_statements_blocks_5.f | 45 ++++++++++++++
- ...gical_expressions_if_statements_blocks_6.f | 45 ++++++++++++++
- 9 files changed, 266 insertions(+), 9 deletions(-)
- create mode 100644 gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_1.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_2.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_3.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_4.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_5.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_6.f
-
-diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt
-index 4a269ebb22d..d886c2f33ed 100644
---- a/gcc/fortran/lang.opt
-+++ b/gcc/fortran/lang.opt
-@@ -506,6 +506,10 @@ fdec-override-kind
- Fortran Var(flag_dec_override_kind)
- Enable support for per variable kind specification.
- 
-+fdec-non-logical-if
-+Fortran Var(flag_dec_non_logical_if)
-+Enable support for non-logical expressions in if statements.
-+
- fdec-structure
- Fortran Var(flag_dec_structure)
- Enable support for DEC STRUCTURE/RECORD.
-diff --git a/gcc/fortran/options.cc b/gcc/fortran/options.cc
-index edbab483b36..a946c86790a 100644
---- a/gcc/fortran/options.cc
-+++ b/gcc/fortran/options.cc
-@@ -79,6 +79,7 @@ set_dec_flags (int value)
-   SET_BITFLAG (flag_dec_char_conversions, value, value);
-   SET_BITFLAG (flag_dec_duplicates, value, value);
-   SET_BITFLAG (flag_dec_override_kind, value, value);
-+  SET_BITFLAG (flag_dec_non_logical_if, value, value);
- }
- 
- /* Finalize DEC flags.  */
-diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc
-index bc0df0fdb99..07dd039f3bf 100644
---- a/gcc/fortran/resolve.cc
-+++ b/gcc/fortran/resolve.cc
-@@ -10789,10 +10789,31 @@ gfc_resolve_blocks (gfc_code *b, gfc_namespace *ns)
-       switch (b->op)
- 	{
- 	case EXEC_IF:
--	  if (t && b->expr1 != NULL
--	      && (b->expr1->ts.type != BT_LOGICAL || b->expr1->rank != 0))
--	    gfc_error ("IF clause at %L requires a scalar LOGICAL expression",
--		       &b->expr1->where);
-+	  if (t && b->expr1 != NULL)
-+	    {
-+	      if (flag_dec_non_logical_if && b->expr1->ts.type != BT_LOGICAL)
-+		{
-+		  gfc_expr* cast;
-+		  cast = gfc_ne (b->expr1,
-+				 gfc_get_int_expr (1, &gfc_current_locus, 0),
-+				 INTRINSIC_NE);
-+		  if (cast == NULL)
-+		    gfc_internal_error ("gfc_resolve_blocks(): Failed to cast "
-+					"to LOGICAL in IF");
-+		  b->expr1 = cast;
-+		  if (warn_conversion_extra)
-+		    {
-+		      gfc_warning (OPT_Wconversion_extra, "Non-LOGICAL type in"
-+				   " IF statement condition %L will be true if"
-+				   " it evaluates to nonzero",
-+				   &b->expr1->where);
-+		    }
-+		}
-+
-+	      if ((b->expr1->ts.type != BT_LOGICAL || b->expr1->rank != 0))
-+		gfc_error ("IF clause at %L requires a scalar LOGICAL "
-+			   "expression", &b->expr1->where);
-+	    }
- 	  break;
- 
- 	case EXEC_WHERE:
-@@ -12093,11 +12114,32 @@ start:
- 	  break;
- 
- 	case EXEC_IF:
--	  if (t && code->expr1 != NULL
--	      && (code->expr1->ts.type != BT_LOGICAL
--		  || code->expr1->rank != 0))
--	    gfc_error ("IF clause at %L requires a scalar LOGICAL expression",
--		       &code->expr1->where);
-+	  if (t && code->expr1 != NULL)
-+	    {
-+	      if (flag_dec_non_logical_if
-+		  && code->expr1->ts.type != BT_LOGICAL)
-+		{
-+		  gfc_expr* cast;
-+		  cast = gfc_ne (code->expr1,
-+				 gfc_get_int_expr (1, &gfc_current_locus, 0),
-+				 INTRINSIC_NE);
-+		  if (cast == NULL)
-+		    gfc_internal_error ("gfc_resolve_code(): Failed to cast "
-+					"to LOGICAL in IF");
-+		  code->expr1 = cast;
-+		  if (warn_conversion_extra)
-+		    {
-+		      gfc_warning (OPT_Wconversion_extra, "Non-LOGICAL type in"
-+				   " IF statement condition %L will be true if"
-+				   " it evaluates to nonzero",
-+				   &code->expr1->where);
-+		    }
-+		}
-+
-+	      if (code->expr1->ts.type != BT_LOGICAL || code->expr1->rank != 0)
-+		gfc_error ("IF clause at %L requires a scalar LOGICAL "
-+			   "expression", &code->expr1->where);
-+	    }
- 	  break;
- 
- 	case EXEC_CALL:
-diff --git a/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_1.f b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_1.f
-new file mode 100644
-index 00000000000..0101db893ca
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_1.f
-@@ -0,0 +1,25 @@
-+! { dg-do run }
-+! { dg-options "-fdec -Wconversion-extra" }
-+!
-+! Allow logical expressions in if statements and blocks
-+!
-+! Contributed by Francisco Redondo Marchena <francisco.marchema@codethink.co.uk>
-+!             and Jeff Law <law@redhat.com>
-+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        PROGRAM logical_exp_if_st_bl
-+          INTEGER ipos/1/
-+          INTEGER ineg/0/
-+
-+          ! Test non logical variables
-+          if (ineg) STOP 1 ! { dg-warning "if it evaluates to nonzero" }
-+          if (0) STOP 2 ! { dg-warning "if it evaluates to nonzero" }
-+
-+          ! Test non logical expressions in if statements
-+          if (MOD(ipos, 1)) STOP 3 ! { dg-warning "if it evaluates to nonzero" }
-+
-+          ! Test non logical expressions in if blocks
-+          if (MOD(2 * ipos, 2)) then ! { dg-warning "if it evaluates to nonzero" }
-+            STOP 4
-+          endif
-+        END
-diff --git a/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_2.f b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_2.f
-new file mode 100644
-index 00000000000..876f4e09508
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_2.f
-@@ -0,0 +1,25 @@
-+! { dg-do run }
-+! { dg-options "-fdec-non-logical-if -Wconversion-extra" }
-+!
-+! Allow logical expressions in if statements and blocks
-+!
-+! Contributed by Francisco Redondo Marchena <francisco.marchema@codethink.co.uk>
-+!             and Jeff Law <law@redhat.com>
-+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        PROGRAM logical_exp_if_st_bl
-+          INTEGER ipos/1/
-+          INTEGER ineg/0/
-+
-+          ! Test non logical variables
-+          if (ineg) STOP 1 ! { dg-warning "if it evaluates to nonzero" }
-+          if (0) STOP 2 ! { dg-warning "if it evaluates to nonzero" }
-+
-+          ! Test non logical expressions in if statements
-+          if (MOD(ipos, 1)) STOP 3 ! { dg-warning "if it evaluates to nonzero" }
-+
-+          ! Test non logical expressions in if blocks
-+          if (MOD(2 * ipos, 2)) then ! { dg-warning "if it evaluates to nonzero" }
-+            STOP 4
-+          endif
-+        END
-diff --git a/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_3.f b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_3.f
-new file mode 100644
-index 00000000000..35cb4c51b8d
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_3.f
-@@ -0,0 +1,25 @@
-+! { dg-do compile }
-+! { dg-options "-fdec -fno-dec-non-logical-if" }
-+!
-+! Allow logical expressions in if statements and blocks
-+!
-+! Contributed by Francisco Redondo Marchena <francisco.marchema@codethink.co.uk>
-+!             and Jeff Law <law@redhat.com>
-+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        PROGRAM logical_exp_if_st_bl
-+          INTEGER ipos/1/
-+          INTEGER ineg/0/
-+
-+          ! Test non logical variables
-+          if (ineg) STOP 1 ! { dg-error "IF clause at" }
-+          if (0) STOP 2 ! { dg-error "IF clause at" }
-+
-+          ! Test non logical expressions in if statements
-+          if (MOD(ipos, 1)) STOP 3 ! { dg-error "IF clause at" }
-+
-+          ! Test non logical expressions in if blocks
-+          if (MOD(2 * ipos, 2)) then ! { dg-error "IF clause at" }
-+            STOP 4
-+          endif
-+        END
-diff --git a/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_4.f b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_4.f
-new file mode 100644
-index 00000000000..7b60b60827f
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_4.f
-@@ -0,0 +1,45 @@
-+! { dg-do run }
-+! { dg-options "-fdec -Wconversion-extra" }
-+!
-+! Contributed by Francisco Redondo Marchena <francisco.marchema@codethink.co.uk>
-+!             and Jeff Law <law@redhat.com>
-+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+       function othersub1()
-+        integer*4 othersub1
-+        othersub1 = 9
-+       end
-+
-+       function othersub2()
-+        integer*4 othersub2
-+        othersub2 = 0
-+       end
-+
-+       program MAIN
-+        integer*4 othersub1
-+        integer*4 othersub2
-+        integer a /1/
-+        integer b /2/        
-+ 
-+        if (othersub1()) then ! { dg-warning "if it evaluates to nonzero" }
-+           write(*,*) "OK"
-+        else
-+           stop 1
-+        end if
-+        if (othersub2()) then ! { dg-warning "if it evaluates to nonzero" }
-+           stop 2
-+        else
-+           write(*,*) "OK"
-+        end if
-+        if (a-b) then ! { dg-warning "if it evaluates to nonzero" }
-+           write(*,*) "OK"
-+        else
-+           stop 3
-+        end if
-+        if (b-(a+1)) then ! { dg-warning "if it evaluates to nonzero" }
-+           stop 3
-+        else
-+           write(*,*) "OK"
-+        end if
-+       end
-+
-diff --git a/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_5.f b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_5.f
-new file mode 100644
-index 00000000000..80336f48ca1
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_5.f
-@@ -0,0 +1,45 @@
-+! { dg-do run }
-+! { dg-options "-fdec-non-logical-if -Wconversion-extra" }
-+!
-+! Contributed by Francisco Redondo Marchena <francisco.marchema@codethink.co.uk>
-+!             and Jeff Law <law@redhat.com>
-+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+       function othersub1()
-+        integer*4 othersub1
-+        othersub1 = 9
-+       end
-+
-+       function othersub2()
-+        integer*4 othersub2
-+        othersub2 = 0
-+       end
-+
-+       program MAIN
-+        integer*4 othersub1
-+        integer*4 othersub2
-+        integer a /1/
-+        integer b /2/        
-+ 
-+        if (othersub1()) then ! { dg-warning "Non-LOGICAL type in IF statement" }
-+           write(*,*) "OK"
-+        else
-+           stop 1
-+        end if
-+        if (othersub2()) then ! { dg-warning "Non-LOGICAL type in IF statement" }
-+           stop 2
-+        else
-+           write(*,*) "OK"
-+        end if
-+        if (a-b) then ! { dg-warning "Non-LOGICAL type in IF statement" }
-+           write(*,*) "OK"
-+        else
-+           stop 3
-+        end if
-+        if (b-(a+1)) then ! { dg-warning "Non-LOGICAL type in IF statement" }
-+           stop 3
-+        else
-+           write(*,*) "OK"
-+        end if
-+       end
-+
-diff --git a/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_6.f b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_6.f
-new file mode 100644
-index 00000000000..e1125ca717a
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_6.f
-@@ -0,0 +1,45 @@
-+! { dg-do compile }
-+! { dg-options "-fdec -fno-dec-non-logical-if" }
-+!
-+! Contributed by Francisco Redondo Marchena <francisco.marchema@codethink.co.uk>
-+!             and Jeff Law <law@redhat.com>
-+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+       function othersub1()
-+        integer*4 othersub1
-+        othersub1 = 9
-+       end
-+
-+       function othersub2()
-+        integer*4 othersub2
-+        othersub2 = 0
-+       end
-+
-+       program MAIN
-+        integer*4 othersub1
-+        integer*4 othersub2
-+        integer a /1/
-+        integer b /2/        
-+ 
-+        if (othersub1()) then ! { dg-error "IF clause at" }
-+           write(*,*) "OK"
-+        else
-+           stop 1
-+        end if
-+        if (othersub2()) then ! { dg-error "IF clause at" }
-+           stop 2
-+        else
-+           write(*,*) "OK"
-+        end if
-+        if (a-b) then ! { dg-error "IF clause at" }
-+           write(*,*) "OK"
-+        else
-+           stop 3
-+        end if
-+        if (b-(a+1)) then ! { dg-error "IF clause at" }
-+           stop 3
-+        else
-+           write(*,*) "OK"
-+        end if
-+       end
-+
--- 
-2.27.0
-
diff --git a/gcc12-fortran-fdec-override-kind.patch b/gcc12-fortran-fdec-override-kind.patch
deleted file mode 100644
index 370fa56..0000000
--- a/gcc12-fortran-fdec-override-kind.patch
+++ /dev/null
@@ -1,588 +0,0 @@
-From 786869fd62813e80da9b6545a295d53c36275c19 Mon Sep 17 00:00:00 2001
-From: Mark Eggleston <markeggleston@gcc.gnu.org>
-Date: Fri, 22 Jan 2021 13:12:14 +0000
-Subject: [PATCH 06/10] Allow string length and kind to be specified on a per
- variable basis.
-
-This allows kind/length to be mixed with array specification in
-declarations.
-
-e.g.
-
-      INTEGER*4 x*2, y*8
-      CHARACTER names*20(10)
-      REAL v(100)*8, vv*4(50)
-
-The per-variable size overrides the kind or length specified for the type.
-
-Use -fdec-override-kind to enable. Also enabled by -fdec.
-
-Note: this feature is a merger of two previously separate features.
-
-Now accepts named constants as kind parameters:
-
-      INTEGER A
-      PARAMETER (A=2)
-      INTEGER B*(A)
-
-Contributed by Mark Eggleston <mark.eggleston@codethink.com>
-
-Now rejects invalid kind parameters and prints error messages:
-
-      INTEGER X*3
-
-caused an internal compiler error.
-
-Contributed by Mark Eggleston <mark.eggleston@codethink.com>
----
- gcc/fortran/decl.cc                           | 156 ++++++++++++++----
- gcc/fortran/lang.opt                          |   4 +
- gcc/fortran/options.cc                        |   1 +
- .../dec_mixed_char_array_declaration_1.f      |  13 ++
- .../dec_mixed_char_array_declaration_2.f      |  13 ++
- .../dec_mixed_char_array_declaration_3.f      |  13 ++
- .../gfortran.dg/dec_spec_in_variable_1.f      |  31 ++++
- .../gfortran.dg/dec_spec_in_variable_2.f      |  31 ++++
- .../gfortran.dg/dec_spec_in_variable_3.f      |  31 ++++
- .../gfortran.dg/dec_spec_in_variable_4.f      |  14 ++
- .../gfortran.dg/dec_spec_in_variable_5.f      |  19 +++
- .../gfortran.dg/dec_spec_in_variable_6.f      |  19 +++
- .../gfortran.dg/dec_spec_in_variable_7.f      |  15 ++
- .../gfortran.dg/dec_spec_in_variable_8.f      |  14 ++
- 14 files changed, 340 insertions(+), 34 deletions(-)
- create mode 100644 gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_1.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_2.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_3.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_1.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_2.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_3.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_4.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_5.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_6.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_7.f
- create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_8.f
-
-diff --git a/gcc/fortran/decl.cc b/gcc/fortran/decl.cc
-index 5c8c1b7981b..f7dc9d8263d 100644
---- a/gcc/fortran/decl.cc
-+++ b/gcc/fortran/decl.cc
-@@ -1213,6 +1213,54 @@ syntax:
-   return MATCH_ERROR;
- }
- 
-+/* This matches the nonstandard kind given after a variable name, like:
-+   INTEGER x*2, y*4
-+   The per-variable kind will override any kind given in the type
-+   declaration.
-+*/
-+
-+static match
-+match_per_symbol_kind (int *length)
-+{
-+  match m;
-+  gfc_expr *expr = NULL;
-+
-+  m = gfc_match_char ('*');
-+  if (m != MATCH_YES)
-+    return m;
-+
-+  m = gfc_match_small_literal_int (length, NULL);
-+  if (m == MATCH_YES || m == MATCH_ERROR)
-+    return m;
-+
-+  if (gfc_match_char ('(') == MATCH_NO)
-+    return MATCH_ERROR;
-+
-+  m = gfc_match_expr (&expr);
-+  if (m == MATCH_YES)
-+    {
-+      m = MATCH_ERROR; // Assume error
-+      if (gfc_expr_check_typed (expr, gfc_current_ns, false))
-+	{
-+	  if ((expr->expr_type == EXPR_CONSTANT)
-+	      && (expr->ts.type == BT_INTEGER))
-+	    {
-+	      *length = mpz_get_si(expr->value.integer);
-+	      m = MATCH_YES;
-+	    }
-+	}
-+
-+	if (m == MATCH_YES)
-+	  {
-+	    if (gfc_match_char (')') == MATCH_NO)
-+	       m = MATCH_ERROR;
-+  }
-+     }
-+
-+  if (expr != NULL)
-+     gfc_free_expr (expr);
-+  return m;
-+}
- 
- /* Special subroutine for finding a symbol.  Check if the name is found
-    in the current name space.  If not, and we're compiling a function or
-@@ -2443,6 +2491,35 @@ check_function_name (char *name)
- }
- 
- 
-+static match
-+match_character_length_clause (gfc_charlen **cl, bool *cl_deferred, int elem)
-+{
-+  gfc_expr* char_len;
-+  char_len = NULL;
-+
-+  match m = match_char_length (&char_len, cl_deferred, false);
-+  if (m == MATCH_YES)
-+    {
-+      *cl = gfc_new_charlen (gfc_current_ns, NULL);
-+      (*cl)->length = char_len;
-+    }
-+  else if (m == MATCH_NO)
-+    {
-+      if (elem > 1
-+	  && (current_ts.u.cl->length == NULL
-+	      || current_ts.u.cl->length->expr_type != EXPR_CONSTANT))
-+	{
-+	  *cl = gfc_new_charlen (gfc_current_ns, NULL);
-+	  (*cl)->length = gfc_copy_expr (current_ts.u.cl->length);
-+	}
-+      else
-+      *cl = current_ts.u.cl;
-+
-+      *cl_deferred = current_ts.deferred;
-+    }
-+  return m;
-+}
-+
- /* Match a variable name with an optional initializer.  When this
-    subroutine is called, a variable is expected to be parsed next.
-    Depending on what is happening at the moment, updates either the
-@@ -2453,7 +2530,7 @@ variable_decl (int elem)
- {
-   char name[GFC_MAX_SYMBOL_LEN + 1];
-   static unsigned int fill_id = 0;
--  gfc_expr *initializer, *char_len;
-+  gfc_expr *initializer;
-   gfc_array_spec *as;
-   gfc_array_spec *cp_as; /* Extra copy for Cray Pointees.  */
-   gfc_charlen *cl;
-@@ -2462,11 +2539,15 @@ variable_decl (int elem)
-   match m;
-   bool t;
-   gfc_symbol *sym;
-+  match cl_match;
-+  match kind_match;
-+  int overridden_kind;
-   char c;
- 
-   initializer = NULL;
-   as = NULL;
-   cp_as = NULL;
-+  kind_match = MATCH_NO;
- 
-   /* When we get here, we've just matched a list of attributes and
-      maybe a type and a double colon.  The next thing we expect to see
-@@ -2519,6 +2600,28 @@ variable_decl (int elem)
- 
-   var_locus = gfc_current_locus;
- 
-+
-+  cl = NULL;
-+  cl_deferred = false;
-+  cl_match = MATCH_NO;
-+
-+  /* Check for a character length clause before an array clause */
-+  if (flag_dec_override_kind)
-+    {
-+      if (current_ts.type == BT_CHARACTER)
-+	{
-+	  cl_match = match_character_length_clause (&cl, &cl_deferred, elem);
-+	  if (cl_match == MATCH_ERROR)
-+	    goto cleanup;
-+	}
-+      else
-+	{
-+	  kind_match = match_per_symbol_kind (&overridden_kind);
-+	  if (kind_match == MATCH_ERROR)
-+	    goto cleanup;
-+	}
-+    }
-+
-   /* Now we could see the optional array spec. or character length.  */
-   m = gfc_match_array_spec (&as, true, true);
-   if (m == MATCH_ERROR)
-@@ -2667,40 +2770,12 @@ variable_decl (int elem)
- 	}
-     }
- 
--  char_len = NULL;
--  cl = NULL;
--  cl_deferred = false;
--
--  if (current_ts.type == BT_CHARACTER)
-+  /* Second chance for a character length clause */
-+  if (cl_match == MATCH_NO && current_ts.type == BT_CHARACTER)
-     {
--      switch (match_char_length (&char_len, &cl_deferred, false))
--	{
--	case MATCH_YES:
--	  cl = gfc_new_charlen (gfc_current_ns, NULL);
--
--	  cl->length = char_len;
--	  break;
--
--	/* Non-constant lengths need to be copied after the first
--	   element.  Also copy assumed lengths.  */
--	case MATCH_NO:
--	  if (elem > 1
--	      && (current_ts.u.cl->length == NULL
--		  || current_ts.u.cl->length->expr_type != EXPR_CONSTANT))
--	    {
--	      cl = gfc_new_charlen (gfc_current_ns, NULL);
--	      cl->length = gfc_copy_expr (current_ts.u.cl->length);
--	    }
--	  else
--	    cl = current_ts.u.cl;
--
--	  cl_deferred = current_ts.deferred;
--
--	  break;
--
--	case MATCH_ERROR:
--	  goto cleanup;
--	}
-+      m = match_character_length_clause (&cl, &cl_deferred, elem);
-+      if (m == MATCH_ERROR)
-+	goto cleanup;
-     }
- 
-   /* The dummy arguments and result of the abreviated form of MODULE
-@@ -2802,6 +2877,19 @@ variable_decl (int elem)
-       goto cleanup;
-     }
- 
-+  if (kind_match == MATCH_YES)
-+    {
-+      gfc_find_symbol (name, gfc_current_ns, 1, &sym);
-+      /* sym *must* be found at this point */
-+      sym->ts.kind = overridden_kind;
-+      if (gfc_validate_kind (sym->ts.type, sym->ts.kind, true) < 0)
-+	{
-+	  gfc_error ("Kind %d not supported for type %s at %C",
-+		     sym->ts.kind, gfc_basic_typename (sym->ts.type));
-+	  return MATCH_ERROR;
-+	}
-+    }
-+
-   if (!check_function_name (name))
-     {
-       m = MATCH_ERROR;
-diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt
-index 25cc948699b..4a269ebb22d 100644
---- a/gcc/fortran/lang.opt
-+++ b/gcc/fortran/lang.opt
-@@ -502,6 +502,10 @@ fdec-math
- Fortran Var(flag_dec_math)
- Enable legacy math intrinsics for compatibility.
- 
-+fdec-override-kind
-+Fortran Var(flag_dec_override_kind)
-+Enable support for per variable kind specification.
-+
- fdec-structure
- Fortran Var(flag_dec_structure)
- Enable support for DEC STRUCTURE/RECORD.
-diff --git a/gcc/fortran/options.cc b/gcc/fortran/options.cc
-index d6bd36c3a8a..edbab483b36 100644
---- a/gcc/fortran/options.cc
-+++ b/gcc/fortran/options.cc
-@@ -78,6 +78,7 @@ set_dec_flags (int 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);
-+  SET_BITFLAG (flag_dec_override_kind, value, value);
- }
- 
- /* Finalize DEC flags.  */
-diff --git a/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_1.f b/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_1.f
-new file mode 100644
-index 00000000000..706ea4112a4
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_1.f
-@@ -0,0 +1,13 @@
-+! { dg-do run }
-+! { dg-options "-fdec" }
-+!
-+! Test character declaration with mixed string length and array specification
-+!
-+! Contributed by Jim MacArthur <jim.macarthur@codethink.co.uk>
-+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+       PROGRAM character_declaration
-+          CHARACTER ASPEC_SLENGTH*2 (5) /'01','02','03','04','05'/
-+          CHARACTER SLENGTH_ASPEC(5)*2 /'01','02','03','04','05'/
-+          if (ASPEC_SLENGTH(3).NE.SLENGTH_ASPEC(3)) STOP 1
-+        END
-diff --git a/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_2.f b/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_2.f
-new file mode 100644
-index 00000000000..26d2acf01de
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_2.f
-@@ -0,0 +1,13 @@
-+! { dg-do run }
-+! { dg-options "-fdec-override-kind" }
-+!
-+! Test character declaration with mixed string length and array specification
-+!
-+! Contributed by Jim MacArthur <jim.macarthur@codethink.co.uk>
-+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        PROGRAM character_declaration
-+          CHARACTER ASPEC_SLENGTH*2 (5) /'01','02','03','04','05'/
-+          CHARACTER SLENGTH_ASPEC(5)*2 /'01','02','03','04','05'/
-+          if (ASPEC_SLENGTH(3).NE.SLENGTH_ASPEC(3)) STOP 1
-+        END
-diff --git a/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_3.f b/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_3.f
-new file mode 100644
-index 00000000000..76e4f0bdb93
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_3.f
-@@ -0,0 +1,13 @@
-+! { dg-do compile }
-+! { dg-options "-fdec-override-kind -fno-dec-override-kind" }
-+!
-+! Test character declaration with mixed string length and array specification
-+!
-+! Contributed by Jim MacArthur <jim.macarthur@codethink.co.uk>
-+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        PROGRAM character_declaration
-+          CHARACTER ASPEC_SLENGTH*2 (5) /'01','02','03','04','05'/ ! { dg-error "Syntax error" }
-+          CHARACTER SLENGTH_ASPEC(5)*2 /'01','02','03','04','05'/
-+          if (ASPEC_SLENGTH(3).NE.SLENGTH_ASPEC(3)) STOP 1 ! { dg-error " Operands of comparison operator" }
-+        END
-diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_1.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_1.f
-new file mode 100644
-index 00000000000..edd0f5874b7
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_1.f
-@@ -0,0 +1,31 @@
-+! { dg-do run }
-+! { dg-options "-fdec" }
-+!
-+! Test kind specification in variable not in type
-+!
-+! Contributed by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        program spec_in_var
-+          integer*8  ai*1, bi*4, ci
-+          real*4 ar*4, br*8, cr
-+
-+          ai = 1
-+          ar = 1.0
-+          bi = 2
-+          br = 2.0
-+          ci = 3
-+          cr = 3.0
-+
-+          if (ai .ne. 1) stop 1
-+          if (abs(ar - 1.0) > 1.0D-6) stop 2
-+          if (bi .ne. 2) stop 3
-+          if (abs(br - 2.0) > 1.0D-6) stop 4
-+          if (ci .ne. 3) stop 5
-+          if (abs(cr - 3.0) > 1.0D-6) stop 6
-+          if (kind(ai) .ne. 1) stop 7
-+          if (kind(ar) .ne. 4) stop 8
-+          if (kind(bi) .ne. 4) stop 9
-+          if (kind(br) .ne. 8) stop 10
-+          if (kind(ci) .ne. 8) stop 11
-+          if (kind(cr) .ne. 4) stop 12
-+        end
-diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_2.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_2.f
-new file mode 100644
-index 00000000000..bfaba584dbb
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_2.f
-@@ -0,0 +1,31 @@
-+! { dg-do run }
-+! { dg-options "-fdec-override-kind" }
-+!
-+! Test kind specification in variable not in type
-+!
-+! Contributed by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        program spec_in_var
-+          integer*8  ai*1, bi*4, ci
-+          real*4 ar*4, br*8, cr
-+
-+          ai = 1
-+          ar = 1.0
-+          bi = 2
-+          br = 2.0
-+          ci = 3
-+          cr = 3.0
-+
-+          if (ai .ne. 1) stop 1
-+          if (abs(ar - 1.0) > 1.0D-6) stop 2
-+          if (bi .ne. 2) stop 3
-+          if (abs(br - 2.0) > 1.0D-6) stop 4
-+          if (ci .ne. 3) stop 5
-+          if (abs(cr - 3.0) > 1.0D-6) stop 6
-+          if (kind(ai) .ne. 1) stop 7
-+          if (kind(ar) .ne. 4) stop 8
-+          if (kind(bi) .ne. 4) stop 9
-+          if (kind(br) .ne. 8) stop 10
-+          if (kind(ci) .ne. 8) stop 11
-+          if (kind(cr) .ne. 4) stop 12
-+        end
-diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_3.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_3.f
-new file mode 100644
-index 00000000000..5ff434e7466
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_3.f
-@@ -0,0 +1,31 @@
-+! { dg-do compile }
-+! { dg-options "-fdec -fno-dec-override-kind" }
-+!
-+! Test kind specification in variable not in type
-+!
-+! Contributed by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        program spec_in_var
-+          integer*8  ai*1, bi*4, ci ! { dg-error "Syntax error" }
-+          real*4 ar*4, br*8, cr ! { dg-error "Syntax error" }
-+
-+          ai = 1
-+          ar = 1.0
-+          bi = 2
-+          br = 2.0
-+          ci = 3
-+          cr = 3.0
-+
-+          if (ai .ne. 1) stop 1
-+          if (abs(ar - 1.0) > 1.0D-6) stop 2
-+          if (bi .ne. 2) stop 3
-+          if (abs(br - 2.0) > 1.0D-6) stop 4
-+          if (ci .ne. 3) stop 5
-+          if (abs(cr - 3.0) > 1.0D-6) stop 6
-+          if (kind(ai) .ne. 1) stop 7
-+          if (kind(ar) .ne. 4) stop 8
-+          if (kind(bi) .ne. 4) stop 9
-+          if (kind(br) .ne. 8) stop 10
-+          if (kind(ci) .ne. 8) stop 11
-+          if (kind(cr) .ne. 4) stop 12
-+        end
-diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_4.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_4.f
-new file mode 100644
-index 00000000000..c01980e8b9d
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_4.f
-@@ -0,0 +1,14 @@
-+! { dg-do compile }
-+!
-+! Test kind specification in variable not in type. The per variable
-+! kind specification is not enabled so these should fail
-+!
-+! Contributed by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        program spec_in_var
-+          integer a
-+          parameter(a=2)
-+          integer b*(a) ! { dg-error "Syntax error" }
-+          real c*(8)    ! { dg-error "Syntax error" }
-+          logical d*1_1 ! { dg-error "Syntax error" }
-+        end
-diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_5.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_5.f
-new file mode 100644
-index 00000000000..e2f39da3f4f
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_5.f
-@@ -0,0 +1,19 @@
-+! { dg-do run }
-+! { dg-options "-fdec-override-kind" }
-+!
-+! Test kind specification in variable not in type
-+!
-+! Contributed by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        program spec_in_var
-+          integer a
-+          parameter(a=2)
-+          integer b*(a)
-+          real c*(8)
-+          logical d*(1_1)
-+          character e*(a)
-+          if (kind(b).ne.2) stop 1
-+          if (kind(c).ne.8) stop 2
-+          if (kind(d).ne.1) stop 3
-+          if (len(e).ne.2) stop 4
-+        end
-diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_6.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_6.f
-new file mode 100644
-index 00000000000..569747874e3
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_6.f
-@@ -0,0 +1,19 @@
-+! { dg-do run }
-+! { dg-options "-fdec" }
-+!
-+! Test kind specification in variable not in type
-+!
-+! Contributed by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        program spec_in_var
-+          integer a
-+          parameter(a=2)
-+          integer b*(a)
-+          real c*(8)
-+          logical d*(1_1)
-+          character e*(a)
-+          if (kind(b).ne.2) stop 1
-+          if (kind(c).ne.8) stop 2
-+          if (kind(d).ne.1) stop 3
-+          if (len(e).ne.2) stop 4
-+        end
-diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_7.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_7.f
-new file mode 100644
-index 00000000000..b975bfd15c5
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_7.f
-@@ -0,0 +1,15 @@
-+! { dg-do compile }
-+! { dg-options "-fdec -fno-dec-override-kind" }
-+!
-+! Test kind specification in variable not in type as the per variable
-+! kind specification is not enables these should fail
-+!
-+! Contributed by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        program spec_in_var
-+          integer a
-+          parameter(a=2)
-+          integer b*(a) ! { dg-error "Syntax error" }
-+          real c*(8)    ! { dg-error "Syntax error" }
-+          logical d*1_1 ! { dg-error "Syntax error" }
-+        end
-diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_8.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_8.f
-new file mode 100644
-index 00000000000..85732e0bd85
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_8.f
-@@ -0,0 +1,14 @@
-+! { dg-do compile }
-+! { dg-options "-fdec" }
-+!
-+! Check that invalid kind values are rejected.
-+!
-+! Contributed by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+        program spec_in_var
-+          integer a
-+          parameter(a=3)
-+          integer b*(a) ! { dg-error "Kind 3 not supported" }
-+          real c*(78)   ! { dg-error "Kind 78 not supported" }
-+          logical d*(*) ! { dg-error "Invalid character" }
-+        end
--- 
-2.27.0
-
diff --git a/gcc12-fortran-flogical-as-integer.patch b/gcc12-fortran-flogical-as-integer.patch
deleted file mode 100644
index 28df5e1..0000000
--- a/gcc12-fortran-flogical-as-integer.patch
+++ /dev/null
@@ -1,305 +0,0 @@
-From 9b45f3063dfd2b893e7963a4828c1b0afecdc68a Mon Sep 17 00:00:00 2001
-From: Mark Eggleston <markeggleston@gcc.gnu.org>
-Date: Fri, 22 Jan 2021 12:41:46 +0000
-Subject: [PATCH 02/10] Convert LOGICAL to INTEGER for arithmetic ops, and vice
- versa
-
-We allow converting LOGICAL types to INTEGER when doing arithmetic
-operations, and converting INTEGER types to LOGICAL for use in
-boolean operations.
-
-This feature is enabled with the -flogical-as-integer flag.
-
-Note: using this feature will disable bitwise logical operations enabled by
--fdec.
----
- gcc/fortran/lang.opt                          |  4 ++
- gcc/fortran/resolve.cc                        | 55 ++++++++++++++++++-
- .../logical_to_integer_and_vice_versa_1.f     | 31 +++++++++++
- .../logical_to_integer_and_vice_versa_2.f     | 31 +++++++++++
- .../logical_to_integer_and_vice_versa_3.f     | 33 +++++++++++
- .../logical_to_integer_and_vice_versa_4.f     | 33 +++++++++++
- 6 files changed, 186 insertions(+), 1 deletion(-)
- create mode 100644 gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_1.f
- create mode 100644 gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_2.f
- create mode 100644 gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_3.f
- create mode 100644 gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_4.f
-
-diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt
-index 52bd522051e..c4da248f07c 100644
---- a/gcc/fortran/lang.opt
-+++ b/gcc/fortran/lang.opt
-@@ -497,6 +497,10 @@ fdec-static
- Fortran Var(flag_dec_static)
- Enable DEC-style STATIC and AUTOMATIC attributes.
- 
-+flogical-as-integer
-+Fortran Var(flag_logical_as_integer)
-+Convert from integer to logical or logical to integer for arithmetic operations.
-+
- fdefault-double-8
- Fortran Var(flag_default_double)
- Set the default double precision kind to an 8 byte wide type.
-diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc
-index c075d0fa0c4..4b90cb59902 100644
---- a/gcc/fortran/resolve.cc
-+++ b/gcc/fortran/resolve.cc
-@@ -3915,7 +3915,6 @@ lookup_uop_fuzzy (const char *op, gfc_symtree *uop)
-   return gfc_closest_fuzzy_match (op, candidates);
- }
- 
--
- /* Callback finding an impure function as an operand to an .and. or
-    .or.  expression.  Remember the last function warned about to
-    avoid double warnings when recursing.  */
-@@ -3975,6 +3974,22 @@ convert_hollerith_to_character (gfc_expr *e)
-     }
- }
- 
-+/* If E is a logical, convert it to an integer and issue a warning
-+   for the conversion.  */
-+
-+static void
-+convert_integer_to_logical (gfc_expr *e)
-+{
-+  if (e->ts.type == BT_INTEGER)
-+    {
-+      /* Convert to LOGICAL */
-+      gfc_typespec t;
-+      t.type = BT_LOGICAL;
-+      t.kind = 1;
-+      gfc_convert_type_warn (e, &t, 2, 1);
-+    }
-+}
-+
- /* Convert to numeric and issue a warning for the conversion.  */
- 
- static void
-@@ -3987,6 +4002,22 @@ convert_to_numeric (gfc_expr *a, gfc_expr *b)
-   gfc_convert_type_warn (a, &t, 2, 1);
- }
- 
-+/* If E is a logical, convert it to an integer and issue a warning
-+   for the conversion.  */
-+
-+static void
-+convert_logical_to_integer (gfc_expr *e)
-+{
-+  if (e->ts.type == BT_LOGICAL)
-+    {
-+      /* Convert to INTEGER */
-+      gfc_typespec t;
-+      t.type = BT_INTEGER;
-+      t.kind = 1;
-+      gfc_convert_type_warn (e, &t, 2, 1);
-+    }
-+}
-+
- /* Resolve an operator expression node.  This can involve replacing the
-    operation with a user defined function call.  */
- 
-@@ -4072,6 +4103,12 @@ resolve_operator (gfc_expr *e)
-     case INTRINSIC_TIMES:
-     case INTRINSIC_DIVIDE:
-     case INTRINSIC_POWER:
-+      if (flag_logical_as_integer)
-+	{
-+	  convert_logical_to_integer (op1);
-+	  convert_logical_to_integer (op2);
-+	}
-+
-       if (gfc_numeric_ts (&op1->ts) && gfc_numeric_ts (&op2->ts))
- 	{
- 	  gfc_type_convert_binary (e, 1);
-@@ -4108,6 +4145,13 @@ resolve_operator (gfc_expr *e)
-     case INTRINSIC_OR:
-     case INTRINSIC_EQV:
-     case INTRINSIC_NEQV:
-+
-+      if (flag_logical_as_integer)
-+	{
-+	  convert_integer_to_logical (op1);
-+	  convert_integer_to_logical (op2);
-+	}
-+
-       if (op1->ts.type == BT_LOGICAL && op2->ts.type == BT_LOGICAL)
- 	{
- 	  e->ts.type = BT_LOGICAL;
-@@ -4158,6 +4202,9 @@ resolve_operator (gfc_expr *e)
- 	  goto simplify_op;
- 	}
- 
-+      if (flag_logical_as_integer)
-+	convert_integer_to_logical (op1);
-+
-       if (op1->ts.type == BT_LOGICAL)
- 	{
- 	  e->ts.type = BT_LOGICAL;
-@@ -4198,6 +4245,12 @@ resolve_operator (gfc_expr *e)
- 	  convert_hollerith_to_character (op2);
- 	}
- 
-+      if (flag_logical_as_integer)
-+	{
-+	  convert_logical_to_integer (op1);
-+	  convert_logical_to_integer (op2);
-+	}
-+
-       if (op1->ts.type == BT_CHARACTER && op2->ts.type == BT_CHARACTER
- 	  && op1->ts.kind == op2->ts.kind)
- 	{
-diff --git a/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_1.f b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_1.f
-new file mode 100644
-index 00000000000..938a91d9e9a
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_1.f
-@@ -0,0 +1,31 @@
-+! { dg-do run }
-+! { dg-options "-std=legacy -flogical-as-integer" }
-+!
-+! Test conversion between logical and integer for logical operators
-+!
-+! Test case contributed by Jim MacArthur <jim.macarthur@codethink.co.uk>
-+! Modified for -flogical-as-integer by Mark Eggleston
-+! <mark.eggleston@codethink.com>
-+!
-+        PROGRAM logical_integer_conversion
-+          LOGICAL lpos /.true./
-+          INTEGER ineg/0/
-+          INTEGER ires
-+          LOGICAL lres
-+
-+          ! Test Logicals converted to Integers
-+          if ((lpos.AND.ineg).EQ.1) STOP 3
-+          if ((ineg.AND.lpos).NE.0) STOP 4
-+          ires = (.true..AND.0)
-+          if (ires.NE.0) STOP 5
-+          ires = (1.AND..false.)
-+          if (ires.EQ.1) STOP 6
-+
-+          ! Test Integers converted to Logicals
-+          if (lpos.EQ.ineg) STOP 7
-+          if (ineg.EQ.lpos) STOP 8
-+          lres = (.true..EQ.0)
-+          if (lres) STOP 9
-+          lres = (1.EQ..false.)
-+          if (lres) STOP 10
-+        END
-diff --git a/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_2.f b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_2.f
-new file mode 100644
-index 00000000000..9f146202ba5
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_2.f
-@@ -0,0 +1,31 @@
-+! { dg-do compile }
-+! { dg-options "-std=legacy -flogical-as-integer -fno-logical-as-integer" }
-+!
-+! Based on logical_to_integer_and_vice_versa_1.f but with option disabled
-+! to test for error messages.
-+!
-+! Test case contributed by by Mark Eggleston <mark.eggleston@codethink.com>
-+!
-+!
-+        PROGRAM logical_integer_conversion
-+          LOGICAL lpos /.true./
-+          INTEGER ineg/0/
-+          INTEGER ires
-+          LOGICAL lres
-+
-+          ! Test Logicals converted to Integers
-+          if ((lpos.AND.ineg).EQ.1) STOP 3 ! { dg-error "Operands of logical operator" }
-+          if ((ineg.AND.lpos).NE.0) STOP 4 ! { dg-error "Operands of logical operator" }
-+          ires = (.true..AND.0) ! { dg-error "Operands of logical operator" }
-+          if (ires.NE.0) STOP 5
-+          ires = (1.AND..false.) ! { dg-error "Operands of logical operator" }
-+          if (ires.EQ.1) STOP 6
-+
-+          ! Test Integers converted to Logicals
-+          if (lpos.EQ.ineg) STOP 7 ! { dg-error "Operands of comparison operator" }
-+          if (ineg.EQ.lpos) STOP 8 ! { dg-error "Operands of comparison operator" }
-+          lres = (.true..EQ.0) ! { dg-error "Operands of comparison operator" }
-+          if (lres) STOP 9
-+          lres = (1.EQ..false.) ! { dg-error "Operands of comparison operator" }
-+          if (lres) STOP 10
-+        END
-diff --git a/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_3.f b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_3.f
-new file mode 100644
-index 00000000000..446873eb2dc
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_3.f
-@@ -0,0 +1,33 @@
-+! { dg-do compile }
-+! { dg-options "-std=legacy -flogical-as-integer" }
-+!
-+! Test conversion between logical and integer for logical operators
-+!
-+        program test
-+          logical f /.false./
-+          logical t /.true./
-+          real x
-+
-+          x = 7.7
-+          x = x + t*3.0
-+          if (abs(x - 10.7).gt.0.00001) stop 1
-+          x = x + .false.*5.0
-+          if (abs(x - 10.7).gt.0.00001) stop 2
-+          x = x - .true.*5.0
-+          if (abs(x - 5.7).gt.0.00001) stop 3
-+          x = x + t
-+          if (abs(x - 6.7).gt.0.00001) stop 4
-+          x = x + f
-+          if (abs(x - 6.7).gt.0.00001) stop 5
-+          x = x - t
-+          if (abs(x - 5.7).gt.0.00001) stop 6
-+          x = x - f
-+          if (abs(x - 5.7).gt.0.00001) stop 7
-+          x = x**.true.
-+          if (abs(x - 5.7).gt.0.00001) stop 8
-+          x = x**.false.
-+          if (abs(x - 1.0).gt.0.00001) stop 9
-+          x = x/t
-+          if (abs(x - 1.0).gt.0.00001) stop 10
-+          if ((x/.false.).le.huge(x)) stop 11
-+        end
-diff --git a/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_4.f b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_4.f
-new file mode 100644
-index 00000000000..4301a4988d8
---- /dev/null
-+++ b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_4.f
-@@ -0,0 +1,33 @@
-+! { dg-do compile }
-+! { dg-options "-std=legacy -flogical-as-integer -fno-logical-as-integer" }
-+!
-+! Test conversion between logical and integer for logical operators
-+!
-+        program test
-+          logical f /.false./
-+          logical t /.true./
-+          real x
-+
-+          x = 7.7
-+          x = x + t*3.0 ! { dg-error "Operands of binary numeric" }
-+          if (abs(x - 10.7).gt.0.00001) stop 1
-+          x = x + .false.*5.0 ! { dg-error "Operands of binary numeric" }
-+          if (abs(x - 10.7).gt.0.00001) stop 2
-+          x = x - .true.*5.0 ! { dg-error "Operands of binary numeric" }
-+          if (abs(x - 5.7).gt.0.00001) stop 3
-+          x = x + t ! { dg-error "Operands of binary numeric" }
-+          if (abs(x - 6.7).gt.0.00001) stop 4
-+          x = x + f ! { dg-error "Operands of binary numeric" }
-+          if (abs(x - 6.7).gt.0.00001) stop 5
-+          x = x - t ! { dg-error "Operands of binary numeric" }
-+          if (abs(x - 5.7).gt.0.00001) stop 6
-+          x = x - f ! { dg-error "Operands of binary numeric" }
-+          if (abs(x - 5.7).gt.0.00001) stop 7
-+          x = x**.true. ! { dg-error "Operands of binary numeric" }
-+          if (abs(x - 5.7).gt.0.00001) stop 8
-+          x = x**.false. ! { dg-error "Operands of binary numeric" }
-+          if (abs(x - 1.0).gt.0.00001) stop 9
-+          x = x/t ! { dg-error "Operands of binary numeric" }
-+          if (abs(x - 1.0).gt.0.00001) stop 10
-+          if ((x/.false.).le.huge(x)) stop 11 ! { dg-error "Operands of binary numeric" }
-+        end
--- 
-2.27.0
-
diff --git a/gcc12-pr107468.patch b/gcc12-pr107468.patch
deleted file mode 100644
index 0949b11..0000000
--- a/gcc12-pr107468.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-libstdc++: Update from latest fast_float [PR107468]
-
-The following patch is a cherry-pick from
-https://github.com/fastfloat/fast_float/pull/153
-to restrict fast_float Clinger's fast path to when rounding mode
-is FE_TONEAREST.
-Using std::fegetround showed in benchmarks too slow, so instead
-it uses a check with 2 float additions and comparison to verify
-if rounding is FE_TONEAREST.
-
-2022-11-20  Jakub Jelinek  <jakub@redhat.com>
-
-	PR libstdc++/107468
-	* src/c++17/fast_float/fast_float.h (detail::rounds_to_nearest): New
-	function, taken from https://github.com/fastfloat/fast_float/pull/153.
-	(from_chars_advanced): Only use Clinger's fast path if
-	detail::rounds_to_nearest().
-	* testsuite/20_util/from_chars/pr107468.cc: New test.
-
---- libstdc++-v3/src/c++17/fast_float/fast_float.h.jj	2022-04-28 15:56:18.315632888 +0200
-+++ libstdc++-v3/src/c++17/fast_float/fast_float.h	2022-11-20 18:53:49.570830249 +0100
-@@ -2842,6 +2842,48 @@ from_chars_result parse_infnan(const cha
-   return answer;
- }
- 
-+/**
-+ * Returns true if the floating-pointing rounding mode is to 'nearest'.
-+ * It is the default on most system. This function is meant to be inexpensive.
-+ * Credit : @mwalcott3
-+ */
-+fastfloat_really_inline bool rounds_to_nearest() noexcept {
-+  // See
-+  // A fast function to check your floating-point rounding mode
-+  // https://lemire.me/blog/2022/11/16/a-fast-function-to-check-your-floating-point-rounding-mode/
-+  //
-+  // This function is meant to be equivalent to :
-+  // prior: #include <cfenv>
-+  //  return fegetround() == FE_TONEAREST;
-+  // However, it is expected to be much faster than the fegetround()
-+  // function call.
-+  //
-+  // The volatile keywoard prevents the compiler from computing the function
-+  // at compile-time.
-+  // There might be other ways to prevent compile-time optimizations (e.g., asm).
-+  // The value does not need to be std::numeric_limits<float>::min(), any small
-+  // value so that 1 + x should round to 1 would do (after accounting for excess
-+  // precision, as in 387 instructions).
-+  static volatile float fmin = std::numeric_limits<float>::min();
-+  float fmini = fmin; // we copy it so that it gets loaded at most once.
-+  //
-+  // Explanation:
-+  // Only when fegetround() == FE_TONEAREST do we have that
-+  // fmin + 1.0f == 1.0f - fmin.
-+  //
-+  // FE_UPWARD:
-+  //  fmin + 1.0f > 1
-+  //  1.0f - fmin == 1
-+  //
-+  // FE_DOWNWARD or  FE_TOWARDZERO:
-+  //  fmin + 1.0f == 1
-+  //  1.0f - fmin < 1
-+  //
-+  // Note: This may fail to be accurate if fast-math has been
-+  // enabled, as rounding conventions may not apply.
-+  return (fmini + 1.0f == 1.0f - fmini);
-+}
-+
- } // namespace detail
- 
- template<typename T>
-@@ -2870,7 +2912,7 @@ from_chars_result from_chars_advanced(co
-   answer.ec = std::errc(); // be optimistic
-   answer.ptr = pns.lastmatch;
-   // Next is Clinger's fast path.
--  if (binary_format<T>::min_exponent_fast_path() <= pns.exponent && pns.exponent <= binary_format<T>::max_exponent_fast_path() && pns.mantissa <=binary_format<T>::max_mantissa_fast_path() && !pns.too_many_digits) {
-+  if (binary_format<T>::min_exponent_fast_path() <= pns.exponent && pns.exponent <= binary_format<T>::max_exponent_fast_path() && pns.mantissa <=binary_format<T>::max_mantissa_fast_path() && !pns.too_many_digits && detail::rounds_to_nearest()) {
-     value = T(pns.mantissa);
-     if (pns.exponent < 0) { value = value / binary_format<T>::exact_power_of_ten(-pns.exponent); }
-     else { value = value * binary_format<T>::exact_power_of_ten(pns.exponent); }
---- libstdc++-v3/testsuite/20_util/from_chars/pr107468.cc.jj
-+++ libstdc++-v3/testsuite/20_util/from_chars/pr107468.cc
-@@ -0,0 +1,42 @@
-+// Copyright (C) 2022 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library.  This library is free
-+// software; you can redistribute it and/or modify it under the
-+// terms of the GNU General Public License as published by the
-+// Free Software Foundation; either version 3, or (at your option)
-+// any later version.
-+
-+// This library is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING3.  If not see
-+// <http://www.gnu.org/licenses/>.
-+
-+// { dg-do run { target c++17 } }
-+// { dg-add-options ieee }
-+
-+#include <charconv>
-+#include <string>
-+#include <cfenv>
-+#include <testsuite_hooks.h>
-+
-+int
-+main()
-+{
-+  // FP from_char not available otherwise.
-+#if __cpp_lib_to_chars >= 201611L \
-+    && _GLIBCXX_USE_C99_FENV_TR1 \
-+    && defined(FE_DOWNWARD) \
-+    && defined(_GLIBCXX_FLOAT_IS_IEEE_BINARY32)
-+  // PR libstdc++/107468
-+  float f;
-+  char buf[] = "3.355447e+07";
-+  std::fesetround(FE_DOWNWARD);
-+  auto [ptr, ec] = std::from_chars(buf, buf + sizeof(buf) - 1, f, std::chars_format::scientific);
-+  VERIFY( ec == std::errc() && ptr == buf + sizeof(buf) - 1 );
-+  VERIFY( f == 33554472.0f );
-+#endif
-+}
diff --git a/gcc12-rh1574936.patch b/gcc12-rh1574936.patch
deleted file mode 100644
index 6b4be0c..0000000
--- a/gcc12-rh1574936.patch
+++ /dev/null
@@ -1,30 +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>
-
-	* 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
-@@ -246,6 +246,7 @@ LIBGCC2_DEBUG_CFLAGS = -g
- 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.
-@@ -301,6 +302,7 @@ CRTSTUFF_CFLAGS = -O2 $(GCC_CFLAGS) $(IN
-   $(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) $(USE_TM_CLONE_REGISTRY)
- 
- # Extra flags to use when compiling crt{begin,end}.o.
diff --git a/gcc12-Wno-format-security.patch b/gcc16-Wno-format-security.patch
similarity index 57%
rename from gcc12-Wno-format-security.patch
rename to gcc16-Wno-format-security.patch
index 43e482a..2a4f0f3 100644
--- a/gcc12-Wno-format-security.patch
+++ b/gcc16-Wno-format-security.patch
@@ -9,15 +9,15 @@
 	* 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
-@@ -570,7 +570,7 @@ AC_ARG_ENABLE(build-format-warnings,
++++ 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-narrowing -Wwrite-strings ],
+ 	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
@@ -30,29 +30,37 @@
  else
    wf_opt=
  fi
---- Makefile.tpl.jj	2021-12-30 15:12:42.188164847 +0100
-+++ Makefile.tpl	2022-01-07 12:06:12.115550714 +0100
-@@ -447,8 +447,8 @@ LDFLAGS = @LDFLAGS@
+--- 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)
--GDCFLAGS = $(CFLAGS)
+-A68FLAGS = @A68FLAGS@
+-GDCFLAGS = @GDCFLAGS@
+-GM2FLAGS = $(CFLAGS)
 +GOCFLAGS = $(filter-out -Wformat-security,$(CFLAGS))
-+GDCFLAGS = $(filter-out -Wformat-security,$(CFLAGS))
++A68FLAGS = $(filter-out -Wformat-security,@A68FLAGS@)
++GDCFLAGS = $(filter-out -Wformat-security,@GDCFLAGS@)
++GM2FLAGS = $(filter-out -Wformat-security,$(CFLAGS))
  
- # Pass additional PGO and LTO compiler options to the PGO build.
- BUILD_CFLAGS = $(PGO_BUILD_CFLAGS) $(PGO_BUILD_LTO_CFLAGS)
---- Makefile.in.jj	2021-12-30 15:12:42.188164847 +0100
-+++ Makefile.in	2022-01-07 12:06:27.335334561 +0100
-@@ -444,8 +444,8 @@ LDFLAGS = @LDFLAGS@
+ 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)
--GDCFLAGS = $(CFLAGS)
+-A68FLAGS = @A68FLAGS@
+-GDCFLAGS = @GDCFLAGS@
+-GM2FLAGS = $(CFLAGS)
 +GOCFLAGS = $(filter-out -Wformat-security,$(CFLAGS))
-+GDCFLAGS = $(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@
  
- # Pass additional PGO and LTO compiler options to the PGO build.
- BUILD_CFLAGS = $(PGO_BUILD_CFLAGS) $(PGO_BUILD_LTO_CFLAGS)
diff --git a/gcc12-d-shared-libphobos.patch b/gcc16-d-shared-libphobos.patch
similarity index 100%
rename from gcc12-d-shared-libphobos.patch
rename to gcc16-d-shared-libphobos.patch
diff --git a/gcc12-fortran-fdec-duplicates.patch b/gcc16-fortran-fdec-duplicates.patch
similarity index 100%
rename from gcc12-fortran-fdec-duplicates.patch
rename to gcc16-fortran-fdec-duplicates.patch
diff --git a/gcc12-hack.patch b/gcc16-hack.patch
similarity index 56%
rename from gcc12-hack.patch
rename to gcc16-hack.patch
index e98649e..61331bf 100644
--- a/gcc12-hack.patch
+++ b/gcc16-hack.patch
@@ -64,63 +64,119 @@
 +				infodir="$(infodir)" \
  				GOCFLAGS="$(GOCFLAGS) $${flags}" \
  				GDCFLAGS="$(GDCFLAGS) $${flags}" \
- 				CXXFLAGS="$(CXXFLAGS) $${flags}" \
+ 				A68FLAGS="$(A68FLAGS) $${flags}" \
 --- libcpp/macro.cc.jj	2019-01-09 13:01:21.420552123 +0100
-+++ libcpp/macro.cc	2019-01-11 18:18:17.736876285 +0100
-@@ -3256,8 +3256,6 @@ static cpp_macro *
++++ libcpp/macro.cc	2024-11-30 13:16:41.163056391 +0100
+@@ -3680,8 +3680,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;
-@@ -3382,7 +3380,9 @@ create_iso_definition (cpp_reader *pfile
+@@ -3809,7 +3807,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 ())
-@@ -3397,7 +3397,9 @@ create_iso_definition (cpp_reader *pfile
+@@ -3824,7 +3824,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	2019-01-11 18:16:23.444726882 +0100
-@@ -803,16 +803,17 @@ cpp_classify_number (cpp_reader *pfile,
++++ libcpp/expr.cc	2024-11-30 13:14:52.468583689 +0100
+@@ -874,50 +874,54 @@ 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);
-+				   0, CPP_OPTION (pfile, cplusplus)
-+				      ? N_("use of C++11 long long integer constant")
-+				      : N_("use of C99 long long integer constant"));
++            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"));
            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/gcc12-isl-dl.patch b/gcc16-isl-dl.patch
similarity index 98%
rename from gcc12-isl-dl.patch
rename to gcc16-isl-dl.patch
index 824288b..dc0c49b 100644
--- a/gcc12-isl-dl.patch
+++ b/gcc16-isl-dl.patch
@@ -629,7 +629,7 @@
 --- gcc/graphite.cc.jj	2015-11-04 14:15:32.000000000 +0100
 +++ gcc/graphite.cc	2015-11-04 14:56:02.645536409 +0100
 @@ -60,6 +60,35 @@ along with GCC; see the file COPYING3.
- #include "tree-into-ssa.h"
+ #include "tree-ssa-propagate.h"
  #include "graphite.h"
  
 +__typeof (isl_pointers__) isl_pointers__;
@@ -664,7 +664,7 @@
  /* Print global statistics to FILE.  */
  
  static void
-@@ -365,6 +394,15 @@ graphite_transform_loops (void)
+@@ -424,6 +453,15 @@ graphite_transform_loops (void)
    if (parallelized_function_p (cfun->decl))
      return;
  
@@ -680,7 +680,7 @@
    calculate_dominance_info (CDI_DOMINATORS);
  
    /* We rely on post-dominators during merging of SESE regions so those
-@@ -455,6 +493,14 @@ graphite_transform_loops (void)
+@@ -519,6 +557,14 @@ graphite_transform_loops (void)
      }
  }
  
@@ -696,16 +696,16 @@
  
  static void
 --- gcc/toplev.cc.jj	2017-02-19 13:02:31.000000000 +0100
-+++ gcc/toplev.cc	2017-02-19 16:50:25.536301350 +0100
-@@ -94,6 +94,7 @@ along with GCC; see the file COPYING3.
++++ gcc/toplev.cc	2024-11-30 13:22:34.175096117 +0100
+@@ -100,6 +100,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);
-@@ -683,7 +684,7 @@ print_version (FILE *file, const char *i
+ static void general_init (const char *, bool, unique_argv original_argv);
+@@ -652,7 +653,7 @@ print_version (FILE *file, const char *i
  #ifndef HAVE_isl
  	   "none"
  #else
diff --git a/gcc12-isl-dl2.patch b/gcc16-isl-dl2.patch
similarity index 89%
rename from gcc12-isl-dl2.patch
rename to gcc16-isl-dl2.patch
index 2e12499..8d2c4d9 100644
--- a/gcc12-isl-dl2.patch
+++ b/gcc16-isl-dl2.patch
@@ -6,8 +6,8 @@
 	directory.
 
 --- gcc/toplev.cc.jj	2008-12-09 23:59:10.000000000 +0100
-+++ gcc/toplev.cc	2009-01-27 14:33:52.000000000 +0100
-@@ -113,6 +113,8 @@ static void finalize (bool);
++++ 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);
  
@@ -16,14 +16,14 @@
  /* Decoded options, and number of such options.  */
  struct cl_decoded_option *save_decoded_options;
  unsigned int save_decoded_options_count;
-@@ -2239,6 +2241,8 @@ toplev::main (int argc, char **argv)
+@@ -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);
+   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
diff --git a/gcc12-libgomp-omp_h-multilib.patch b/gcc16-libgomp-omp_h-multilib.patch
similarity index 100%
rename from gcc12-libgomp-omp_h-multilib.patch
rename to gcc16-libgomp-omp_h-multilib.patch
diff --git a/gcc12-libstdc++-docs.patch b/gcc16-libstdc++-docs.patch
similarity index 74%
rename from gcc12-libstdc++-docs.patch
rename to gcc16-libstdc++-docs.patch
index b6c2d50..7d2d357 100644
--- a/gcc12-libstdc++-docs.patch
+++ b/gcc16-libstdc++-docs.patch
@@ -4,21 +4,21 @@
        <a class="link" href="https://www.fsf.org" target="_top">FSF
        </a>
      </p><p>
-+      Release 12.2.1
++      Release 16.0.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	2011-01-04 18:12:01.672757784 +0100
++++ libstdc++-v3/doc/html/api.html	2024-11-30 13:30:16.607594623 +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 12.2.1 release</a>,
++  <a class="link" href="api/index.html" target="_top">for the 16.0.1 release</a>,
 +  online
-   <a class="link" href="http://gcc.gnu.org/onlinedocs/" target="_top">for each GCC release</a>
+   <a class="link" href="https://gcc.gnu.org/onlinedocs/" target="_top">for each GCC release</a>
    and
-   <a class="link" href="http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/index.html" target="_top">
+   <a class="link" href="https://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/index.html" target="_top">
diff --git a/gcc12-libtool-no-rpath.patch b/gcc16-libtool-no-rpath.patch
similarity index 87%
rename from gcc12-libtool-no-rpath.patch
rename to gcc16-libtool-no-rpath.patch
index 466c661..8429a4c 100644
--- a/gcc12-libtool-no-rpath.patch
+++ b/gcc16-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) continue;; esac
++	    case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64|/usr/lib/../lib64/lp64d) 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) continue;; esac
++	case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64|/usr/lib/../lib64/lp64d) 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) continue;; esac
++	case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64|/usr/lib/../lib64/lp64d) 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/gcc12-no-add-needed.patch b/gcc16-no-add-needed.patch
similarity index 96%
rename from gcc12-no-add-needed.patch
rename to gcc16-no-add-needed.patch
index 5817299..74f5c1f 100644
--- a/gcc12-no-add-needed.patch
+++ b/gcc16-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/gcc16-pr119006.patch b/gcc16-pr119006.patch
new file mode 100644
index 0000000..dfbdaa9
--- /dev/null
+++ b/gcc16-pr119006.patch
@@ -0,0 +1,76 @@
+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
new file mode 100644
index 0000000..987f6e0
--- /dev/null
+++ b/gcc16-pr123273.patch
@@ -0,0 +1,54 @@
+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
new file mode 100644
index 0000000..bcc7000
--- /dev/null
+++ b/gcc16-rh1574936.patch
@@ -0,0 +1,21 @@
+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/gcc12-sparc-config-detection.patch b/gcc16-sparc-config-detection.patch
similarity index 77%
rename from gcc12-sparc-config-detection.patch
rename to gcc16-sparc-config-detection.patch
index bb06b35..bbe8ec3 100644
--- a/gcc12-sparc-config-detection.patch
+++ b/gcc16-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
-@@ -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"
+@@ -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"
  	tmake_file="${tmake_file} sparc/t-sparc sparc/t-rtems"
  	;;
 -sparc-*-linux*)
 +sparc-*-linux* | sparcv9-*-linux*)
- 	tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/tso.h"
+ 	tm_file="${tm_file} 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
-@@ -2844,7 +2844,7 @@ sparc64-*-rtems*)
+@@ -3384,7 +3384,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} dbxelf.h 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} 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
new file mode 100644
index 0000000..092bddb
--- /dev/null
+++ b/isl-rh2155127.patch
@@ -0,0 +1,85 @@
+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/plans/ci.fmf b/plans/ci.fmf
index 85710d6..b661134 100644
--- a/plans/ci.fmf
+++ b/plans/ci.fmf
@@ -1,6 +1,13 @@
 summary: CI Gating Plan
 discover:
     how: fmf
-    directory: tests
+    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
new file mode 100755
index 0000000..f26a5ab
--- /dev/null
+++ b/plans/provide_secondary_arch_rpms.sh
@@ -0,0 +1,64 @@
+#!/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
new file mode 100644
index 0000000..f31bc02
--- /dev/null
+++ b/rpminspect.yaml
@@ -0,0 +1,37 @@
+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 4f41efa..f1dba4c 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (gcc-12.2.1-20221121.tar.xz) = 6fef1438e77d8b7e7aeddea6d2d6a82c37d2e93f65ad9007f04206e1a368dd70597cef01188de4ee9bbfe1811a129303ce10b49cb9758a2b44abe4f0312d073a
+SHA512 (gcc-16.0.1-20260115.tar.xz) = 51ab079dedde5547caba601ce03954d4c5b2bf687538f106d3e851a8918162017fe65817d9e22fd115cf4d4f970bfba6a70a34db183141ce28c5c203a68eec0b
 SHA512 (isl-0.24.tar.bz2) = aab3bddbda96b801d0f56d2869f943157aad52a6f6e6a61745edd740234c635c38231af20bc3f1a08d416a5e973a90e18249078ed8e4ae2f1d5de57658738e95
-SHA512 (newlib-cygwin-a8526cb52bedabd4d6ba4b227a5185627f871aa1.tar.xz) = b099246fe4a5d0a372cdaee5da49083df5b2f4440a4e83961600cdf22d37da50c99ce9ae46b769f188a67034ee038cf863260988fc9d594e8e5fb3905a381dec
-SHA512 (nvptx-tools-472b6e78b3ba918d727698f79911360b7c808247.tar.xz) = 91690321bf96460c3b3e229199a6f752ed1c27c6933d4345dc7e237dc068f604ad211bb3a0373e14d4f332bee05b6227d6933e14e0b475ffdfea8b511ab735e6
+SHA512 (newlib-cygwin-d35cc82b5ec15bb8a5fe0fe11e183d1887992e99.tar.xz) = ef9495745a96d1d76f9f425c4a48c807fface36a1aa92351c5d024103678d144d046e8de55d195103784472c14874e29e4b9284d5d6a2e7bb27fd98c8455a881
+SHA512 (nvptx-tools-a0c1fff6534a4df9fb17937c3c4a4b1071212029.tar.xz) = 7f862986065028df70c843fc3f2c89e200a76b48ad0bd51c749ac8a5aab7be0ebdf35be182fad2407b3281615e75be1ac6833ab6a5130ae9920169a0412f94f0
diff --git a/tests/Regression/394271-gcc-optimization-error-for-neg-number-abs/abs.c b/tests/Regression/394271-gcc-optimization-error-for-neg-number-abs/abs.c
deleted file mode 100644
index 801bda0..0000000
--- a/tests/Regression/394271-gcc-optimization-error-for-neg-number-abs/abs.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main ()
-{
-  int i = 2;
-  if (-10 * abs (i - 1) == 10 * abs (i - 1))
-    return 1;
-
-  return 0;
-}
diff --git a/tests/Regression/394271-gcc-optimization-error-for-neg-number-abs/main.fmf b/tests/Regression/394271-gcc-optimization-error-for-neg-number-abs/main.fmf
deleted file mode 100644
index f31d44e..0000000
--- a/tests/Regression/394271-gcc-optimization-error-for-neg-number-abs/main.fmf
+++ /dev/null
@@ -1,26 +0,0 @@
-summary: gcc optimization error for neg number * abs() [extract_muldiv]
-description: |
-    abs() from gcc was broken so it gave wrong results.
-contact: mcermak@redhat.com
-component:
-  - gcc
-test: ./runtest.sh
-path: /tests/Regression/394271-gcc-optimization-error-for-neg-number-abs
-framework: beakerlib
-require:
-  - gcc
-duration: 5m
-enabled: true
-tier: '1'
-link:
-  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=394271
-tag:
-  - CI-Tier-1
-  - DTS8-INTEROP-CI
-  - DTS9-INTEROP-CI
-  - Tier1
-  - dts_smoke
-  - dts_stable
-extra-nitrate: TC#0062143
-extra-summary: /tools/gcc/Regression/gcc/394271-gcc-optimization-error-for-neg-number-abs
-extra-task: /tools/gcc/Regression/gcc/394271-gcc-optimization-error-for-neg-number-abs
diff --git a/tests/Regression/394271-gcc-optimization-error-for-neg-number-abs/runtest.sh b/tests/Regression/394271-gcc-optimization-error-for-neg-number-abs/runtest.sh
deleted file mode 100755
index 695c9fc..0000000
--- a/tests/Regression/394271-gcc-optimization-error-for-neg-number-abs/runtest.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2008, 2012 Red Hat, Inc. All rights reserved.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# 
-# Author: Michal Nowak <mnowak@redhat.com>
-#	  Marek Polacek <polacek@redhat.com>
-
-# Include rhts environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-GCC="${GCC:-$(type -P gcc)}"
-PACKAGE=$(rpm --qf '%{name}' -qf $GCC)
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm $PACKAGE
-        rlRun "TmpDir=\`mktemp -d\`"
-        rlRun "cp -v abs.c $TmpDir"
-        rlRun "pushd $TmpDir"
-        gcc -dumpversion | grep -q '^4\.4' && export OLDGCC="true"
-    rlPhaseEnd
-
-    rlPhaseStartTest "Testing the executable"
-    OPTS="-O0 -O1 -O2 -O3 -Os -Ofast -Og"
-    if [ "$OLDGCC" = "true" ]; then
-        OPTS=${OPTS/ -Ofast -Og/}
-    fi
-    for opt in "" $OPTS; do
-        rlRun "$GCC -g $opt -o abs$opt abs.c" 0 "Compiling the test case [ $opt ]"
-        rlRun "./abs$opt" 0 "Checking whether we have an working executable [ $opt ]"
-    done
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Regression/462397-unzip-problem-with-CRC-error-for-src-4.1.0.zip-file/main.fmf b/tests/Regression/462397-unzip-problem-with-CRC-error-for-src-4.1.0.zip-file/main.fmf
deleted file mode 100644
index 35ff67d..0000000
--- a/tests/Regression/462397-unzip-problem-with-CRC-error-for-src-4.1.0.zip-file/main.fmf
+++ /dev/null
@@ -1,29 +0,0 @@
-summary: unzip problem with CRC error for src-4.1.0.zip file on s390x
-description: |
-    A customer has been trying to unzip the file src-4.1.0.zip
-    which is contained libgcj4-src-4.1.0-18.EL4.s390x.rpm. However,
-    unzip command can't run correctly with the CRC errors
-    It seems that the src-4.1.0.zip is broken.
-contact: mcermak@redhat.com
-component:
-  - gcc
-test: ./runtest.sh
-framework: beakerlib
-require:
-  - gcc
-  - libgcj-src
-duration: 5m
-enabled: true
-tag:
-  - CI-Tier-1
-  - Tier1
-tier: '1'
-link:
-  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=462397
-adjust:
-  - enabled: false
-    when: distro != rhel-5 and distro != rhel-6
-    continue: false
-extra-nitrate: TC#0147365
-extra-summary: /tools/gcc/Sanity/462397-unzip-problem-with-CRC-error-for-src-4.1.0.zip-file
-extra-task: /tools/gcc/Sanity/462397-unzip-problem-with-CRC-error-for-src-4.1.0.zip-file
diff --git a/tests/Regression/462397-unzip-problem-with-CRC-error-for-src-4.1.0.zip-file/runtest.sh b/tests/Regression/462397-unzip-problem-with-CRC-error-for-src-4.1.0.zip-file/runtest.sh
deleted file mode 100755
index 62d03df..0000000
--- a/tests/Regression/462397-unzip-problem-with-CRC-error-for-src-4.1.0.zip-file/runtest.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2008, 2012 Red Hat, Inc. All rights reserved.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# 
-# Author: Michal Nowak <mnowak@redhat.com>
-#         Marek Polacek <polacek@redhat.com>
-
-# Include rhts environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGES=(gcc libgcj-src)
-
-rlJournalStart
-    rlPhaseStartSetup
-        for p in "${PACKAGES[@]}"; do
-            rlAssertRpm "$p"
-        done; unset p
-        rlRun "TmpDir=\`mktemp -d\`"
-        rlRun "pushd $TmpDir"
-    rlPhaseEnd
-
-srclist="/usr/share/java/src-*"
-for src in ${srclist}; do
-
-    rlPhaseStartTest "Try to unzip src file"
-        rm -rf tmp/; mkdir tmp/
-        rlRun "cp -fv ${src} tmp/" 0 "[${src}]: Copy the zip file to tmp/"
-        cd tmp/
-        rlRun "unzip ${src}" 0 "[${src}] Verify that is possible to unzip ${src}"
-        cd ..
-    rlPhaseEnd
-
-done
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Regression/465974-DW_TAG_common_block-has-incorrect-placement-scope/abc.f90 b/tests/Regression/465974-DW_TAG_common_block-has-incorrect-placement-scope/abc.f90
deleted file mode 100644
index c9af75f..0000000
--- a/tests/Regression/465974-DW_TAG_common_block-has-incorrect-placement-scope/abc.f90
+++ /dev/null
@@ -1,22 +0,0 @@
-      subroutine a
-      INTEGER*4 a_i
-      common /block/a_i
-      a_i = 1
-      end subroutine a
-      subroutine b
-      INTEGER*4 b_i
-      common /block/b_i
-      a_i = 3
-      b_i = 2
-      end subroutine b
-      subroutine c
-      INTEGER*4 a_i
-      common /block/a_i
-      if (a_i .ne. 2) call abort
-      end subroutine c
-      program abc
-      call a
-      call b
-      call c
-      end program abc
-
diff --git a/tests/Regression/465974-DW_TAG_common_block-has-incorrect-placement-scope/main.fmf b/tests/Regression/465974-DW_TAG_common_block-has-incorrect-placement-scope/main.fmf
deleted file mode 100644
index 752caf6..0000000
--- a/tests/Regression/465974-DW_TAG_common_block-has-incorrect-placement-scope/main.fmf
+++ /dev/null
@@ -1,38 +0,0 @@
-summary: Fortran DW_TAG_common_block has incorrect placement/scope
-description: |+
-    Problem: gcc-4.3.2 / gfortran-4.3.2 (in the forthcoming tech-preview for
-    RHEL5.3) appears to also have the "DW_TAG_common_block has incorrect
-    placement/scope" issues listed in the following gcc upstream bug:
-
-    http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37738
-
-    What gfortran is doing currently is:
-
-    (1) Merges all common blocks into a single one.
-    (2) Places this single common block into the first subroutine where it was
-    used.
-
-contact: mcermak@redhat.com
-component:
-  - gcc
-test: ./runtest.sh
-path: /tests/Regression/465974-DW_TAG_common_block-has-incorrect-placement-scope
-framework: beakerlib
-require:
-  - gcc
-  - gcc-gfortran
-duration: 5m
-tier: '1'
-enabled: true
-link:
-  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=465974
-tag:
-  - CI-Tier-1
-  - DTS8-INTEROP-CI
-  - DTS9-INTEROP-CI
-  - Tier1
-  - dts_smoke
-  - dts_stable
-extra-nitrate: TC#0062268
-extra-summary: /tools/gcc/g77/465974-DW_TAG_common_block-has-incorrect-placement-scope
-extra-task: /tools/gcc/g77/465974-DW_TAG_common_block-has-incorrect-placement-scope
diff --git a/tests/Regression/465974-DW_TAG_common_block-has-incorrect-placement-scope/runtest.sh b/tests/Regression/465974-DW_TAG_common_block-has-incorrect-placement-scope/runtest.sh
deleted file mode 100755
index 741279d..0000000
--- a/tests/Regression/465974-DW_TAG_common_block-has-incorrect-placement-scope/runtest.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2008, 2012 Red Hat, Inc. All rights reserved.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# 
-# Author: Michal Nowak <mnowak@redhat.com>
-#         Marek Polacek <polacek@redhat.com>
-
-# Include rhts environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGES=(gcc gcc-gfortran) 
-
-GFORTRAN=${GFORTRAN:-gfortran}
-
-rlJournalStart
-    rlPhaseStartSetup
-        if type gcc | grep -q -v toolset; then
-            # assert only of not devtoolset/gcc-toolset
-            for p in "${PACKAGES[@]}"; do
-                rlAssertRpm "$p"
-            done; unset p
-        fi
-        rlRun "TmpDir=\`mktemp -d\`"
-        rlRun "cp -v abc.f90 $TmpDir"
-        rlRun "pushd $TmpDir"
-    rlPhaseEnd
-
-    rlPhaseStartTest "Testing the executable via readelf -w"
-        # Compile
-        rlRun "$GFORTRAN -g -o abc abc.f90" 0 "Compiling the test case: abc.f90"
-        rlRun "./abc" 0 "Checking whether we have an working executable"
-        rlWatchdog "readelf -w abc 2>&1 | tee gcc-readelf.log" 10
-        rlAssert0 "Checking if 'readelf' ends itself" $?
-        # Test
-        cb=$(grep Abbrev gcc-readelf.log | grep DW_TAG_common_block -c)
-        rlRun "if [ ${cb} -eq 3 ]; then true; else false; fi" 0 "Expected amount of common blocks is 3; got ${cb}"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Regression/515799-RHEL5-gcc-if-more-than-one-fno-builtin/builtin.c b/tests/Regression/515799-RHEL5-gcc-if-more-than-one-fno-builtin/builtin.c
deleted file mode 100644
index 64449ae..0000000
--- a/tests/Regression/515799-RHEL5-gcc-if-more-than-one-fno-builtin/builtin.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <stdio.h>
-
-/* Compile flags:
- *   gcc -fno-builtin-isascii -fno-builtin-isalnum -o builtin builtin.c
- *
- * Expected output:
- *   Using custom isascii() function
- *   ret = 0
- *
- * Expected return value:
- *   0
- */
-
-int isascii(int c)
-{
-        printf("Using custom isascii() function\n");
-        return 0;
-}
-
-main()
-{
-        int c = 65;
-        int ret;
-
-        ret = isascii(c);
-        printf("ret = %d\n", ret);
-
-        return ret;
-}
diff --git a/tests/Regression/515799-RHEL5-gcc-if-more-than-one-fno-builtin/main.fmf b/tests/Regression/515799-RHEL5-gcc-if-more-than-one-fno-builtin/main.fmf
deleted file mode 100644
index 080f24f..0000000
--- a/tests/Regression/515799-RHEL5-gcc-if-more-than-one-fno-builtin/main.fmf
+++ /dev/null
@@ -1,33 +0,0 @@
-summary: 'Test for bz515799 ([RHEL5] gcc: if more than one -fno-builtin-*)'
-description: |
-    Bug summary: [RHEL5] gcc: if more than one -fno-builtin-* options are specified, only the last one is effective
-    Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=515799
-
-    This test compiles builtin.c with the flags '-fno-builtin-isascii 
-    -fno-builtin-isalnum'.  This program contains a custom isascii() function
-    that always returns 0.  If gcc honors the -fno-builtin-isascii flag, it
-    will return 0.  If not, it will use the built-in isascii() function which
-    will return 1.
-contact: mcermak@redhat.com
-component:
-  - gcc
-test: ./runtest.sh
-path: /tests/Regression/515799-RHEL5-gcc-if-more-than-one-fno-builtin
-framework: beakerlib
-require:
-  - gcc
-duration: 5m
-enabled: true
-tier: '1'
-link:
-  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=515799
-tag:
-  - CI-Tier-1
-  - DTS8-INTEROP-CI
-  - DTS9-INTEROP-CI
-  - Tier1
-  - dts_smoke
-  - dts_stable
-extra-nitrate: TC#0063259
-extra-summary: /tools/gcc/Regression/gcc/515799-RHEL5-gcc-if-more-than-one-fno-builtin
-extra-task: /tools/gcc/Regression/gcc/515799-RHEL5-gcc-if-more-than-one-fno-builtin
diff --git a/tests/Regression/515799-RHEL5-gcc-if-more-than-one-fno-builtin/runtest.sh b/tests/Regression/515799-RHEL5-gcc-if-more-than-one-fno-builtin/runtest.sh
deleted file mode 100755
index 8b38afd..0000000
--- a/tests/Regression/515799-RHEL5-gcc-if-more-than-one-fno-builtin/runtest.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/rhts-library/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/gcc/Regression/gcc/515799-RHEL5-gcc-if-more-than-one-fno-builtin
-#   Description: Test for bz515799 ([RHEL5] gcc: if more than one -fno-builtin-*)
-#   Author: Jeffrey Bastian <jbastian@redhat.com>
-#           Marek Polacek <polacek@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2009, 2012 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include rhts environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGES=(gcc)
-
-GCC=${GCC:-gcc}
-
-rlJournalStart
-    rlPhaseStartSetup
-        for p in "${PACKAGES[@]}"; do
-            rlAssertRpm "$p"
-        done; unset p
-        rlRun "TmpDir=\`mktemp -d\`"
-        rlRun "cp -v builtin.c $TmpDir"
-        rlRun "pushd $TmpDir"
-    rlPhaseEnd
-
-    rlPhaseStartTest 
-        rlRun "$GCC -fno-builtin-isascii -fno-builtin-isalnum -o builtin builtin.c"
-        rlAssertExists "builtin"
-        rlRun "./builtin"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Regression/537941-libltdl-may-load-library-in-current-directory/foo.java b/tests/Regression/537941-libltdl-may-load-library-in-current-directory/foo.java
deleted file mode 100644
index bc72835..0000000
--- a/tests/Regression/537941-libltdl-may-load-library-in-current-directory/foo.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public class foo {
-	public static void main(String[] args) {
-		System.loadLibrary("foolib");
-	}
-} 
diff --git a/tests/Regression/537941-libltdl-may-load-library-in-current-directory/main.fmf b/tests/Regression/537941-libltdl-may-load-library-in-current-directory/main.fmf
deleted file mode 100644
index b121552..0000000
--- a/tests/Regression/537941-libltdl-may-load-library-in-current-directory/main.fmf
+++ /dev/null
@@ -1,39 +0,0 @@
-summary: 'CVE-2009-3736 libtool: libltdl may load and execute code from a library
-    in the current directory'
-description: |
-    cat > ~/foo.java <\EOF public class foo { public static void main(String[] args) { System.loadLibrary("foolib"); } } EOF 
-    cd 
-    gcj -C foo.java 
-    cd /tmp 
-    strace -f -v -s1024 gij -cp ~/ foo 2>&1 | grep foolib 
-
-    (resp. s/gcj/gcj4/g;s/gij/gij4/ for gcc4 testing). 
-
-    If any relative path is seen, it is wrong. Bad examples are 
-
-    {lib,}foolib.la 
-    {hwcap,0,nosegneg}/{lib,}foolib.{so,la}
-contact: mcermak@redhat.com
-component:
-  - gcc
-test: ./runtest.sh
-framework: beakerlib
-require:
-  - gcc
-  - gcc-java
-  - libgcj
-  - strace
-duration: 5m
-enabled: false
-tag:
-  - CI-Tier-1
-  - Tier1
-tier: '1'
-link:
-  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=537941
-adjust:
-  - enabled: true
-    when: distro == rhel-6 or distro == rhel-5
-extra-nitrate: TC#0062145
-extra-summary: /tools/gcc/Regression/gcj/537941-libltdl-may-load-library-in-current-directory
-extra-task: /tools/gcc/Regression/gcj/537941-libltdl-may-load-library-in-current-directory
diff --git a/tests/Regression/537941-libltdl-may-load-library-in-current-directory/runtest.sh b/tests/Regression/537941-libltdl-may-load-library-in-current-directory/runtest.sh
deleted file mode 100755
index 73e914d..0000000
--- a/tests/Regression/537941-libltdl-may-load-library-in-current-directory/runtest.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2008, 2012 Red Hat, Inc. All rights reserved.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# 
-# Author: Michal Nowak <mnowak@redhat.com>
-#         Marek Polacek <polacek@redhat.com>
-
-# Include rhts environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGES=(gcc libgcj strace gcc-java)
-
-rlJournalStart
-    rlPhaseStartSetup
-        for p in "${PACKAGES[@]}"; do
-            rlAssertRpm "$p"
-        done; unset p
-        rlRun "TmpDir=\`mktemp -d\`"
-        rlRun "cp -v foo.java $TmpDir"
-        rlRun "pushd $TmpDir"
-    rlPhaseEnd
-
-# I weeded out the if (isRHEL 3) support.
-for gj in "" "4"; do
-    gcj_name="/usr/bin/gcj${gj}"
-    gij_name="/usr/bin/gij${gj}"
-    if [ -x ${gcj_name} ] && [ -x ${gij_name} ]; then
-        gcj_basename=$(basename ${gcj_name})
-        gij_basename=$(basename ${gij_name})
-
-            rlPhaseStartTest "[${gij_basename}] Interpreting and compiling via java"
-                rlRun "${gcj_name} -C foo.java" 0 "[${gcj_basename}] Creating bytecode"
-                mv foo.class ~
-                pushd /tmp
-
-                echo "Dry run w/o strace"
-                ${gij_basename} -cp ~/ foo
-
-                echo "=== Dry run end ==="
-                strace -f -v -s1024 ${gij_basename} -cp ~/ foo 2>&1 | tee out.${gij_basename}
-                echo
-                grep foolib out.${gij_basename}
-                foolib_cnt="$(grep foolib out.${gij_basename} -c)"
-                echo
-                rlRun "if [ ${foolib_cnt} -ne 0 ]; then egrep '\"libfoolib.la|\"foolib.la' out.${gij_basename}; else echo \"Zero lines w/ foolib\"; true; fi" 1 "[${gij_basename}] Interpreting test case" # use 'true' (sic!)
-                popd
-                rm -f ~/foo.class
-            rlPhaseEnd
-
-    fi
-done
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Regression/bz1611637-immintrin_h_include_list_does_not_match_release/main.fmf b/tests/Regression/bz1611637-immintrin_h_include_list_does_not_match_release/main.fmf
deleted file mode 100644
index 6a60b30..0000000
--- a/tests/Regression/bz1611637-immintrin_h_include_list_does_not_match_release/main.fmf
+++ /dev/null
@@ -1,32 +0,0 @@
-summary: Test for BZ#1611637 (devtoolset-8-gcc includes avx512vbmi2intrin.h but)
-description: |
-    Bug summary: devtoolset-8-gcc includes avx512vbmi2intrin.h but does not contain it
-    Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1611637
-
-    The list of intrinsic headers keeps changing every release, sometimes
-    even on the release branch, and %files needs to be in sync with what has
-    been changed in gcc/config.gcc. immintrin.h is one of those headers and
-    this test makes sure that we can #include it.
-contact: Vaclav Kadlcik <vkadlcik@redhat.com>
-component:
-  - gcc
-test: ./runtest.sh
-framework: beakerlib
-require:
-  - gcc
-duration: 5m
-enabled: true
-tag:
-  - CI-Tier-1
-link:
-  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1611637
-adjust:
-  - enabled: false
-    when: arch != x86_64
-    continue: false
-  - enabled: false
-    when: distro == rhel-5
-    continue: false
-extra-nitrate: TC#0575308
-extra-summary: /tools/gcc/Regression/bz1611637-immintrin_h_include_list_does_not_match_release
-extra-task: /tools/gcc/Regression/bz1611637-immintrin_h_include_list_does_not_match_release
diff --git a/tests/Regression/bz1611637-immintrin_h_include_list_does_not_match_release/runtest.sh b/tests/Regression/bz1611637-immintrin_h_include_list_does_not_match_release/runtest.sh
deleted file mode 100755
index 8ff645e..0000000
--- a/tests/Regression/bz1611637-immintrin_h_include_list_does_not_match_release/runtest.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/gcc/Regression/bz1611637-immintrin_h_include_list_does_not_match_release
-#   Description: Test for BZ#1611637 (devtoolset-8-gcc includes avx512vbmi2intrin.h but)
-#   Author: Michael Petlan <mpetlan@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2018 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-GCC=${GCC:-gcc}
-
-rlJournalStart
-    rlPhaseStartSetup
-        cat > a.c <<EOF
-#include <immintrin.h>
-int main(void)
-{
-  return 0;
-}
-EOF
-        rlAssertExists "a.c"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "$GCC -o a a.c"
-        rlAssertExists "a"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "rm -f a a.c"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Regression/bz1815504-Regression-in-the-line-information-debug/main.fmf b/tests/Regression/bz1815504-Regression-in-the-line-information-debug/main.fmf
deleted file mode 100644
index 82cdc4e..0000000
--- a/tests/Regression/bz1815504-Regression-in-the-line-information-debug/main.fmf
+++ /dev/null
@@ -1,12 +0,0 @@
-summary: Test for BZ#1815504 (Regression in the line information debug)
-description: |
-    Bug summary: Regression in the line information debug information generated by gcc
-    Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1815504
-recommend:
-- gcc
-- valgrind
-duration: 5m
-link:
--   relates: https://bugzilla.redhat.com/show_bug.cgi?id=1815504
-extra-summary: /tools/gcc/Regression/bz1815504-Regression-in-the-line-information-debug
-extra-task: /tools/gcc/Regression/bz1815504-Regression-in-the-line-information-debug
diff --git a/tests/Regression/bz1815504-Regression-in-the-line-information-debug/runtest.sh b/tests/Regression/bz1815504-Regression-in-the-line-information-debug/runtest.sh
deleted file mode 100755
index 585e76c..0000000
--- a/tests/Regression/bz1815504-Regression-in-the-line-information-debug/runtest.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/gcc/Regression/bz1815504-Regression-in-the-line-information-debug
-#   Description: Test for BZ#1815504 (Regression in the line information debug)
-#   Author: Alexandra Hájková <ahajkova@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2021 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="gcc"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm $PACKAGE
-        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-        rlRun "pushd $TmpDir"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "valgrind -q date &> log" 0
-        rlAssertNotGrep "Can't handle inlined call info entry with line number" log
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Regression/bz1852781-Compiling-with-flto-and-g-removes-CET-support/main.fmf b/tests/Regression/bz1852781-Compiling-with-flto-and-g-removes-CET-support/main.fmf
deleted file mode 100644
index 1c87a12..0000000
--- a/tests/Regression/bz1852781-Compiling-with-flto-and-g-removes-CET-support/main.fmf
+++ /dev/null
@@ -1,17 +0,0 @@
-summary: Test for BZ#1852781 (Compiling with -flto and -g removes CET support)
-description: |
-    Bug summary: Compiling with -flto and -g removes CET support
-    Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1852781
-contact: Alexandra Hájková <ahajkova@redhat.com>
-component:
-- gcc
-test: ./runtest.sh
-framework: beakerlib
-recommend:
-- gcc
-- binutils
-duration: 15m
-link:
--   relates: https://bugzilla.redhat.com/show_bug.cgi?id=1852781
-extra-summary: /tools/gcc/Regression/bz1852781-Compiling-with-flto-and-g-removes-CET-support
-extra-task: /tools/gcc/Regression/bz1852781-Compiling-with-flto-and-g-removes-CET-support
diff --git a/tests/Regression/bz1852781-Compiling-with-flto-and-g-removes-CET-support/runtest.sh b/tests/Regression/bz1852781-Compiling-with-flto-and-g-removes-CET-support/runtest.sh
deleted file mode 100755
index 84cae8f..0000000
--- a/tests/Regression/bz1852781-Compiling-with-flto-and-g-removes-CET-support/runtest.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/gcc/Regression/bz1852781-Compiling-with-flto-and-g-removes-CET-support
-#   Description: Test for BZ#1852781 (Compiling with -flto and -g removes CET support)
-#   Author: Alexandra Hájková <ahajkova@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2020 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="gcc"
-TESTPROG="x"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm $PACKAGE
-        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-        rlRun "cp $TESTPROG.c $TmpDir"
-        rlRun "pushd $TmpDir"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "gcc -flto -c -fcf-protection -g $TESTPROG.c"
-        rlRun "gcc -flto -Wl,-z,cet-report=error -fcf-protection -g $TESTPROG.o &> log"
-        rlAssertNotGrep " missing IBT and SHSTK properties" log
-        rlRun "readelf --wide --notes a.out | grep IBT &> log"
-        rlAsserGrep "IBT, SHSTK" log
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Regression/bz1852781-Compiling-with-flto-and-g-removes-CET-support/x.c b/tests/Regression/bz1852781-Compiling-with-flto-and-g-removes-CET-support/x.c
deleted file mode 100644
index 64fffec..0000000
--- a/tests/Regression/bz1852781-Compiling-with-flto-and-g-removes-CET-support/x.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <stdio.h>
-
-int
-main ()
-{
-  printf ("hello\n");
-  return 0;
-}
diff --git a/tests/Regression/bz1853900-typeinfo-for-std-codecvt-utf8-wchar-t-1114111ul/main.fmf b/tests/Regression/bz1853900-typeinfo-for-std-codecvt-utf8-wchar-t-1114111ul/main.fmf
deleted file mode 100644
index 1540389..0000000
--- a/tests/Regression/bz1853900-typeinfo-for-std-codecvt-utf8-wchar-t-1114111ul/main.fmf
+++ /dev/null
@@ -1,17 +0,0 @@
-summary: Test for BZ#1853900 (typeinfo for stdcodecvt_utf8<wchar_t, 1114111ul,)
-description: |
-    Bug summary: typeinfo for std::codecvt_utf8<wchar_t, 1114111ul, (std::codecvt_mode)0> not found
-    Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1853900
-contact: Alexandra Hájková <ahajkova@redhat.com>
-component:
-- gcc
-test: ./runtest.sh
-framework: beakerlib
-recommend:
-- gcc
-- gcc-c++
-duration: 10m
-link:
--   relates: https://bugzilla.redhat.com/show_bug.cgi?id=1853900
-extra-summary: /tools/gcc/Regression/bz1853900-typeinfo-for-std-codecvt-utf8-wchar-t-1114111ul
-extra-task: /tools/gcc/Regression/bz1853900-typeinfo-for-std-codecvt-utf8-wchar-t-1114111ul
diff --git a/tests/Regression/bz1853900-typeinfo-for-std-codecvt-utf8-wchar-t-1114111ul/runtest.sh b/tests/Regression/bz1853900-typeinfo-for-std-codecvt-utf8-wchar-t-1114111ul/runtest.sh
deleted file mode 100755
index a6eb4ed..0000000
--- a/tests/Regression/bz1853900-typeinfo-for-std-codecvt-utf8-wchar-t-1114111ul/runtest.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/gcc/Regression/bz1853900-typeinfo-for-std-codecvt-utf8-wchar-t-1114111ul
-#   Description: Test for BZ#1853900 (typeinfo for stdcodecvt_utf8<wchar_t, 1114111ul,)
-#   Author: Alexandra Hájková <ahajkova@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2020 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="gcc"
-TESTPROG="test.cc"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm $PACKAGE
-        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-        rlRun "cp $TESTPROG $TmpDir"
-        rlRun "pushd $TmpDir"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "g++ -std=c++17 $TESTPROG &> log"
-        rlAssertNotGrep "hidden symbol " log
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Regression/bz1853900-typeinfo-for-std-codecvt-utf8-wchar-t-1114111ul/test.cc b/tests/Regression/bz1853900-typeinfo-for-std-codecvt-utf8-wchar-t-1114111ul/test.cc
deleted file mode 100644
index 075633f..0000000
--- a/tests/Regression/bz1853900-typeinfo-for-std-codecvt-utf8-wchar-t-1114111ul/test.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <filesystem>
-
-namespace fs = std::filesystem;
-int main() {
-    fs::create_directory("sandbox");
-    fs::remove_all("sandbox");
-}
diff --git a/tests/Regression/bz1878841-GOMP-parallel-loop-nonmonotonic-dynamic-and/main.fmf b/tests/Regression/bz1878841-GOMP-parallel-loop-nonmonotonic-dynamic-and/main.fmf
deleted file mode 100644
index 8167f92..0000000
--- a/tests/Regression/bz1878841-GOMP-parallel-loop-nonmonotonic-dynamic-and/main.fmf
+++ /dev/null
@@ -1,16 +0,0 @@
-summary: Test for BZ#1878841 (GOMP_parallel_loop_nonmonotonic_dynamic and)
-description: |
-    Bug summary: GOMP_parallel_loop_nonmonotonic_dynamic and GOMP_loop_nonmonotonic_dynamic_next missing
-    Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1878841
-contact: Alexandra Hájková <ahajkova@redhat.com>
-component:
-- gcc
-test: ./runtest.sh
-framework: beakerlib
-recommend:
-- gcc
-duration: 5m
-link:
--   relates: https://bugzilla.redhat.com/show_bug.cgi?id=1878841
-extra-summary: /tools/gcc/Regression/bz1878841-GOMP-parallel-loop-nonmonotonic-dynamic-and
-extra-task: /tools/gcc/Regression/bz1878841-GOMP-parallel-loop-nonmonotonic-dynamic-and
diff --git a/tests/Regression/bz1878841-GOMP-parallel-loop-nonmonotonic-dynamic-and/runtest.sh b/tests/Regression/bz1878841-GOMP-parallel-loop-nonmonotonic-dynamic-and/runtest.sh
deleted file mode 100755
index 83c42ef..0000000
--- a/tests/Regression/bz1878841-GOMP-parallel-loop-nonmonotonic-dynamic-and/runtest.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/gcc/Regression/bz1878841-GOMP-parallel-loop-nonmonotonic-dynamic-and
-#   Description: Test for BZ#1878841 (GOMP_parallel_loop_nonmonotonic_dynamic and)
-#   Author: Alexandra Hájková <ahajkova@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2020 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="gcc"
-TESTPROG="tst"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm $PACKAGE
-        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-        rlRun "cp $TESTPROG.c $TmpDir"
-        rlRun "pushd $TmpDir"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "gcc -fopenmp $TESTPROG.c &> log"
-        rlAssertNotGrep "undefined reference to `GOMP_parallel_loop_nonmonotonic_dynamic`" log
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Regression/bz1878841-GOMP-parallel-loop-nonmonotonic-dynamic-and/tst.c b/tests/Regression/bz1878841-GOMP-parallel-loop-nonmonotonic-dynamic-and/tst.c
deleted file mode 100644
index 741559e..0000000
--- a/tests/Regression/bz1878841-GOMP-parallel-loop-nonmonotonic-dynamic-and/tst.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <omp.h>
-int main ()
-{
-  #pragma omp parallel for schedule(dynamic)
-  for (int i = 0; i < 10; i++);
-}
diff --git a/tests/Regression/bz1893340-Variadic-arguments-are-missing-from-debugging-data/b.gdb b/tests/Regression/bz1893340-Variadic-arguments-are-missing-from-debugging-data/b.gdb
deleted file mode 100644
index 341301d..0000000
--- a/tests/Regression/bz1893340-Variadic-arguments-are-missing-from-debugging-data/b.gdb
+++ /dev/null
@@ -1,2 +0,0 @@
-info functions foo
-q
diff --git a/tests/Regression/bz1893340-Variadic-arguments-are-missing-from-debugging-data/main.fmf b/tests/Regression/bz1893340-Variadic-arguments-are-missing-from-debugging-data/main.fmf
deleted file mode 100644
index 7054cbd..0000000
--- a/tests/Regression/bz1893340-Variadic-arguments-are-missing-from-debugging-data/main.fmf
+++ /dev/null
@@ -1,17 +0,0 @@
-summary: Test for BZ#1893340 (Variadic arguments are missing from debugging data)
-description: |
-    Bug summary: Variadic arguments are missing from debugging data when building with -flto
-    Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1893340
-contact: Alexandra Hájková <ahajkova@redhat.com>
-component:
-- gcc
-test: ./runtest.sh
-framework: beakerlib
-recommend:
-- gcc
-- gdb
-duration: 5m
-link:
--   relates: https://bugzilla.redhat.com/show_bug.cgi?id=1893340
-extra-summary: /tools/gcc/Regression/bz1893340-Variadic-arguments-are-missing-from-debugging-data
-extra-task: /tools/gcc/Regression/bz1893340-Variadic-arguments-are-missing-from-debugging-data
diff --git a/tests/Regression/bz1893340-Variadic-arguments-are-missing-from-debugging-data/runtest.sh b/tests/Regression/bz1893340-Variadic-arguments-are-missing-from-debugging-data/runtest.sh
deleted file mode 100755
index f2dd2ca..0000000
--- a/tests/Regression/bz1893340-Variadic-arguments-are-missing-from-debugging-data/runtest.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/gcc/Regression/bz1893340-Variadic-arguments-are-missing-from-debugging-data
-#   Description: Test for BZ#1893340 (Variadic arguments are missing from debugging data)
-#   Author: Alexandra Hájková <ahajkova@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2021 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="gcc"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm $PACKAGE
-        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-        rlRun "cp test.c b.gdb $TmpDir"
-        rlRun "pushd $TmpDir"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-    rlRun "gcc -fPIC -shared -o libtest.so -O0 -g test.c"
-    rlRun "gdb -x b.gdb libtest.so > gdb.log"
-    rlAssertGrep "void foo(int, ...);" gdb.log
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Regression/bz1893340-Variadic-arguments-are-missing-from-debugging-data/test.c b/tests/Regression/bz1893340-Variadic-arguments-are-missing-from-debugging-data/test.c
deleted file mode 100644
index 3de5962..0000000
--- a/tests/Regression/bz1893340-Variadic-arguments-are-missing-from-debugging-data/test.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <stdarg.h>
-void foo(int args, ...) {
-    va_list ap;
-    va_start(ap, args);
-    va_end(ap);
-}
diff --git a/tests/Regression/bz1896093-Compiling-with-flto-auto-fails-if-make-is-not/main.fmf b/tests/Regression/bz1896093-Compiling-with-flto-auto-fails-if-make-is-not/main.fmf
deleted file mode 100644
index c1da31b..0000000
--- a/tests/Regression/bz1896093-Compiling-with-flto-auto-fails-if-make-is-not/main.fmf
+++ /dev/null
@@ -1,16 +0,0 @@
-summary: Test for BZ#1896093 (Compiling with -flto=auto fails if make is not)
-description: |
-    Bug summary: Compiling with -flto=auto fails if make is not installed
-    Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1896093
-contact: Alexandra Hájková <ahajkova@redhat.com>
-component:
-- gcc
-test: ./runtest.sh
-framework: beakerlib
-recommend:
-- gcc
-duration: 5m
-link:
--   relates: https://bugzilla.redhat.com/show_bug.cgi?id=1896093
-extra-summary: /tools/gcc/Regression/bz1896093-Compiling-with-flto-auto-fails-if-make-is-not
-extra-task: /tools/gcc/Regression/bz1896093-Compiling-with-flto-auto-fails-if-make-is-not
diff --git a/tests/Regression/bz1896093-Compiling-with-flto-auto-fails-if-make-is-not/runtest.sh b/tests/Regression/bz1896093-Compiling-with-flto-auto-fails-if-make-is-not/runtest.sh
deleted file mode 100755
index a23ce5c..0000000
--- a/tests/Regression/bz1896093-Compiling-with-flto-auto-fails-if-make-is-not/runtest.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/gcc/Regression/bz1896093-Compiling-with-flto-auto-fails-if-make-is-not
-#   Description: Test for BZ#1896093 (Compiling with -flto=auto fails if make is not)
-#   Author: Alexandra Hájková <ahajkova@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2020 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="gcc"
-
-rlJournalStart
-    rlPhaseStartSetup
-        MAKE_WAS_PRESENT=false
-        rpm -q make &>/dev/null && MAKE_WAS_PRESENT=true
-        rlAssertRpm $PACKAGE
-        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-        rlRun "pushd $TmpDir"
-        rlRun "rpm -e --nodeps make" 0,1
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        echo "void main() { }" | gcc -x c -flto=auto - &> log
-        rlAssertNotGrep "lto-wrapper: fatal error: execvp: No such file or directory" log
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        if $MAKE_WAS_PRESENT; then
-            rpm -q make &>/dev/null || rlRun "yum -y install make"
-        fi
-        rlRun "popd"
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Regression/bz1927579-libgfortran-seems-to-be-missing/alloc1.f90 b/tests/Regression/bz1927579-libgfortran-seems-to-be-missing/alloc1.f90
deleted file mode 100644
index 8765255..0000000
--- a/tests/Regression/bz1927579-libgfortran-seems-to-be-missing/alloc1.f90
+++ /dev/null
@@ -1,5 +0,0 @@
-program test_allocated
-  integer :: i = 4
-  real(4), allocatable :: x(:)
-  if (.not. allocated(x)) allocate(x(i))
-end program test_allocated
diff --git a/tests/Regression/bz1927579-libgfortran-seems-to-be-missing/main.fmf b/tests/Regression/bz1927579-libgfortran-seems-to-be-missing/main.fmf
deleted file mode 100644
index d6b5ead..0000000
--- a/tests/Regression/bz1927579-libgfortran-seems-to-be-missing/main.fmf
+++ /dev/null
@@ -1,17 +0,0 @@
-summary: Test for BZ#1927579 (libgfortran seems to be missing)
-description: |
-    Bug summary: libgfortran seems to be missing _gfortran_os_error_at
-    Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1927579
-contact: Alexandra Hájková <ahajkova@redhat.com>
-component:
-- gcc
-test: ./runtest.sh
-framework: beakerlib
-recommend:
-- gcc
-- gcc-gfortran
-duration: 5m
-link:
--   relates: https://bugzilla.redhat.com/show_bug.cgi?id=1927579
-extra-summary: /tools/gcc/Regression/bz1927579-libgfortran-seems-to-be-missing
-extra-task: /tools/gcc/Regression/bz1927579-libgfortran-seems-to-be-missing
diff --git a/tests/Regression/bz1927579-libgfortran-seems-to-be-missing/runtest.sh b/tests/Regression/bz1927579-libgfortran-seems-to-be-missing/runtest.sh
deleted file mode 100755
index e635213..0000000
--- a/tests/Regression/bz1927579-libgfortran-seems-to-be-missing/runtest.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/gcc/Regression/bz1927579-libgfortran-seems-to-be-missing
-#   Description: Test for BZ#1927579 (libgfortran seems to be missing)
-#   Author: Alexandra Hájková <ahajkova@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2021 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="gcc"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm $PACKAGE
-        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-        rlRun "cp alloc1.f90 $TmpDir"
-        rlRun "pushd $TmpDir"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-    rlRun "gfortran alloc1.f90" &> log
-    rlAssertNotGrep "alloc1.f90:(.text+0x131): undefined reference" log
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Regression/bz1939638-gcc-toolset-10-libasan-devel-depends-on-the-wrong/main.fmf b/tests/Regression/bz1939638-gcc-toolset-10-libasan-devel-depends-on-the-wrong/main.fmf
deleted file mode 100644
index 4cfef47..0000000
--- a/tests/Regression/bz1939638-gcc-toolset-10-libasan-devel-depends-on-the-wrong/main.fmf
+++ /dev/null
@@ -1,17 +0,0 @@
-summary: Test for BZ#1939638 (gcc-toolset-10-libasan-devel depends on the wrong)
-description: |
-    Bug summary: gcc-toolset-10-libasan-devel depends on the wrong libasan
-    Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1939638
-contact: Alexandra Hájková <ahajkova@redhat.com>
-component:
-- gcc
-test: ./runtest.sh
-framework: beakerlib
-recommend:
-- gcc
-- libasan
-duration: 5m
-link:
--   relates: https://bugzilla.redhat.com/show_bug.cgi?id=1939638
-extra-summary: /tools/gcc/Regression/bz1939638-gcc-toolset-10-libasan-devel-depends-on-the-wrong
-extra-task: /tools/gcc/Regression/bz1939638-gcc-toolset-10-libasan-devel-depends-on-the-wrong
diff --git a/tests/Regression/bz1939638-gcc-toolset-10-libasan-devel-depends-on-the-wrong/runtest.sh b/tests/Regression/bz1939638-gcc-toolset-10-libasan-devel-depends-on-the-wrong/runtest.sh
deleted file mode 100755
index 1d29c6c..0000000
--- a/tests/Regression/bz1939638-gcc-toolset-10-libasan-devel-depends-on-the-wrong/runtest.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/gcc/Regression/bz1939638-gcc-toolset-10-libasan-devel-depends-on-the-wrong
-#   Description: Test for BZ#1939638 (gcc-toolset-10-libasan-devel depends on the wrong)
-#   Author: Alexandra Hájková <ahajkova@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2021 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="gcc"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm $PACKAGE
-        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-        rlRun "pushd $TmpDir"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "echo 'int main () { return 0; }' | gcc -xc -fsanitize=address -" &> log
-        rlAssertNotGrep "cannot find /usr/lib64/libasan" log
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Regression/bz1960701-Wrong-code-regression-starting-with-gcc-8-2/main.fmf b/tests/Regression/bz1960701-Wrong-code-regression-starting-with-gcc-8-2/main.fmf
deleted file mode 100644
index fc2414e..0000000
--- a/tests/Regression/bz1960701-Wrong-code-regression-starting-with-gcc-8-2/main.fmf
+++ /dev/null
@@ -1,27 +0,0 @@
-summary: Test for BZ#1960701 (Wrong-code regression starting with gcc 8.2)
-description: |
-    Bug summary: Wrong-code regression starting with gcc 8.2
-    Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1960701
-contact: Vaclav Kadlcik <vkadlcik@redhat.com>
-component:
-- gcc
-test: ./runtest.sh
-framework: beakerlib
-require:
-- gcc-c++
-duration: 15m
-enabled: true
-tag:
-  - CI-Tier-1
-link:
--   relates: https://bugzilla.redhat.com/show_bug.cgi?id=1960701
-adjust:
-  - enabled: false
-    when: distro < rhel-8 and collection is not defined
-    continue: false
-  - enabled: false
-    when: distro ~< rhel-8.5 and collection is not defined
-    continue: false
-extra-nitrate: TC#0610780
-extra-summary: /tools/gcc/Regression/bz1960701-Wrong-code-regression-starting-with-gcc-8-2
-extra-task: /tools/gcc/Regression/bz1960701-Wrong-code-regression-starting-with-gcc-8-2
diff --git a/tests/Regression/bz1960701-Wrong-code-regression-starting-with-gcc-8-2/reproducer.cc b/tests/Regression/bz1960701-Wrong-code-regression-starting-with-gcc-8-2/reproducer.cc
deleted file mode 100644
index 6ebd8e0..0000000
--- a/tests/Regression/bz1960701-Wrong-code-regression-starting-with-gcc-8-2/reproducer.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <vector>
-
-struct T {
-  unsigned a;
-  float b {8.};
-};
-
-int main()
-{
-  T t = {1};
-  std::vector<T> tt = {{1}, {2}};
-  if (t.a != 1 || t.b != 8.0f || tt[0].a != 1 || tt[0].b != 8.0f || tt[1].a != 2 || tt[1].b != 8.0f)
-    __builtin_abort ();
-}
diff --git a/tests/Regression/bz1960701-Wrong-code-regression-starting-with-gcc-8-2/runtest.sh b/tests/Regression/bz1960701-Wrong-code-regression-starting-with-gcc-8-2/runtest.sh
deleted file mode 100755
index 9dd4ea3..0000000
--- a/tests/Regression/bz1960701-Wrong-code-regression-starting-with-gcc-8-2/runtest.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/env bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/gcc/Regression/bz1960701-Wrong-code-regression-starting-with-gcc-8-2
-#   Description: Test for BZ#1960701 (Wrong-code regression starting with gcc 8.2)
-#   Author: Vaclav Kadlcik <vkadlcik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2021 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-# Notes on relevancy
-#
-# The test is applicable to GCCs supporting -std=c++17. In practice,
-#   * any supported toolset GCC
-#   * system GCC of RHEL 8+; however the respective fix landed in 8.5
-#     and isn't planned for backporting.
-#
-# Suggested TCMS relevancy:
-#   distro < rhel-8 && collection !defined: False
-#   distro < rhel-8.5 && collection !defined: False
-
-GCC="${GCC:-$(type -P gcc)}"
-PACKAGE=$(rpm --qf '%{name}\n' -qf $GCC | head -1)
-PACKAGES="${PACKAGE} ${PACKAGE}-c++"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlLogInfo "PACKAGES=$PACKAGES"
-        rlLogInfo "COLLECTIONS=$COLLECTIONS"
-        rlAssertRpm --all
-        rlRun "TmpDir=\$(mktemp -d)"
-        rlRun "cp reproducer.cc $TmpDir"
-        rlRun "pushd $TmpDir"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun 'g++ -o reproducer -Wall -Wextra -std=c++17 reproducer.cc'
-        rlRun './reproducer'
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun 'popd'
-        rlRun "rm -r $TmpDir"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Regression/bz1965951-Wrong-code-regression-starting-with-gcc-8-5/main.fmf b/tests/Regression/bz1965951-Wrong-code-regression-starting-with-gcc-8-5/main.fmf
deleted file mode 100644
index c699de0..0000000
--- a/tests/Regression/bz1965951-Wrong-code-regression-starting-with-gcc-8-5/main.fmf
+++ /dev/null
@@ -1,16 +0,0 @@
-summary: Test for BZ#1965951 (Wrong-code regression starting with gcc 8.5)
-description: |
-    Bug summary: Wrong-code regression starting with gcc 8.5
-    Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1965951
-contact: Vaclav Kadlcik <vkadlcik@redhat.com>
-component:
-- gcc
-test: ./runtest.sh
-framework: beakerlib
-recommend:
-- gcc-c++
-duration: 15m
-link:
--   relates: https://bugzilla.redhat.com/show_bug.cgi?id=1965951
-extra-summary: /tools/gcc/Regression/bz1965951-Wrong-code-regression-starting-with-gcc-8-5
-extra-task: /tools/gcc/Regression/bz1965951-Wrong-code-regression-starting-with-gcc-8-5
diff --git a/tests/Regression/bz1965951-Wrong-code-regression-starting-with-gcc-8-5/reproducer.cc b/tests/Regression/bz1965951-Wrong-code-regression-starting-with-gcc-8-5/reproducer.cc
deleted file mode 100644
index 40b0c81..0000000
--- a/tests/Regression/bz1965951-Wrong-code-regression-starting-with-gcc-8-5/reproducer.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <iostream>
-struct S1 { virtual ~S1() = default; };
-struct S2 { virtual void f1() = 0; };
-struct S3: S1, S2 {
-    void f1() { f2(); }
-    virtual void f2() = 0;
-};
-struct S4: S3 {
-    void f2() { std::cout << "called\n"; }
-    using S2::f1;
-};
-int main() { S4().f1(); }
diff --git a/tests/Regression/bz1965951-Wrong-code-regression-starting-with-gcc-8-5/runtest.sh b/tests/Regression/bz1965951-Wrong-code-regression-starting-with-gcc-8-5/runtest.sh
deleted file mode 100755
index d8d69d0..0000000
--- a/tests/Regression/bz1965951-Wrong-code-regression-starting-with-gcc-8-5/runtest.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/gcc/Regression/bz1965951-Wrong-code-regression-starting-with-gcc-8-5
-#   Description: Test for BZ#1965951 (Wrong-code regression starting with gcc 8.5)
-#   Author: Vaclav Kadlcik <vkadlcik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2021 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-GCC="${GCC:-$(type -P gcc)}"
-PACKAGE=$(rpm --qf '%{name}\n' -qf $GCC | head -1)
-PACKAGES="${PACKAGE} ${PACKAGE}-c++"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlLogInfo "PACKAGES=$PACKAGES"
-        rlRun "dnf -y install $PACKAGES" 0-255
-        rlAssertRpm --all
-        rlRun "TmpDir=\$(mktemp -d)"
-        rlRun "cp reproducer.cc $TmpDir"
-        rlRun "pushd $TmpDir"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun 'g++ -o reproducer reproducer.cc'
-        rlRun './reproducer'
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun 'popd'
-        rlRun "rm -r $TmpDir"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Regression/bz576287-SystemTap-fails-to-retrieve-location-attribute-for-local-variable/main.fmf b/tests/Regression/bz576287-SystemTap-fails-to-retrieve-location-attribute-for-local-variable/main.fmf
deleted file mode 100644
index 5ce67d3..0000000
--- a/tests/Regression/bz576287-SystemTap-fails-to-retrieve-location-attribute-for-local-variable/main.fmf
+++ /dev/null
@@ -1,26 +0,0 @@
-summary: SystemTap fails to retrieve location attribute for local variable
-description: ''
-contact: mcermak@redhat.com
-component:
-  - gcc
-  - systemtap
-test: ./runtest.sh
-framework: beakerlib
-require:
-  - gcc
-  - systemtap
-  - kernel-devel
-  - kernel-headers
-duration: 50m
-enabled: true
-tag:
-  - CI-Tier-1
-  - STAP-EWA
-  - mcu_stap
-  - mcu_stap_6g
-  - mcu_stap_7g
-link:
-  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=576287
-extra-nitrate: TC#0062256
-extra-summary: /tools/gcc/Regression/gcc/bz576287-SystemTap-fails-to-retrieve-location-attribute-for-local-variable
-extra-task: /tools/gcc/Regression/gcc/bz576287-SystemTap-fails-to-retrieve-location-attribute-for-local-variable
diff --git a/tests/Regression/bz576287-SystemTap-fails-to-retrieve-location-attribute-for-local-variable/runtest.sh b/tests/Regression/bz576287-SystemTap-fails-to-retrieve-location-attribute-for-local-variable/runtest.sh
deleted file mode 100755
index 0003300..0000000
--- a/tests/Regression/bz576287-SystemTap-fails-to-retrieve-location-attribute-for-local-variable/runtest.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-#   Copyright (c) 2010 Red Hat, Inc. All rights reserved.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 3 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include rhts environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="gcc"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm $PACKAGE
-        kernel_uname="$(uname -a | awk '{ print $3 }')"
-        kernel_arch="$(uname -a | awk '{ print $12 }')"
-        echo kernel_arch: $kernel_arch
-        kernel_version="$(echo ${kernel_uname} | sed 's/-/ /' | awk '{ print $1 }')"
-        echo kernel_version: $kernel_version
-        kernel_release="$(echo ${kernel_uname} | sed 's/-/ /' | awk '{ print $2 }' | sed 's/\./ /g' | awk '{ print $1,".",$2 }' | sed 's/ //g')"
-        echo kernel_release_1: $kernel_release
-        if $(echo ${kernel_release} | grep -iq PAE); then
-            kernel_release="$(echo ${kernel_release} | sed 's/PAE//g' | sed 's/pae//g')"
-            PAE="PAE-"
-        fi
-        echo kernel_release_2: $kernel_release
-        if rlIsRHEL 6; then
-                arch="${kernel_arch}-"
-        fi
-        kernel_debug="http://download.devel.redhat.com/brewroot/packages/kernel/${kernel_version}/${kernel_release}/${kernel_arch}/kernel-${PAE}debuginfo-${kernel_version}-${kernel_release}.${kernel_arch}.rpm"
-        kernel_debug_common="http://download.devel.redhat.com/brewroot/packages/kernel/${kernel_version}/${kernel_release}/${kernel_arch}/kernel-debuginfo-common-${arch}${kernel_version}-${kernel_release}.${kernel_arch}.rpm"
-        echo ">>> $kernel_debug $kernel_debug_common"
-        debuginfo-install -y kernel
-        rpmquery kernel-debuginfo || rpm -ivh ${kernel_debug} ${kernel_debug_common}
-    rlPhaseEnd
-
-    rlPhaseStartTest opt-O$opt
-        rlRun "stap -vvvv -p2 -e 'probe kernel.function(\"sig_ignored\") {println($$parms)}' 2>&1 | grep 'variable location problem'" 1 "gcc produced good enough debuginfo w/o 'variable location problem'"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Regression/bz703059-g-fails-to-compile-a-program-that-has-a-template/f.cc b/tests/Regression/bz703059-g-fails-to-compile-a-program-that-has-a-template/f.cc
deleted file mode 100644
index 7b815cd..0000000
--- a/tests/Regression/bz703059-g-fails-to-compile-a-program-that-has-a-template/f.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-template <bool C> int func (void);
-
-template <class T> struct Foo
-{
-  static const unsigned int a = sizeof (T);
-
-  //enum { b = a };
-
-  enum
-  {
-    c = sizeof (func < (a == 0) > ())
-  };
-};
-
-Foo <int> x;
diff --git a/tests/Regression/bz703059-g-fails-to-compile-a-program-that-has-a-template/main.fmf b/tests/Regression/bz703059-g-fails-to-compile-a-program-that-has-a-template/main.fmf
deleted file mode 100644
index 4c38d10..0000000
--- a/tests/Regression/bz703059-g-fails-to-compile-a-program-that-has-a-template/main.fmf
+++ /dev/null
@@ -1,28 +0,0 @@
-summary: Try to compile a program that has a template parameter with a boolean expression
-    involving a templated static constant
-description: ''
-contact: mcermak@redhat.com
-component:
-  - gcc
-test: ./runtest.sh
-path: /tests/Regression/bz703059-g-fails-to-compile-a-program-that-has-a-template
-framework: beakerlib
-require:
-  - gcc
-  - gcc-c++
-  - file
-duration: 5m
-enabled: true
-tier: '1'
-link:
-  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=703059
-tag:
-  - CI-Tier-1
-  - DTS8-INTEROP-CI
-  - DTS9-INTEROP-CI
-  - Tier1
-  - dts_smoke
-  - dts_stable
-extra-nitrate: TC#0111110
-extra-summary: /tools/gcc/Regression/bz703059-g-fails-to-compile-a-program-that-has-a-template
-extra-task: /tools/gcc/Regression/bz703059-g-fails-to-compile-a-program-that-has-a-template
diff --git a/tests/Regression/bz703059-g-fails-to-compile-a-program-that-has-a-template/runtest.sh b/tests/Regression/bz703059-g-fails-to-compile-a-program-that-has-a-template/runtest.sh
deleted file mode 100755
index 8f50b77..0000000
--- a/tests/Regression/bz703059-g-fails-to-compile-a-program-that-has-a-template/runtest.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/gcc/Regression/bz703059-g-fails-to-compile-a-program-that-has-a-template
-#   Description: Try to compile a program that has a template parameter with a boolean expression involving a templated static constant
-#   Author: Marek Polacek <mpolacek@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2011, 2012 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include rhts environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-GXX=${GXX:-g++}
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlLog "GXX = $GXX"
-        rlLog "Installed within `rpmquery -f $(which $GXX)`"
-        rlRun "TmpDir=\`mktemp -d\`"
-        rlRun "cp -v f.cc $TmpDir"
-        rlRun "pushd $TmpDir"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "$GXX -c f.cc"
-        rlAssertExists "f.o"
-        rlRun "file f.o | grep ELF" # Basic obj file sanity check
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Regression/unused_parameter_warning/main.fmf b/tests/Regression/unused_parameter_warning/main.fmf
deleted file mode 100644
index 7084e32..0000000
--- a/tests/Regression/unused_parameter_warning/main.fmf
+++ /dev/null
@@ -1,31 +0,0 @@
-summary: Check to see if g++ throws unused parameter warnings with standard libraries
-    with option -Wall
-contact: mcermak@redhat.com
-component:
-  - gcc
-test: ./runtest.sh
-path: /tests/Regression/unused_parameter_warning
-framework: beakerlib
-require:
-  - gcc-c++
-  - glibc-devel
-  - libstdc++-devel
-recommend:
-  - gcc44-c++
-  - glibc-devel.ppc64
-  - glibc-devel.ppc
-  - libstdc++43-devel.ppc
-  - libstdc++44-devel.ppc
-  - libstdc++-devel.ppc
-duration: 10m
-enabled: true
-tier: '1'
-link:
-  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=201342
-tag:
-  - CI-Tier-1
-  - Tier1
-  - dts_stable
-extra-nitrate: TC#0062265
-extra-summary: /tools/gcc/c++/unused_parameter_warning
-extra-task: /tools/gcc/c++/unused_parameter_warning
diff --git a/tests/Regression/unused_parameter_warning/runtest.sh b/tests/Regression/unused_parameter_warning/runtest.sh
deleted file mode 100755
index 4a5d2fb..0000000
--- a/tests/Regression/unused_parameter_warning/runtest.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/rhts-library/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2009, 2012 Red Hat, Inc. All rights reserved.
-#   
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#   
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#   
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# g++ - check for unused parameter warning
-# expected exit code is 0
-#
-# Author: Sachin Prabhu <sprabhu@redhat.com>
-# Maintainer: Marek Polacek <polacek@redhat.com>
-
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGES=(gcc gcc-c++ grep)
-
-GXX=${GXX:-g++}
-
-rlJournalStart
-    rlPhaseStartSetup
-        for p in "${PACKAGES[@]}"; do
-            rlAssertRpm "$p"
-        done; unset p
-        rlLog "GXX = $GXX"
-        rlLog "Installed within `rpmquery -f $(which $GXX)`"
-        rlRun "TmpDir=\`mktemp -d\`"
-        rlRun "cp -v test.cpp $TmpDir"
-        rlRun "pushd $TmpDir"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "$GXX -W -Wall -o test.bin test.cpp &> output"
-        cat output
-        rlRun "grep -E 'warning:\W+unused\W+parameter' -q output" 1 "'warning: unused parameter' not present"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Regression/unused_parameter_warning/test.cpp b/tests/Regression/unused_parameter_warning/test.cpp
deleted file mode 100644
index 15d375b..0000000
--- a/tests/Regression/unused_parameter_warning/test.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <sstream>
-int main() {}
diff --git a/tests/Sanity/compile-rpm/main.fmf b/tests/Sanity/compile-rpm/main.fmf
deleted file mode 100644
index d6c5faa..0000000
--- a/tests/Sanity/compile-rpm/main.fmf
+++ /dev/null
@@ -1,45 +0,0 @@
-summary: Compile a Red Hat RPM package.
-description: ''
-contact: mcermak@redhat.com
-component:
-  - gcc
-test: ./runtest.sh
-path: /tests/Sanity/compile-rpm
-framework: beakerlib
-require:
-  - autoconf
-  - bison
-  - dejagnu
-  - elfutils-libelf-devel
-  - expat-devel
-  - flex
-  - gcc
-  - gdb
-  - glibc-devel
-  - grep
-  - libselinux-devel
-  - make
-  - mpfr-devel
-  - ncurses-devel
-  - python-devel
-  - readline-devel
-  - rpm-build
-  - rpm-devel
-  - texinfo
-  - xz-devel
-  - yum-utils
-  - zlib-devel
-duration: 240m
-adjust:
-  - require+:
-    - ncurses-devel.i686
-    - ncurses-devel.x86_64
-    when: arch == x86_64
-  - enabled: false
-    # Too "heavy" for Fedora CI (for now)
-    when: distro == fedora and trigger is defined
-    continue: false
-enabled: true
-extra-nitrate: TC#0142522
-extra-summary: /tools/gcc/Sanity/compile-rpm
-extra-task: /tools/gcc/Sanity/compile-rpm
diff --git a/tests/Sanity/compile-rpm/runtest.sh b/tests/Sanity/compile-rpm/runtest.sh
deleted file mode 100755
index 5f68e75..0000000
--- a/tests/Sanity/compile-rpm/runtest.sh
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/gcc/Sanity/compile-rpm
-#   Description: Compile a Red Hat RPM package.
-#   Author: Marek Polacek <polacek@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-GCC=${GCC:-gcc}
-
-# Set the variabile UNDER_DTS on non-empty string, when run under devtoolset.
-if $( echo `which gcc` | grep -qE '/opt/rh/' ); then
-  UNDER_DTS="true"
-  # Set the actual version of DTS
-  DTS=`which gcc | awk 'BEGIN { FS="/" } { print $4 }'`
-fi
-
-rlJournalStart
-  rlPhaseStartSetup
-    # Work around troubles with buildroot packages being out-of-sync
-    if rlIsRHEL; then
-      rlMountRedhat
-      for i in libipt source-highlight libbabeltrace; do
-        rpm -q $i &>/dev/null || rlRun "yum -y install $i" 0-255
-        rpm -q ${i}-devel &>/dev/null || rlRun "yum -y install ${i}-devel" 0-255
-        d=/mnt/redhat/brewroot/packages/$i
-        if rpm -q $i &>/dev/null && ! rpm -q ${i}-devel &>/dev/null; then
-          if [[ -e /mnt/redhat/brewroot/packages/$i ]]; then
-            d=/mnt/redhat/brewroot/packages/$i
-          else
-            d=/mnt/redhat/brewroot/packages/${i#lib}
-          fi
-          rlRun "yum -y install $d/$(rpm -q --qf='%{VERSION}/%{RELEASE}/%{ARCH}' $i)/${i}-devel-$(rpm -q --qf='%{VERSION}-%{RELEASE}.%{ARCH}' $i).rpm"
-        fi
-      done
-    fi
-
-    rlRun "TmpDir=\$(mktemp -d)"
-    rlRun "pushd $TmpDir"
-
-    if [ -z ${UNDER_DTS} ]; then
-      rlFetchSrcForInstalled gdb || yumdownloader --source gdb
-    else
-      rlFetchSrcForInstalled $DTS-gdb || yumdownloader --source $DTS-gdb
-    fi
-
-    if [ -z  ${UNDER_DTS} ]; then
-      srpm=$(rpmquery gdb --queryformat=%{NAME}-%{VERSION}-%{RELEASE})".src.rpm"
-    else
-      srpm=$(rpmquery $DTS-gdb --queryformat=%{NAME}-%{VERSION}-%{RELEASE})".src.rpm"
-    fi
-    rlRun "rpm -Uvh $srpm"
-    spec_dir=$(rpm --eval=%_specdir)
-    build_dir=$(rpm --eval=%_builddir)
-
-    if [ -z  ${UNDER_DTS} ]; then
-      pkg_dir=$(rpmquery gdb} --queryformat=%{NAME}-%{VERSION})
-    else
-      pkg_dir=$(rpmquery $DTS-gdb} --queryformat=%{NAME}-%{VERSION})
-    fi
-
-    yum-builddep -y $spec_dir/gdb.spec
-  rlPhaseEnd
-
-  rlPhaseStartTest
-    rlRun "CC=$GCC rpmbuild -bb $spec_dir/gdb.spec &> BUILD_LOG"
-    test $? -eq 0 || tail -n 20 BUILD_LOG
-  rlPhaseEnd
-
-  rlPhaseStartCleanup
-    rlBundleLogs "Build-log" BUILD_LOG
-    rlRun "popd"
-    rlRun "rm -r $TmpDir"
-  rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Sanity/libitm-smoke/bins_aarch64.tar.gz b/tests/Sanity/libitm-smoke/bins_aarch64.tar.gz
deleted file mode 100644
index d528f03..0000000
Binary files a/tests/Sanity/libitm-smoke/bins_aarch64.tar.gz and /dev/null differ
diff --git a/tests/Sanity/libitm-smoke/bins_i686.tar.gz b/tests/Sanity/libitm-smoke/bins_i686.tar.gz
deleted file mode 100644
index ce0e948..0000000
Binary files a/tests/Sanity/libitm-smoke/bins_i686.tar.gz and /dev/null differ
diff --git a/tests/Sanity/libitm-smoke/bins_ppc64.tar.gz b/tests/Sanity/libitm-smoke/bins_ppc64.tar.gz
deleted file mode 100644
index 0589c6a..0000000
Binary files a/tests/Sanity/libitm-smoke/bins_ppc64.tar.gz and /dev/null differ
diff --git a/tests/Sanity/libitm-smoke/bins_ppc64le.tar.gz b/tests/Sanity/libitm-smoke/bins_ppc64le.tar.gz
deleted file mode 100644
index b8e9215..0000000
Binary files a/tests/Sanity/libitm-smoke/bins_ppc64le.tar.gz and /dev/null differ
diff --git a/tests/Sanity/libitm-smoke/bins_s390x.tar.gz b/tests/Sanity/libitm-smoke/bins_s390x.tar.gz
deleted file mode 100644
index 742a917..0000000
Binary files a/tests/Sanity/libitm-smoke/bins_s390x.tar.gz and /dev/null differ
diff --git a/tests/Sanity/libitm-smoke/bins_x86_64.tar.gz b/tests/Sanity/libitm-smoke/bins_x86_64.tar.gz
deleted file mode 100644
index e884185..0000000
Binary files a/tests/Sanity/libitm-smoke/bins_x86_64.tar.gz and /dev/null differ
diff --git a/tests/Sanity/libitm-smoke/main.fmf b/tests/Sanity/libitm-smoke/main.fmf
deleted file mode 100644
index 77c1763..0000000
--- a/tests/Sanity/libitm-smoke/main.fmf
+++ /dev/null
@@ -1,34 +0,0 @@
-summary: Just runs prebuilt binaries
-description: |
-    Just running prebuilt binaries that require libitm.
-    This test is designed to run in gcc-libraries CI. we
-    cannot build anything on our own, since we don't have
-    devtoolset's gcc and -devel libraries.
-
-    This should run OK on RHEL-6 and RHEL-7, currently all
-    arches.
-
-    The sources of the tests are in Sanity/libitm-sanity.
-    !!! THIS TEST IS INTENTIONALLY NOT IN gcc General PLAN !!!
-contact: Michael Petlan <mpetlan@redhat.com>
-component:
-  - gcc
-  - gcc-libraries
-test: ./runtest.sh
-framework: beakerlib
-require:
-  - gcc
-  - libitm
-recommend:
-  - gcc-libraries
-duration: 5m
-enabled: true
-tag:
-  - CI-Tier-1
-adjust:
-  - enabled: false
-    when: distro == rhel-6 and arch == s390x
-    continue: false
-extra-nitrate: TC#0539542
-extra-summary: /tools/gcc/Sanity/libitm-smoke
-extra-task: /tools/gcc/Sanity/libitm-smoke
diff --git a/tests/Sanity/libitm-smoke/runtest.sh b/tests/Sanity/libitm-smoke/runtest.sh
deleted file mode 100755
index 8c78f78..0000000
--- a/tests/Sanity/libitm-smoke/runtest.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/gcc/Sanity/libitm-smoke
-#   Description: Just runs prebuilt binaries
-#   Author: Michael Petlan <mpetlan@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2016 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-# Relevant for any system with libitm binary compatible with the attached
-# binaries.
-# Suggested TCMS relevancy:
-#   distro = rhel-6 && arch = s390x: False
-
-PACKAGE="gcc"
-REALLY_WANT_TO_RUN="true"
-
-rlJournalStart
-	rlPhaseStartSetup
-		rlAssertRpm $PACKAGE
-		if [ "$BASEOS_CI" = "true" ]; then
-			# in CI, we need to be able to skip this testcase
-			# in case libitm is not a part of gcc-libraries
-			rlCheckRpm "libitm" || REALLY_WANT_TO_RUN="false"
-		else
-			rlCheckRpm "libitm" || rlRun "yum install -y libitm" 0 "Installing missing libitm"
-			rlAssertRpm "libitm"
-		fi
-		TARBALL="bins_`arch`.tar.gz"
-		if [ ! -f $TARBALL ]; then
-			rlDie "We do not have binaries for your arch (`arch`)"
-		fi
-		rlRun "zcat $TARBALL | tar x"
-		rlRun "pushd bins"
-	rlPhaseEnd
-
-	if [ "$REALLY_WANT_TO_RUN" = "true" ]; then
-		rlPhaseStartTest
-			for i in T_*; do
-				rlRun "./$i"
-			done
-		rlPhaseEnd
-	else
-		rlPhaseStartTest
-			rlPass "SKIPPING THIS TEST -- libitm is probably not shipped within current gcc-libraries"
-		rlPhaseEnd
-	fi
-
-	rlPhaseStartCleanup
-		rlRun "popd"
-		rlRun "rm -rf bins" 0 "Removing the stuff we created"
-	rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Sanity/rebuild-binutils/main.fmf b/tests/Sanity/rebuild-binutils/main.fmf
deleted file mode 100644
index 2d7e5d5..0000000
--- a/tests/Sanity/rebuild-binutils/main.fmf
+++ /dev/null
@@ -1,70 +0,0 @@
-summary: Rebuild binutils.
-description: ''
-contact: mcermak@redhat.com
-component:
-  - gcc
-test: ./runtest.sh
-path: /tests/Sanity/rebuild-binutils
-framework: beakerlib
-require:
-  - autoconf
-  - automake
-  - binutils
-  - gcc
-  - glibc
-  - glibc-devel
-  - glibc-static
-  - libstdc++
-  - libstdc++-devel
-  - libstdc++-static
-  - perl
-  - rpm-build
-  - sharutils
-  - texinfo
-  - yum-utils
-  - zlib-devel
-  - zlib-static
-recommend:
-  - glibc-devel.ppc
-  - glibc-devel.s390
-  - glibc-static.ppc
-  - glibc-static.s390
-  - libgcc.ppc
-  - libgcc.s390
-  - libstdc++-devel.ppc
-  - libstdc++-devel.s390
-  - libstdc++.ppc
-  - libstdc++.s390
-  - libstdc++-static.ppc
-  - libstdc++-static.s390
-  - zlib-devel.ppc
-  - zlib-static.ppc
-  - dnf-utils
-  - yum-utils
-duration: 3h
-enabled: true
-adjust:
-  - require+:
-    - glibc-devel.i686
-    - glibc-devel.x86_64
-    - glibc-static.i686
-    - glibc-static.x86_64
-    - libgcc.i686
-    - libgcc.x86_64
-    - libstdc++-devel.i686
-    - libstdc++-devel.x86_64
-    - libstdc++.i686
-    - libstdc++.x86_64
-    - libstdc++-static.i686
-    - libstdc++-static.x86_64
-    when: arch == x86_64
-  - enabled: false
-    when: distro == rhel-6 and collection is defined
-    continue: false
-  - enabled: false
-    # Too "heavy" for Fedora CI (for now)
-    when: distro == fedora and trigger is defined
-    continue: false
-extra-nitrate: TC#0147459
-extra-summary: /tools/gcc/Sanity/rebuild-binutils
-extra-task: /tools/gcc/Sanity/rebuild-binutils
diff --git a/tests/Sanity/rebuild-binutils/runtest.sh b/tests/Sanity/rebuild-binutils/runtest.sh
deleted file mode 100755
index 714ac4d..0000000
--- a/tests/Sanity/rebuild-binutils/runtest.sh
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/gcc/Sanity/rebuild-binutils
-#   Description: Rebuild binutils.
-#   Author: Marek Polacek <polacek@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-# The test is expected to fail in devtoolset-* on RHEL-6 because of
-# the "Unresolvable `R_X86_64_NONE` relocation" family of bugs, e.g.
-#   https://bugzilla.redhat.com/show_bug.cgi?id=1545386
-# They have been fixed for both the base and devtoolset binutils
-# on RHEL-7 but on RHEL-6, it was just the base binutils.
-
-GCC=${GCC:-gcc}
-
-# Set the variabile UNDER_DTS on non-empty string, when run under devtoolset.
-if $( echo `which gcc` | grep -qE '/opt/rh/' ); then
-  UNDER_DTS="true"
-  # Set the actual version of DTS
-  DTS=`which gcc | awk 'BEGIN { FS="/" } { print $4 }'`
-fi
-
-rlJournalStart
-  rlPhaseStartSetup
-    rlLog "Using GCC: `rpmquery -f $(which $GCC)`"
-    rlRun "rpmquery -a | grep -e yum-utils -e dnf-utils" 0 "YUM or DNF utils are installed"
-    rlRun "TmpDir=\$(mktemp -d)"
-    rlRun "pushd $TmpDir"
-
-    if [ -z ${UNDER_DTS} ]; then
-        rlFetchSrcForInstalled binutils || yumdownloader --source binutils
-        srpm=$(find binutils*.src.rpm | tail -n1)
-    else
-        rlFetchSrcForInstalled $DTS-binutils || yumdownloader --source $DTS-binutils
-        srpm=$(find $DTS-binutils*.src.rpm | tail -n1)
-    fi
-    rlRun "rpm -Uvh $srpm"
-    spec_dir=$(rpm --eval=%_specdir)
-    yum-builddep -y $spec_dir/binutils.spec
-  rlPhaseEnd
-
-  rlPhaseStartTest
-    if [ "$(uname -i)" == "ppc64" ]; then 
-      if rlIsRHEL 6; then
-        target='--target=ppc64'
-      else
-        target='--target=ppc'
-      fi
-    fi
-    if [ "$(uname -i)" == "i386" ]; then
-      target='--target=i686'
-    fi
-
-    rlRun "setsebool allow_execmod 1"
-    rlRun "CC=$GCC rpmbuild -bb $target --clean $spec_dir/binutils.spec &> BUILD_LOG" || ( echo "========== BUILD_LOG tail ==========" ; tail -n 20 BUILD_LOG )
-    rlRun "setsebool allow_execmod 0"
-  rlPhaseEnd
-
-  rlPhaseStartCleanup
-    rlBundleLogs "Build-log" BUILD_LOG
-    rlRun "popd"
-    rlRun "rm -r $TmpDir"
-  rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Sanity/rebuild-glibc/main.fmf b/tests/Sanity/rebuild-glibc/main.fmf
deleted file mode 100644
index 53eee30..0000000
--- a/tests/Sanity/rebuild-glibc/main.fmf
+++ /dev/null
@@ -1,76 +0,0 @@
-description: |
-    Rebuild current glibc.
-summary: Rebuild glibc
-contact: mcermak@redhat.com
-component:
-  - gcc
-test: ./runtest.sh
-path: /tests/Sanity/rebuild-glibc
-framework: beakerlib
-require:
-  - audit-libs-devel
-  - binutils
-  - gcc
-  - gd-devel
-  - glibc-devel
-  - glibc-static
-  - glibc-utils
-  - libcap-devel
-  - libgcc
-  - libpng-devel
-  - libstdc++
-  - libstdc++-devel
-  - libstdc++-static
-  - libXpm-devel
-  - nspr-devel
-  - nss-devel
-  - nss-softokn-devel
-  - nss-util-devel
-  - rpm-build
-  - systemtap-sdt-devel
-  - yum-utils
-recommend:
-  - glibc-devel.ppc
-  - glibc-devel.s390
-  - glibc-static.ppc
-  - glibc-static.s390
-  - libgcc.ppc
-  - libgcc.s390
-  - libstdc++-devel.ppc
-  - libstdc++-devel.s390
-  - libstdc++.ppc
-  - libstdc++.s390
-  - libstdc++-static.ppc
-  - libstdc++-static.s390
-  - dnf-utils
-  - yum-utils
-duration: 18h
-enabled: true
-tag:
-  - NoDTS
-  - rhel8-buildroot
-adjust:
-  - require+:
-    - glibc-devel.i686
-    - glibc-devel.x86_64
-    - glibc-static.i686
-    - glibc-static.x86_64
-    - libgcc.i686
-    - libgcc.x86_64
-    - libstdc++-devel.i686
-    - libstdc++-devel.x86_64
-    - libstdc++.i686
-    - libstdc++.x86_64
-    - libstdc++-static.i686
-    - libstdc++-static.x86_64
-    when: arch == x86_64
-  - enabled: false
-    when: collection is defined
-    continue: false
-  - enabled: false
-    # Too "heavy" for Fedora CI (for now)
-    when: distro == fedora and trigger is defined
-    continue: false
-extra-nitrate: TC#0035677
-extra-summary: /tools/gcc/Sanity/rebuild-glibc
-extra-task: /tools/gcc/Sanity/rebuild-glibc
diff --git a/tests/Sanity/rebuild-glibc/runtest.sh b/tests/Sanity/rebuild-glibc/runtest.sh
deleted file mode 100755
index 52255c5..0000000
--- a/tests/Sanity/rebuild-glibc/runtest.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2009, 2012 Red Hat, Inc. All rights reserved.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# 
-# Author: Michal Nowak <mnowak@redhat.com>
-# Rewrite: Marek Polacek <polacek@redhat.com>
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-cpu_good_for_make_check () {
-    # glibc can create several alternative CPU-specific bits that are selected
-    # in runtime. However the "make check" phase tries to test all of them and
-    # fails when testing a more "advanced" binary than the SUT's CPU. In such
-    # case we'd want to skip "make check" to prevent "rpmbuild" from a certain
-    # failure.
-    if rlIsRHEL '>=8' && [[ $(arch) = ppc64le ]] && grep -q 'POWER[2-8]' /proc/cpuinfo; then
-        rlLogInfo 'RHEL8+ on <POWER9, make check will be skipped'
-        return 1
-    fi
-    return 0
-}
-
-GCC=${GCC:-gcc}
-
-rlJournalStart
-  rlPhaseStartSetup
-
-    cpu_good_for_make_check && CHECK_PARAM='' || CHECK_PARAM='--nocheck'
-
-    rlRun "rpmquery -a | grep -e yum-utils -e dnf-utils" 0 "YUM or DNF utils are installed"
-
-    rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-    rlRun "pushd $TmpDir"
-
-    rlLogInfo "Running kernel: `uname -r`"
-    rlLogInfo "Installed kernel(s): `rpm -q kernel`"
-    rlLogInfo "Installed headers: `rpm -q kernel-headers`"
-
-    rlFetchSrcForInstalled glibc || yumdownloader --source glibc
-    srpm=$(find glibc*.src.rpm | tail -n1)
-    rlRun "rpm -Uvh $srpm"
-    spec_dir=$(rpm --eval=%_specdir)
-    yum-builddep -y $spec_dir/glibc.spec
-
-  rlPhaseEnd
-
-  rlPhaseStartTest
-    if [ "$(uname -i)" == "ppc64" ]; then 
-        if rlIsRHEL 7 || rlIsRHEL 6; then
-            target='--target=ppc64'
-        else
-            target='--target=ppc'
-        fi
-    fi
-    rlRun "CC=$GCC rpmbuild -bb $target $CHECK_PARAM --clean $spec_dir/glibc.spec &> BUILD_LOG"
-    test $? -eq 0 || tail -n 20 BUILD_LOG
-  rlPhaseEnd
-
-  rlPhaseStartCleanup
-    rlBundleLogs "Build-log" BUILD_LOG
-    rlRun "popd"
-    rlRun "rm -r $TmpDir"
-  rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Sanity/test-m32-m64-options/clear_cache.c b/tests/Sanity/test-m32-m64-options/clear_cache.c
deleted file mode 100644
index b10479f..0000000
--- a/tests/Sanity/test-m32-m64-options/clear_cache.c
+++ /dev/null
@@ -1,7 +0,0 @@
-int
-main (void)
-{
-  char *mem = __builtin_alloca (40);
-  __builtin___clear_cache (mem, mem + 40);
-  return 0;
-}
diff --git a/tests/Sanity/test-m32-m64-options/cpp11.cpp b/tests/Sanity/test-m32-m64-options/cpp11.cpp
deleted file mode 100644
index 649daec..0000000
--- a/tests/Sanity/test-m32-m64-options/cpp11.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-template <class T>
-class X
-{
-  T p;
-public:
-  template <class U> auto f() -> decltype(+p) { }
-};
-
-struct A
-{
-  int i = 42;
-};
-
-struct B
-{
-  int i = 42;
-  B() { }
-  B(int i): i(i) { }
-};
-
-template <class T, T t>
-struct C
-{
-  T m = t;
-};
-
-template <class T, T t>
-struct D
-{
-  T m = t;
-  D() { }
-  D(T m):m(m) { }
-};
-
-struct complex
-{
-  typedef float value_type;
-  typedef __complex__ float _ComplexT;
-
-  constexpr complex(_ComplexT __z) : _M_value(__z) { }
-
-  constexpr complex(float __r = 0.0f, float __i = 0.0f)
-  : _M_value(__r + __i * 1.0f) { }
-
-private:
-  _ComplexT _M_value;
-};
-
-constexpr complex c1;
-
-int
-main (void)
-{
-  X<int>().f<int>();
-  A a1;
-  if (a1.i != 42) return 1;
-  A a2{};
-  if (a2.i != 42) return 2;
-  A a3[1];
-  if (a3[0].i != 42) return 3;
-
-  B b1;
-  if (b1.i != 42) return 3;
-  B b2 (24);
-  if (b2.i != 24) return 4;
-
-  C<int,3> c1;
-  if (c1.m != 3) return 5;
-  C<int,5> c2 {};
-  if (c2.m != 5) return 6;
-
-  D<int,3> d1;
-  if (d1.m != 3) return 7;
-  D<int,3> d2 (5) ;
-  if (d2.m != 5) return 8;
-
-  return 0;
-}
diff --git a/tests/Sanity/test-m32-m64-options/hello.c b/tests/Sanity/test-m32-m64-options/hello.c
deleted file mode 100644
index 98a53b6..0000000
--- a/tests/Sanity/test-m32-m64-options/hello.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <stdio.h>
-
-int
-main (void)
-{
-  puts ("Hello World!");
-  return 0;
-}
diff --git a/tests/Sanity/test-m32-m64-options/hello.cpp b/tests/Sanity/test-m32-m64-options/hello.cpp
deleted file mode 100644
index 0f2234e..0000000
--- a/tests/Sanity/test-m32-m64-options/hello.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <iostream>
-
-int
-main (void)
-{
- std::cout << "Hello, world!\n";
-}
diff --git a/tests/Sanity/test-m32-m64-options/hello.f90 b/tests/Sanity/test-m32-m64-options/hello.f90
deleted file mode 100644
index afabbb2..0000000
--- a/tests/Sanity/test-m32-m64-options/hello.f90
+++ /dev/null
@@ -1,3 +0,0 @@
-       program hello
-          print *, "Hello World!"
-       end program hello
diff --git a/tests/Sanity/test-m32-m64-options/lambda-template.C b/tests/Sanity/test-m32-m64-options/lambda-template.C
deleted file mode 100644
index b4db3b8..0000000
--- a/tests/Sanity/test-m32-m64-options/lambda-template.C
+++ /dev/null
@@ -1,41 +0,0 @@
-// { dg-options -std=c++0x }
-// { dg-do run }
-
-extern "C" void abort();
-
-template <class T>
-auto apply (T t) -> decltype (t())
-{
-  return t();
-}
-
-template <class T>
-T f(T t)
-{
-  T t2 = t;
-  if (t != [=]()->T { return t; }())
-    abort ();
-  if (t != [=] { return t; }())
-    abort ();
-  if (t != [=] { return t2; }())
-    abort ();
-  if (t != [&] { return t; }())
-    abort ();
-  if (t != apply([=]{return t;}))
-    abort ();
-
-  int i;
-  [&] (int a)                    { return a+i+t; } (0);
-  [&] (int a) -> decltype(a)     { return a+i+t; } (0);
-  [&] (int a) -> decltype(i)     { return a+i+t; } (0);
-  [&] (int a) -> decltype(t)     { return a+i+t; } (0);
-  [&] (int a) -> decltype(a+i)   { return a+i+t; } (0);
-  [&] (int a) -> decltype(a+t)   { return a+i+t; } (0);
-  [&] (int a) -> decltype(i+t)   { return a+i+t; } (0);
-  [&] (int a) -> decltype(a+i+t) { return a+i+t; } (0);
-}
-
-int main()
-{
-  f(0xbeef);
-}
diff --git a/tests/Sanity/test-m32-m64-options/main.fmf b/tests/Sanity/test-m32-m64-options/main.fmf
deleted file mode 100644
index 732b996..0000000
--- a/tests/Sanity/test-m32-m64-options/main.fmf
+++ /dev/null
@@ -1,51 +0,0 @@
-summary: Try -m32 and -m64 options.
-description: ''
-contact: mcermak@redhat.com
-component:
-  - gcc
-test: ./runtest.sh
-path: /tests/Sanity/test-m32-m64-options
-framework: beakerlib
-require:
-  - gcc
-  - gcc-c++
-  - gcc-gfortran
-  - glibc-common
-  - libgcc
-  - libgomp
-  - libgfortran
-  - libstdc++
-  - libstdc++-devel
-  - glibc-devel
-  - libitm
-recommend:
-  - libgfortran44.i686
-  - libgfortran44.x86_64
-  - libgfortran4.i686
-  - libgfortran4.x86_64
-duration: 10m
-enabled: true
-link:
-  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1113429
-adjust:
-  - enabled: false
-    when: arch == ia64, ppc64, s390, s390x
-    continue: false
-  - require+:
-    - glibc-devel.i686
-    - glibc-devel.x86_64
-    - libgcc.i686
-    - libgcc.x86_64
-    - libgfortran.i686
-    - libgfortran.x86_64
-    - libgomp.i686
-    - libgomp.x86_64
-    - libitm.i686
-    - libitm.x86_64
-    - libstdc++.i686
-    - libstdc++.x86_64
-    when: arch == x86_64
-    continue: false
-extra-nitrate: TC#0197178
-extra-summary: /tools/gcc/Sanity/test-m32-m64-options
-extra-task: /tools/gcc/Sanity/test-m32-m64-options
diff --git a/tests/Sanity/test-m32-m64-options/omphello.c b/tests/Sanity/test-m32-m64-options/omphello.c
deleted file mode 100644
index 85b591f..0000000
--- a/tests/Sanity/test-m32-m64-options/omphello.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <omp.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main (void)
-{
-  int th_id;
-  int nthreads;
-
-  #pragma omp parallel private(th_id)
-  {
-    th_id = omp_get_thread_num ();
-    printf ("Hello World from thread %d\n", th_id);
-
-    #pragma omp barrier
-    if (th_id == 0)
-      {
-	nthreads = omp_get_num_threads ();
-	printf ("There are %d threads\n", nthreads);
-      }
-  }
-  return EXIT_SUCCESS;
-}
diff --git a/tests/Sanity/test-m32-m64-options/quad.c b/tests/Sanity/test-m32-m64-options/quad.c
deleted file mode 100644
index f9e5ef1..0000000
--- a/tests/Sanity/test-m32-m64-options/quad.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#include <quadmath.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-int
-main (void)
-{
-  __float128 r = strtoflt128 ("1.23456789", NULL);
-
-  int prec = 20;
-  int width = 46;
-  char buf[128];
-
-  r = 2.0q;
-  r = sqrtq (r);
-  int n = quadmath_snprintf (buf, sizeof buf, "%+-#*.20Qe", width, r);
-  if ((size_t) n < sizeof buf)
-    /* Prints: +1.41421356237309504880e+00.  */
-    printf ("%s\n", buf);
-  quadmath_snprintf (buf, sizeof buf, "%Qa", r);
-  if ((size_t) n < sizeof buf)
-    /* Prints: 0x1.6a09e667f3bcc908b2fb1366ea96p+0.  */
-    printf ("%s\n", buf);
-  n = quadmath_snprintf (NULL, 0, "%+-#46.*Qe", prec, r);
-  if (n > -1)
-    {
-      char *str = malloc (n + 1);
-      if (str)
-	{
-	  quadmath_snprintf (str, n + 1, "%+-#46.*Qe", prec, r);
-	  /* Prints: +1.41421356237309504880e+00.  */
-	  printf ("%s\n", str);
-        }
-      free (str);
-    }
-
-  return 0;
-}
diff --git a/tests/Sanity/test-m32-m64-options/runtest.sh b/tests/Sanity/test-m32-m64-options/runtest.sh
deleted file mode 100755
index 15e99af..0000000
--- a/tests/Sanity/test-m32-m64-options/runtest.sh
+++ /dev/null
@@ -1,213 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/gcc/Sanity/test-m32-m64-options
-#   Description: Try -m32 and -m64 options.
-#   Author: Marek Polacek <polacek@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# This is for Toolset.
-#
-# In this test, we try to compile and run programs using -m32 and -m64.
-# We compile C, C++ and Fortran Hello World programs.  Also, there are two 
-# proglets which are exercising some C++11 features.  Furthermore, we try
-# -fgnu-tm,  -fopenmp options.  We also use libquadmath a little bit.
-# We call a function from libgcc.  We also use the __thread keyword.
-# Everything should be ok when running under e.g.:
-#   scl enable devtoolset-1.0 bash
-# Note, that gfortran is not a part of 1.0 release.
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGES=(gcc gcc-c++ gcc-gfortran glibc-common libgcc libgomp libgfortran glibc-devel libitm)
-
-PACKAGES_X86_64=(libgomp libgfortran glibc-devel libgcc libitm)
-
-# Choose the compiler.
-GCC=${GCC:-gcc}
-GXX=${GXX:-g++}
-GFORTRAN=${GFORTRAN:-gfortran}
-
-PACKAGE=$GCC
-
-# Set the variabile UNDER_DTS on non-empty string, when run under devtoolset
-if $( echo `which gcc` | grep -qE '/opt/rh/' ); then
-  UNDER_DTS="true"
-  # Set the actual version of DTS
-  DTS=`which gcc | awk 'BEGIN { FS="/" } { print $4 }'`
-fi
-
-rlJournalStart
-  rlPhaseStartSetup
-    for p in "${PACKAGES[@]}"; do
-      rpm -q "$p" || yum install -y $p
-      rlAssertRpm "$p"
-    done; unset p
-    yum update -y libitm # this is a hack, since libitm is a troublemaker
-    if [ -n "`rlGetSecondaryArch`" ]; then
-      rlCheckRpm "libitm.`rlGetSecondaryArch`" || yum install -y libitm.`rlGetSecondaryArch`
-      rlAssertRpm "libitm.`rlGetSecondaryArch`"
-    fi
-
-    rlCheckRpm "libstdc++-devel.`rlGetPrimaryArch`" || yum install -y libstdc++-devel.`rlGetPrimaryArch`
-    rlAssertRpm "libstdc++-devel.`rlGetPrimaryArch`"
-    # RHEL-8 CI debugging hack (to be removed when not needed):
-    rlRun "rpmquery -l libstdc++-devel.`rlGetPrimaryArch` | grep -e bits/c++config"
-    rlRun "rpmquery -l libstdc++-devel.`rlGetPrimaryArch` | grep -e iostream"
-
-    if [ -n "`rlGetSecondaryArch`" ]; then
-      rlCheckRpm "libitm.`rlGetSecondaryArch`" || yum install -y libitm.`rlGetSecondaryArch`
-      rlAssertRpm "libitm.`rlGetSecondaryArch`"
-    fi
-
-    if [ ! -z ${UNDER_DTS} ]; then
-      rlCheckRpm "$DTS-libstdc++-devel" || yum install -y $DTS-libstdc++-devel
-      rlAssertRpm "$DTS-libstdc++-devel"
-      if [ "`arch`" = 'x86_64' ]; then
-        rlCheckRpm "$DTS-libquadmath-devel" || yum install -y $DTS-libquadmath-devel
-        rlAssertRpm "$DTS-libquadmath-devel"
-      fi
-      if rlIsRHEL '<=7'; then # no libgfortran[45] on RHEL8+
-        rlCheckRpm "libgfortran4" || yum install -y libgfortran4
-        if [ -n "`rlGetSecondaryArch`" ]; then
-          rlCheckRpm "libgfortran4.`rlGetSecondaryArch`" || yum install -y libgfortran4.`rlGetSecondaryArch`
-          rlAssertRpm "libgfortran4.`rlGetSecondaryArch`"
-        fi
-        rlCheckRpm "libgfortran5" || yum install -y libgfortran5
-        rlAssertRpm "libgfortran5" && yum -y update libgfortran5
-        if [ -n "`rlGetSecondaryArch`" ]; then
-          rlCheckRpm "libgfortran5.`rlGetSecondaryArch`" || yum install -y libgfortran5.`rlGetSecondaryArch`
-          rlAssertRpm "libgfortran5.`rlGetSecondaryArch`"
-        fi
-      fi
-    fi
-
-    # Check whether on rhel6 x86_64 i686-packages are installed too.
-    # On rhel5 i386-packages should be already installed.
-    if [ "$(uname -i)" == "x86_64" ]; then
-      for pack in "${PACKAGES_X86_64[@]}"; do
-        rpm -q ${pack}.i?86 || yum install -y ${pack}.i?86
-      done; unset pack
-
-      if [ ! -z ${UNDER_DTS} ]; then
-        yum install -y $DTS-libstdc++-devel.i?86
-        yum install -y $DTS-libquadmath-devel.i?86
-      fi
-    fi
-
-    rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-    # We need some files.
-    rlRun "cp -v hello.{c,cpp,f90} tm.c quad.c thr-init-2.c \
-    clear_cache.c omphello.c lambda-template.C cpp11.cpp $TmpDir"
-    rlRun "pushd $TmpDir"
-  rlPhaseEnd
-
-  rlPhaseStartSetup "Showing compiler versions"
-    for compiler in $GCC $GXX $GFORTRAN
-    do
-      rlLog "Version of compiler: $compiler"
-      eval "$compiler --version 2>&1" | while read line
-      do
-        rlLog "  $line"
-      done
-    done
-  rlPhaseEnd
-
-ARCH="$(uname -i)"
-case "$ARCH" in
-  "aarch64") export SWITCHES="-mlittle-endian" # we don't have -m64, so let's use some dummy switch that is enabled by default
-    ;;
-  "i386") export SWITCHES="-m32"
-    ;;
-  "ppc64") export SWITCHES="-m32 -m64"
-    ;;
-  "ppc64le") export SWITCHES="-m64"
-    ;;
-  "s390x") export SWITCHES="-m31 -m64"
-    ;;
-  "x86_64") export SWITCHES="-m32 -m64"
-    ;;
-esac
-
-# Always try both -m32 and -m64.
-for m in $SWITCHES; do
-  rlPhaseStartTest "Compile and run [$m]"
-    rlRun "$GCC $m hello.c -o hello_c"
-    rlRun "./hello_c"
-
-    rlRun "$GXX $m hello.cpp -o hello_cpp"
-    rlRun "./hello_cpp"
-
-    # Now try a few C++11 features.
-    $GXX -xc++ -std=c++11 - <<< "int main(){}"
-    if test $? -eq 0; then
-      rlRun "$GXX $m -std=c++11 lambda-template.C -o lambda"
-      rlRun "./lambda"
-
-      rlRun "$GXX $m -std=c++11 cpp11.cpp -o cpp11"
-      rlRun "./cpp11"
-    fi
-
-    rlRun "$GFORTRAN $m hello.f90 -o hello_fortran"
-    rlRun "./hello_fortran"
-
-    # TM support is GCC >=4.7 only.
-    $GCC -xc -O2 -std=gnu99 -fgnu-tm - <<< "int main(){}"
-    if test $? -eq 0; then
-	rlRun "$GCC $m -O2 -std=gnu99 -fgnu-tm tm.c -o tm"
-	rlRun "./tm"
-    fi
-
-    # Test OpenMP.
-    rlRun "$GCC $m omphello.c -O2 -std=gnu99 -fopenmp -o omp"
-    rlRun "./omp"
-
-    # Test __thread.
-    rlRun "$GCC $m thr-init-2.c -O2 -std=gnu99 -ftls-model=initial-exec -o thr" 
-    rlRun "./thr"
-
-    # Now test some libquadmath stuff (__float128 support).
-    # libquadmath is mising on RHEL machines, usually.
-    # But with DTS, this should be available.
-    if [ ! -z ${UNDER_DTS} ]; then
-      if [ "`arch`" = 'x86_64' ]; then
-        rlRun "$GCC $m quad.c -O2 -std=gnu99 -lquadmath -o quad -lm"
-        rlRun "./quad"
-      else
-        rlLog "quadmath test skipped (needs x86_64)"
-      fi
-    fi
-
-    # And now something from libgcc, e.g. __builtin___clear_cache.
-    rlRun "$GCC $m clear_cache.c -O2 -std=gnu99 -o cache"
-    rlRun "./cache"
-  rlPhaseEnd
-done; unset m
-
-  rlPhaseStartCleanup
-    rlRun "popd"
-    rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-  rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Sanity/test-m32-m64-options/thr-init-2.c b/tests/Sanity/test-m32-m64-options/thr-init-2.c
deleted file mode 100644
index 5b70dd2..0000000
--- a/tests/Sanity/test-m32-m64-options/thr-init-2.c
+++ /dev/null
@@ -1,20 +0,0 @@
-extern void abort() ;
-
-static __thread int fstat ;
-static __thread int fstat = 1;
-
-int test_code(int b)
-{
-  fstat += b ;
-  return fstat;
-}
-
-int main (int ac, char *av[])
-{
-  int a = test_code(1);
-
-  if ((a != 2) || (fstat != 2))
-    abort () ;
-
-  return 0;
-}
diff --git a/tests/Sanity/test-m32-m64-options/tm.c b/tests/Sanity/test-m32-m64-options/tm.c
deleted file mode 100644
index 92b90db..0000000
--- a/tests/Sanity/test-m32-m64-options/tm.c
+++ /dev/null
@@ -1,34 +0,0 @@
-extern void *malloc (__SIZE_TYPE__) __attribute__((malloc,transaction_safe));
-
-static int __attribute__((transaction_safe))
-something (void)
-{
-  return 0;
-}
-
-struct large { int foo[500]; };
-
-int
-main (void)
-{
-  int *p;
-  struct large *lp;
-
-  __transaction_atomic {
-    p = malloc (sizeof (*p) * 100);
-    lp = malloc (sizeof (*lp) * 100);
-
-    /* No instrumentation necessary; P and LP are transaction local.  */
-    p[5] = 123;
-    lp->foo[66] = 123;
-
-    if (something ())
-      __transaction_cancel;
-  }
-
-  __transaction_relaxed {
-    ++p[5];
-  }
-
-  return ((p[5] == 124) ? 0 : 1);
-}
diff --git a/tests/fedora-flags/hello.c b/tests/fedora-flags/hello.c
deleted file mode 100644
index 51b259b..0000000
--- a/tests/fedora-flags/hello.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <stdio.h>
-
-void hello() {
-  printf("Hello World\n");
-}
diff --git a/tests/fedora-flags/hello.cpp b/tests/fedora-flags/hello.cpp
deleted file mode 100644
index 400612b..0000000
--- a/tests/fedora-flags/hello.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <iostream>
-
-void hello() {
-  std::cout << "Hello World\n";
-}
diff --git a/tests/fedora-flags/main.c b/tests/fedora-flags/main.c
deleted file mode 100644
index 1a3455d..0000000
--- a/tests/fedora-flags/main.c
+++ /dev/null
@@ -1,6 +0,0 @@
-void hello();
-
-int main(int argc, char **argv) {
-  hello();
-  return 0;
-}
diff --git a/tests/fedora-flags/main.cpp b/tests/fedora-flags/main.cpp
deleted file mode 100644
index 1a3455d..0000000
--- a/tests/fedora-flags/main.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-void hello();
-
-int main(int argc, char **argv) {
-  hello();
-  return 0;
-}
diff --git a/tests/fedora-flags/main.fmf b/tests/fedora-flags/main.fmf
deleted file mode 100644
index 43934a7..0000000
--- a/tests/fedora-flags/main.fmf
+++ /dev/null
@@ -1,10 +0,0 @@
-summary: Test compiling with the Fedora C/CXX flags.
-description: ''
-component:
-  - gcc
-test: ./runtest.sh
-require:
-  - annobin-annocheck
-  - gcc
-  - gcc-c++
-  - redhat-rpm-config
diff --git a/tests/fedora-flags/runtest.sh b/tests/fedora-flags/runtest.sh
deleted file mode 100755
index 01b656b..0000000
--- a/tests/fedora-flags/runtest.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-default_cflags=$(rpm -E '%{build_cflags}')
-default_cxxflags=$(rpm -E '%{build_cxxflags}')
-default_ldflags=$(rpm -E '%{build_ldflags}')
-
-cflags=$(rpm -D '%toolchain gcc' -E '%{build_cflags}')
-cxxflags=$(rpm -D '%toolchain gcc' -E '%{build_cxxflags}')
-ldflags=$(rpm -D '%toolchain gcc' -E '%{build_ldflags}')
-
-test "$default_cflags" = "$cflags"
-test "$default_cxxflags" = "$cxxflags"
-test "$default_ldflags" = "$ldflags"
-
-gcc $cflags -o hello.o -c hello.c
-annocheck hello.o
-gcc $cflags -o main.o -c main.c
-gcc $ldflags -o hello main.o hello.o
-annocheck hello
-./hello | grep "Hello World"
-
-g++ $cxxflags -o hello-cpp.o -c hello.cpp
-annocheck hello-cpp.o
-g++ $cxxflags -o main-cpp.o -c main.cpp
-g++ $ldflags -o hello-cpp main-cpp.o hello-cpp.o
-annocheck hello-cpp
-./hello-cpp | grep "Hello World"
diff --git a/tests/smoke-test/Makefile b/tests/smoke-test/Makefile
deleted file mode 100644
index fb46790..0000000
--- a/tests/smoke-test/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /tools/gcc/Sanity/smoke-test
-#   Description: Basic smoke test.
-#   Author: Marek Polacek <polacek@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/tools/gcc/Sanity/smoke-test
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE hello.c hello.f90 hello.cpp tm.c quad.c omphello.c thr-init-2.c clear_cache.c
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	test -x runtest.sh || chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Marek Polacek <mpolacek@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     Basic smoke test." >> $(METADATA)
-	@echo "Type:            Sanity" >> $(METADATA)
-	@echo "TestTime:        10m" >> $(METADATA)
-	@echo "RunFor:          gcc" >> $(METADATA)
-	@echo "RunFor:          devtoolset-1.0-gcc" >> $(METADATA)
-	@echo "Requires:        gcc gcc-c++ gcc-gfortran glibc-common glibc-devel" >> $(METADATA)
-	@echo "Requires:        libquadmath libquadmath-devel libgomp libgcc libstdc++-devel" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-
-	rhts-lint $(METADATA)
diff --git a/tests/smoke-test/PURPOSE b/tests/smoke-test/PURPOSE
deleted file mode 100644
index 912f7b4..0000000
--- a/tests/smoke-test/PURPOSE
+++ /dev/null
@@ -1,3 +0,0 @@
-PURPOSE of /tools/gcc/Sanity/smoke-test
-Description: Basic smoke test.
-Author: Marek Polacek <polacek@redhat.com>
diff --git a/tests/smoke-test/clear_cache.c b/tests/smoke-test/clear_cache.c
deleted file mode 100644
index b10479f..0000000
--- a/tests/smoke-test/clear_cache.c
+++ /dev/null
@@ -1,7 +0,0 @@
-int
-main (void)
-{
-  char *mem = __builtin_alloca (40);
-  __builtin___clear_cache (mem, mem + 40);
-  return 0;
-}
diff --git a/tests/smoke-test/hello.c b/tests/smoke-test/hello.c
deleted file mode 100644
index 4096e11..0000000
--- a/tests/smoke-test/hello.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdio.h>
-
-int
-main (void)
-{
-  puts ("Hello World!");
-}
diff --git a/tests/smoke-test/hello.cpp b/tests/smoke-test/hello.cpp
deleted file mode 100644
index 0f2234e..0000000
--- a/tests/smoke-test/hello.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <iostream>
-
-int
-main (void)
-{
- std::cout << "Hello, world!\n";
-}
diff --git a/tests/smoke-test/hello.f90 b/tests/smoke-test/hello.f90
deleted file mode 100644
index afabbb2..0000000
--- a/tests/smoke-test/hello.f90
+++ /dev/null
@@ -1,3 +0,0 @@
-       program hello
-          print *, "Hello World!"
-       end program hello
diff --git a/tests/smoke-test/main.fmf b/tests/smoke-test/main.fmf
deleted file mode 100644
index 3710ca3..0000000
--- a/tests/smoke-test/main.fmf
+++ /dev/null
@@ -1,22 +0,0 @@
-summary: Basic smoke test.
-description: ''
-contact:
-- Marek Polacek <mpolacek@redhat.com>
-component:
-- gcc
-test: ./runtest.sh
-framework: beakerlib
-recommend:
-- gcc
-- gcc-c++
-- gcc-gfortran
-- glibc-common
-- glibc-devel
-- libquadmath
-- libquadmath-devel
-- libgomp
-- libgcc
-- libstdc++-devel
-duration: 10m
-extra-summary: /tools/gcc/Sanity/smoke-test
-extra-task: /tools/gcc/Sanity/smoke-test
diff --git a/tests/smoke-test/omphello.c b/tests/smoke-test/omphello.c
deleted file mode 100644
index 85b591f..0000000
--- a/tests/smoke-test/omphello.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <omp.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main (void)
-{
-  int th_id;
-  int nthreads;
-
-  #pragma omp parallel private(th_id)
-  {
-    th_id = omp_get_thread_num ();
-    printf ("Hello World from thread %d\n", th_id);
-
-    #pragma omp barrier
-    if (th_id == 0)
-      {
-	nthreads = omp_get_num_threads ();
-	printf ("There are %d threads\n", nthreads);
-      }
-  }
-  return EXIT_SUCCESS;
-}
diff --git a/tests/smoke-test/quad.c b/tests/smoke-test/quad.c
deleted file mode 100644
index e5a6cc7..0000000
--- a/tests/smoke-test/quad.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#include <quadmath.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-int
-main (void)
-{
-  __float128 r = strtoflt128 ("1.23456789", NULL);
-
-  int prec = 20;
-  int width = 46;
-  char buf[128];
-
-  r = 2.0q;
-  r = sqrtq (r);
-  int n = quadmath_snprintf (buf, sizeof buf, "%+-#*.20Qe", width, r);
-  if ((size_t) n < sizeof buf)
-    /* Prints: +1.41421356237309504880e+00 */
-    printf ("%s\n", buf);
-  quadmath_snprintf (buf, sizeof buf, "%Qa", r);
-  if ((size_t) n < sizeof buf)
-    /* Prints: 0x1.6a09e667f3bcc908b2fb1366ea96p+0 */
-    printf ("%s\n", buf);
-  n = quadmath_snprintf (NULL, 0, "%+-#46.*Qe", prec, r);
-  if (n > -1)
-    {
-      char *str = malloc (n + 1);
-      if (str)
-	{
-	  quadmath_snprintf (str, n + 1, "%+-#46.*Qe", prec, r);
-	  /* Prints: +1.41421356237309504880e+00 */
-	  printf ("%s\n", str);
-        }
-      free (str);
-    }
-
-  return 0;
-}
diff --git a/tests/smoke-test/runtest.sh b/tests/smoke-test/runtest.sh
deleted file mode 100755
index 78fda72..0000000
--- a/tests/smoke-test/runtest.sh
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/gcc/Sanity/smoke-test
-#   Description: Basic smoke test.
-#   Author: Marek Polacek <polacek@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGES=(gcc gcc-c++ gcc-gfortran glibc-common libgomp libgcc glibc-devel libstdc++ libstdc++-devel)
-
-# Choose the compiler.
-GCC=${GCC:-gcc}
-GXX=${GXX:-g++}
-GFORTRAN=${GFORTRAN:-gfortran}
-
-PACKAGE=gcc
-
-rlJournalStart
-  rlPhaseStartSetup
-    export PRI_ARCH=`rlGetPrimaryArch`
-    export SEC_ARCH=`rlGetSecondaryArch`
-    # don't assert anything under devtoolset
-    if type gcc | grep -q -v devtoolset
-    then
-      for p in "${PACKAGES[@]}"; do
-        rpm -q "$p.$PRI_ARCH" || yum install -y "$p.$PRI_ARCH"
-        rlAssertRpm "$p.$PRI_ARCH"
-      done; unset p
-    fi
-    rlLog "GCC = $GCC"
-    rlLog "Installed within `rpmquery -f $(which $GCC)`"
-    rlLog "GXX = $GXX"
-    rlLog "Installed within `rpmquery -f $(which $GXX)`"
-    rlLog "GFORTRAN = $GFORTRAN"
-    rlLog "Installed within `rpmquery -f $(which $GFORTRAN)`"
-    rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-    # We need some files.
-    rlRun "cp -v hello.{c,cpp,f90} tm.c quad.c thr-init-2.c clear_cache.c omphello.c $TmpDir"
-    rlRun "pushd $TmpDir"
-    rlRun "rpmquery -l libstdc++-devel.$PRI_ARCH"
-    test -n "$SEC_ARCH" && rpmquery "libstdc++-devel.$SEC_ARCH" && rlRun "rpmquery -l libstdc++-devel.$SEC_ARCH"
-  rlPhaseEnd
-
-  rlPhaseStartSetup "Showing compiler versions"
-    for compiler in $GCC $GXX $GFORTRAN
-    do
-      rlLog "Version of compiler: $compiler"
-      eval "$compiler --version 2>&1" | while read line
-      do
-        rlLog "  $line"
-      done
-    done
-  rlPhaseEnd
-
-  rlPhaseStartTest "Compile"
-    rlRun "$GCC hello.c -o hello_c"
-    rlRun "$GXX hello.cpp -o hello_cpp"
-    rlRun "$GFORTRAN hello.f90 -o hello_fortran"
-
-    # TM support is GCC >=4.7 only.
-    $GCC -xc -O2 -std=gnu99 -fgnu-tm - <<< "int main(){}"
-    if test $? -eq 0; then
-      rlRun "$GCC -O2 -std=gnu99 -fgnu-tm tm.c -o tm"
-      rlRun "./tm"
-    fi
-
-    # Test OpenMP.
-    rlRun "$GCC omphello.c -O2 -std=gnu99 -fopenmp -o omp"
-    rlRun "./omp"
-
-    # Test __thread.
-    rlRun "$GCC thr-init-2.c -O2 -std=gnu99 -ftls-model=initial-exec -o thr" 
-    rlRun "./thr"
-
-    # Now test some libquadmath stuff (__float128 support).
-    # libquadmath is mising on RHEL machines, usually.
-    test "`rpmquery --qf '%{version}-%{release}' libquadmath`" = "`rpmquery --qf '%{version}-%{release}' $GCC`"
-    if test $? -eq 0 -a "$GCC" = "gcc"; then
-      rlRun "$GCC quad.c -O2 -std=gnu99 -lquadmath -lm -o quad"
-      rlRun "./quad"
-    fi
-
-    # And now something from libgcc, e.g. __builtin___clear_cache.
-    # But not on RHEL5.
-    if ! rlIsRHEL 5; then
-      rlRun "$GCC clear_cache.c -O2 -std=gnu99 -o cache"
-	  rlRun "./cache"
-    fi
-  rlPhaseEnd
-
-  rlPhaseStartTest "Check dependant libraries"
-    rlRun "ldd hello_{c,cpp,fortran} &> ldd.out"
-    # Nothing should be linked against anything in /opt.
-    rlAssertNotGrep "/opt" ldd.out
-  rlPhaseEnd
-
-  rlPhaseStartCleanup
-    rlRun "popd"
-    rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-  rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/smoke-test/thr-init-2.c b/tests/smoke-test/thr-init-2.c
deleted file mode 100644
index 051cff9..0000000
--- a/tests/smoke-test/thr-init-2.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* { dg-do run } */
-/* { dg-require-effective-target tls_runtime } */
-/* { dg-add-options tls } */
-
-extern void abort() ;
-
-static __thread int fstat ;
-static __thread int fstat = 1;
-
-int test_code(int b)
-{
-  fstat += b ;
-  return fstat;
-}
-
-int main (int ac, char *av[])
-{
-  int a = test_code(1);
-
-  if ((a != 2) || (fstat != 2))
-    abort () ;
-
-  return 0;
-}
diff --git a/tests/smoke-test/tm.c b/tests/smoke-test/tm.c
deleted file mode 100644
index f9b4c9b..0000000
--- a/tests/smoke-test/tm.c
+++ /dev/null
@@ -1,34 +0,0 @@
-extern void *malloc (__SIZE_TYPE__) __attribute__((malloc,transaction_safe));
-
-static int __attribute__((transaction_safe))
-something (void)
-{
-  return 0;
-}
-
-struct large { int foo[500]; };
-
-int
-main (void)
-{
-  int *p;
-  struct large *lp;
-
-  __transaction_atomic {
-    p = malloc (sizeof (*p) * 100);
-    lp = malloc (sizeof (*lp) * 100);
-
-    /* No instrumentation necessary; P and LP are transaction local.  */
-    p[5] = 123;
-    lp->foo[66] = 123;
-
-    if (something ())
-      __transaction_cancel;
-  }
-
-  __transaction_relaxed {
-    ++p[5];
-  }
-
-  return ( (p[5] == 124) ? 0 : 1 );
-}
diff --git a/update-gcc.sh b/update-gcc.sh
index d34d6ce..47d7d70 100755
--- a/update-gcc.sh
+++ b/update-gcc.sh
@@ -1,7 +1,36 @@
 #!/bin/sh
-[ -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
+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=`date --iso | sed 's/-//g'`
-git --git-dir=gcc-dir.tmp/.git archive --prefix=gcc-12.2.1-$d/ $1 | xz -9e > gcc-12.2.1-$d.tar.xz
+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
 rm -rf gcc-dir.tmp
+fedpkg new-sources gcc-$v-$d.tar.xz `sed 's/SHA512 (\(.*\)) = [0-9a-f]\+$/\1/' sources | grep -v '^gcc-'`