From 2ebb7c9de426316dc568d08b30ba15902fc3d0a7 Mon Sep 17 00:00:00 2001
From: rguenther <>
Date: Jun 11 2025 14:57:35 +0000
Subject: Update gcc13 to version 13.4.0+git9739 / rev 36 via SR 1283431


https://build.opensuse.org/request/show/1283431
by user rguenther + anag_factory
- Update to GCC 13.4 release
  * collects regression fixes from the last year
- Remove hppa icecream backend to avoid conflicts with the
  hppa bootstrap compiler

- Re-enable AutoReqProv for cross packages but filter files processed
  via __requires_exclude_from and __provides_exclude_from.
  [boo#1219031]
- Exclude shared objects present for link editing in the GCC specific
  subdirectory from provides processing via __provides_exclude_from.
  [bsc#1244050][bsc#1243991]

- Make cross-*-gcc13-bootstrap package conflict with the non-bootstrap
  variant conflict with the unversioned cross-*-gcc package.

- Update to gcc-13 branch head, ec78a0d9962f144b13c6da3ebe, git9730
  * GCC 13.4 RC2
  * Includes gcc13-bsc1216664.patch

---

diff --git a/.files b/.files
index e68a736..a285fb3 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 4044210..a6e6835 100644
--- a/.rev
+++ b/.rev
@@ -429,4 +429,29 @@
   script.  [bsc#1241549]</comment>
     <requestid>1271908</requestid>
   </revision>
+  <revision rev="36" vrev="1">
+    <srcmd5>6fc9ee646f439a72a395cee9c4ea0132</srcmd5>
+    <version>13.4.0+git9739</version>
+    <time>1749651653</time>
+    <user>anag_factory</user>
+    <comment>- Update to GCC 13.4 release
+  * collects regression fixes from the last year
+- Remove hppa icecream backend to avoid conflicts with the
+  hppa bootstrap compiler
+
+- Re-enable AutoReqProv for cross packages but filter files processed
+  via __requires_exclude_from and __provides_exclude_from.
+  [boo#1219031]
+- Exclude shared objects present for link editing in the GCC specific
+  subdirectory from provides processing via __provides_exclude_from.
+  [bsc#1244050][bsc#1243991]
+
+- Make cross-*-gcc13-bootstrap package conflict with the non-bootstrap
+  variant conflict with the unversioned cross-*-gcc package.
+
+- Update to gcc-13 branch head, ec78a0d9962f144b13c6da3ebe, git9730
+  * GCC 13.4 RC2
+  * Includes gcc13-bsc1216664.patch</comment>
+    <requestid>1283431</requestid>
+  </revision>
 </revisionlist>
diff --git a/_multibuild b/_multibuild
index 70ae82d..b70fde0 100644
--- a/_multibuild
+++ b/_multibuild
@@ -20,7 +20,6 @@
 <flavor>cross-m68k-gcc13</flavor>
 <flavor>cross-mips-gcc13</flavor>
 <flavor>cross-hppa-gcc13-bootstrap</flavor>
-<flavor>cross-hppa-gcc13</flavor>
 <flavor>cross-arm-none-gcc13-bootstrap</flavor>
 <flavor>cross-arm-none-gcc13</flavor>
 <flavor>cross-riscv64-elf-gcc13-bootstrap</flavor>
diff --git a/change_spec b/change_spec
index f90fec3..dfc066c 100644
--- a/change_spec
+++ b/change_spec
@@ -113,7 +113,6 @@ add_cross cross-ppc64-gcc$base_ver ppc64 powerpc64-suse-linux %define gcc_icecre
 add_cross cross-m68k-gcc$base_ver m68k m68k-suse-linux %define gcc_icecream 1
 add_cross cross-mips-gcc$base_ver mips mips-suse-linux %define gcc_icecream 1
 add_cross cross-hppa-gcc$base_ver-bootstrap hppa hppa-suse-linux %define gcc_libc_bootstrap 1
-add_cross cross-hppa-gcc$base_ver hppa hppa-suse-linux %define gcc_icecream 1
 add_newlib_cross cross-arm-none-gcc$base_ver arm-none arm-none-eabi
 #add_newlib_cross cross-epiphany-gcc$base_ver epiphany epiphany-elf
 #add_newlib_cross cross-nds32le-gcc$base_ver nds32le nds32le-elf
diff --git a/cross-aarch64-gcc13-bootstrap.spec b/cross-aarch64-gcc13-bootstrap.spec
index 5cd9d41..23182d2 100644
--- a/cross-aarch64-gcc13-bootstrap.spec
+++ b/cross-aarch64-gcc13-bootstrap.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -134,7 +134,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -293,7 +292,7 @@ ExclusiveArch:  i586 ppc64le ppc64 x86_64 s390x  riscv64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
+%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1} || "%{cross_arch}" == "avr"
 # Generally only one cross for the same target triplet can be installed
 # at the same time as we are populating a non-version-specific sysroot
 Provides:       %{gcc_target_arch}-gcc
@@ -303,7 +302,7 @@ Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 # The -bootstrap packages file-conflict with the non-bootstrap variants.
 # Even if we don't actually (want to) distribute the bootstrap variants
 # the following avoids repo-checker spamming us endlessly.
-Conflicts:      cross-%{cross_arch}-gcc13
+Conflicts:      %{gcc_target_arch}-gcc
 %endif
 #!BuildIgnore: gcc-PIE
 %if 0%{build_cp:1}
@@ -312,7 +311,6 @@ Conflicts:      cross-%{cross_arch}-gcc13
 # the libs, though)
 Requires:       libstdc++6-devel-gcc13
 %endif
-AutoReqProv:    off
 %if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
@@ -365,7 +363,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -836,6 +833,9 @@ Newlib development files for the amdgcn offload target compiler.
 
 %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
 
+%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+
 %install
 cd obj-%{GCCDIST}
 
diff --git a/cross-aarch64-gcc13.spec b/cross-aarch64-gcc13.spec
index b75dfa0..c47d4d6 100644
--- a/cross-aarch64-gcc13.spec
+++ b/cross-aarch64-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -134,7 +134,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -293,7 +292,7 @@ ExclusiveArch:  i586 ppc64le ppc64 x86_64 s390x  riscv64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
+%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1} || "%{cross_arch}" == "avr"
 # Generally only one cross for the same target triplet can be installed
 # at the same time as we are populating a non-version-specific sysroot
 Provides:       %{gcc_target_arch}-gcc
@@ -303,7 +302,7 @@ Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 # The -bootstrap packages file-conflict with the non-bootstrap variants.
 # Even if we don't actually (want to) distribute the bootstrap variants
 # the following avoids repo-checker spamming us endlessly.
-Conflicts:      cross-%{cross_arch}-gcc13
+Conflicts:      %{gcc_target_arch}-gcc
 %endif
 #!BuildIgnore: gcc-PIE
 %if 0%{build_cp:1}
@@ -312,7 +311,6 @@ Conflicts:      cross-%{cross_arch}-gcc13
 # the libs, though)
 Requires:       libstdc++6-devel-gcc13
 %endif
-AutoReqProv:    off
 %if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
@@ -365,7 +363,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -836,6 +833,9 @@ Newlib development files for the amdgcn offload target compiler.
 
 %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
 
+%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+
 %install
 cd obj-%{GCCDIST}
 
diff --git a/cross-amdgcn-gcc13.spec b/cross-amdgcn-gcc13.spec
index 627769b..a3056e2 100644
--- a/cross-amdgcn-gcc13.spec
+++ b/cross-amdgcn-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -134,7 +134,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -293,7 +292,7 @@ ExclusiveArch:  i586 ppc64le ppc64 x86_64 s390x aarch64 riscv64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
+%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1} || "%{cross_arch}" == "avr"
 # Generally only one cross for the same target triplet can be installed
 # at the same time as we are populating a non-version-specific sysroot
 Provides:       %{gcc_target_arch}-gcc
@@ -303,7 +302,7 @@ Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 # The -bootstrap packages file-conflict with the non-bootstrap variants.
 # Even if we don't actually (want to) distribute the bootstrap variants
 # the following avoids repo-checker spamming us endlessly.
-Conflicts:      cross-%{cross_arch}-gcc13
+Conflicts:      %{gcc_target_arch}-gcc
 %endif
 #!BuildIgnore: gcc-PIE
 %if 0%{build_cp:1}
@@ -312,7 +311,6 @@ Conflicts:      cross-%{cross_arch}-gcc13
 # the libs, though)
 Requires:       libstdc++6-devel-gcc13
 %endif
-AutoReqProv:    off
 %if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
@@ -365,7 +363,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -836,6 +833,9 @@ Newlib development files for the amdgcn offload target compiler.
 
 %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
 
+%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+
 %install
 cd obj-%{GCCDIST}
 
diff --git a/cross-arm-gcc13.spec b/cross-arm-gcc13.spec
index 02374a9..1e62c19 100644
--- a/cross-arm-gcc13.spec
+++ b/cross-arm-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -134,7 +134,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -293,7 +292,7 @@ ExclusiveArch:  i586 ppc64le ppc64 x86_64 s390x aarch64 riscv64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
+%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1} || "%{cross_arch}" == "avr"
 # Generally only one cross for the same target triplet can be installed
 # at the same time as we are populating a non-version-specific sysroot
 Provides:       %{gcc_target_arch}-gcc
@@ -303,7 +302,7 @@ Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 # The -bootstrap packages file-conflict with the non-bootstrap variants.
 # Even if we don't actually (want to) distribute the bootstrap variants
 # the following avoids repo-checker spamming us endlessly.
-Conflicts:      cross-%{cross_arch}-gcc13
+Conflicts:      %{gcc_target_arch}-gcc
 %endif
 #!BuildIgnore: gcc-PIE
 %if 0%{build_cp:1}
@@ -312,7 +311,6 @@ Conflicts:      cross-%{cross_arch}-gcc13
 # the libs, though)
 Requires:       libstdc++6-devel-gcc13
 %endif
-AutoReqProv:    off
 %if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
@@ -365,7 +363,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -836,6 +833,9 @@ Newlib development files for the amdgcn offload target compiler.
 
 %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
 
+%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+
 %install
 cd obj-%{GCCDIST}
 
diff --git a/cross-arm-none-gcc13-bootstrap.spec b/cross-arm-none-gcc13-bootstrap.spec
index 3e8cee0..5f7751d 100644
--- a/cross-arm-none-gcc13-bootstrap.spec
+++ b/cross-arm-none-gcc13-bootstrap.spec
@@ -108,7 +108,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -135,7 +135,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -294,7 +293,7 @@ ExclusiveArch:  i586 ppc64le ppc64 x86_64 s390x aarch64 riscv64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
+%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1} || "%{cross_arch}" == "avr"
 # Generally only one cross for the same target triplet can be installed
 # at the same time as we are populating a non-version-specific sysroot
 Provides:       %{gcc_target_arch}-gcc
@@ -304,7 +303,7 @@ Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 # The -bootstrap packages file-conflict with the non-bootstrap variants.
 # Even if we don't actually (want to) distribute the bootstrap variants
 # the following avoids repo-checker spamming us endlessly.
-Conflicts:      cross-%{cross_arch}-gcc13
+Conflicts:      %{gcc_target_arch}-gcc
 %endif
 #!BuildIgnore: gcc-PIE
 %if 0%{build_cp:1}
@@ -313,7 +312,6 @@ Conflicts:      cross-%{cross_arch}-gcc13
 # the libs, though)
 Requires:       libstdc++6-devel-gcc13
 %endif
-AutoReqProv:    off
 %if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
@@ -366,7 +364,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -837,6 +834,9 @@ Newlib development files for the amdgcn offload target compiler.
 
 %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
 
+%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+
 %install
 cd obj-%{GCCDIST}
 
diff --git a/cross-arm-none-gcc13.spec b/cross-arm-none-gcc13.spec
index 6cf6abe..7aa9a98 100644
--- a/cross-arm-none-gcc13.spec
+++ b/cross-arm-none-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -134,7 +134,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -293,7 +292,7 @@ ExclusiveArch:  i586 ppc64le ppc64 x86_64 s390x aarch64 riscv64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
+%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1} || "%{cross_arch}" == "avr"
 # Generally only one cross for the same target triplet can be installed
 # at the same time as we are populating a non-version-specific sysroot
 Provides:       %{gcc_target_arch}-gcc
@@ -303,7 +302,7 @@ Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 # The -bootstrap packages file-conflict with the non-bootstrap variants.
 # Even if we don't actually (want to) distribute the bootstrap variants
 # the following avoids repo-checker spamming us endlessly.
-Conflicts:      cross-%{cross_arch}-gcc13
+Conflicts:      %{gcc_target_arch}-gcc
 %endif
 #!BuildIgnore: gcc-PIE
 %if 0%{build_cp:1}
@@ -312,7 +311,6 @@ Conflicts:      cross-%{cross_arch}-gcc13
 # the libs, though)
 Requires:       libstdc++6-devel-gcc13
 %endif
-AutoReqProv:    off
 %if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
@@ -365,7 +363,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -836,6 +833,9 @@ Newlib development files for the amdgcn offload target compiler.
 
 %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
 
+%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+
 %install
 cd obj-%{GCCDIST}
 
diff --git a/cross-avr-gcc13-bootstrap.spec b/cross-avr-gcc13-bootstrap.spec
index a10bff4..8544721 100644
--- a/cross-avr-gcc13-bootstrap.spec
+++ b/cross-avr-gcc13-bootstrap.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -134,7 +134,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -293,7 +292,7 @@ ExclusiveArch:  i586 ppc64le ppc64 x86_64 s390x aarch64 riscv64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
+%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1} || "%{cross_arch}" == "avr"
 # Generally only one cross for the same target triplet can be installed
 # at the same time as we are populating a non-version-specific sysroot
 Provides:       %{gcc_target_arch}-gcc
@@ -303,7 +302,7 @@ Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 # The -bootstrap packages file-conflict with the non-bootstrap variants.
 # Even if we don't actually (want to) distribute the bootstrap variants
 # the following avoids repo-checker spamming us endlessly.
-Conflicts:      cross-%{cross_arch}-gcc13
+Conflicts:      %{gcc_target_arch}-gcc
 %endif
 #!BuildIgnore: gcc-PIE
 %if 0%{build_cp:1}
@@ -312,7 +311,6 @@ Conflicts:      cross-%{cross_arch}-gcc13
 # the libs, though)
 Requires:       libstdc++6-devel-gcc13
 %endif
-AutoReqProv:    off
 %if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
@@ -365,7 +363,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -836,6 +833,9 @@ Newlib development files for the amdgcn offload target compiler.
 
 %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
 
+%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+
 %install
 cd obj-%{GCCDIST}
 
diff --git a/cross-avr-gcc13.spec b/cross-avr-gcc13.spec
index d96734a..3b143fa 100644
--- a/cross-avr-gcc13.spec
+++ b/cross-avr-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -134,7 +134,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -293,7 +292,7 @@ ExclusiveArch:  i586 ppc64le ppc64 x86_64 s390x aarch64 riscv64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
+%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1} || "%{cross_arch}" == "avr"
 # Generally only one cross for the same target triplet can be installed
 # at the same time as we are populating a non-version-specific sysroot
 Provides:       %{gcc_target_arch}-gcc
@@ -303,7 +302,7 @@ Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 # The -bootstrap packages file-conflict with the non-bootstrap variants.
 # Even if we don't actually (want to) distribute the bootstrap variants
 # the following avoids repo-checker spamming us endlessly.
-Conflicts:      cross-%{cross_arch}-gcc13
+Conflicts:      %{gcc_target_arch}-gcc
 %endif
 #!BuildIgnore: gcc-PIE
 %if 0%{build_cp:1}
@@ -312,7 +311,6 @@ Conflicts:      cross-%{cross_arch}-gcc13
 # the libs, though)
 Requires:       libstdc++6-devel-gcc13
 %endif
-AutoReqProv:    off
 %if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
@@ -365,7 +363,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -836,6 +833,9 @@ Newlib development files for the amdgcn offload target compiler.
 
 %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
 
+%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+
 %install
 cd obj-%{GCCDIST}
 
diff --git a/cross-bpf-gcc13.spec b/cross-bpf-gcc13.spec
index 84e051f..27615a4 100644
--- a/cross-bpf-gcc13.spec
+++ b/cross-bpf-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -134,7 +134,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -293,7 +292,7 @@ ExclusiveArch:  i586 ppc64le ppc64 x86_64 s390x aarch64 riscv64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
+%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1} || "%{cross_arch}" == "avr"
 # Generally only one cross for the same target triplet can be installed
 # at the same time as we are populating a non-version-specific sysroot
 Provides:       %{gcc_target_arch}-gcc
@@ -303,7 +302,7 @@ Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 # The -bootstrap packages file-conflict with the non-bootstrap variants.
 # Even if we don't actually (want to) distribute the bootstrap variants
 # the following avoids repo-checker spamming us endlessly.
-Conflicts:      cross-%{cross_arch}-gcc13
+Conflicts:      %{gcc_target_arch}-gcc
 %endif
 #!BuildIgnore: gcc-PIE
 %if 0%{build_cp:1}
@@ -312,7 +311,6 @@ Conflicts:      cross-%{cross_arch}-gcc13
 # the libs, though)
 Requires:       libstdc++6-devel-gcc13
 %endif
-AutoReqProv:    off
 %if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
@@ -365,7 +363,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -836,6 +833,9 @@ Newlib development files for the amdgcn offload target compiler.
 
 %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
 
+%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+
 %install
 cd obj-%{GCCDIST}
 
diff --git a/cross-hppa-gcc13-bootstrap.spec b/cross-hppa-gcc13-bootstrap.spec
index 036908d..92929e4 100644
--- a/cross-hppa-gcc13-bootstrap.spec
+++ b/cross-hppa-gcc13-bootstrap.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -134,7 +134,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -293,7 +292,7 @@ ExclusiveArch:  i586 ppc64le ppc64 x86_64 s390x aarch64 riscv64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
+%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1} || "%{cross_arch}" == "avr"
 # Generally only one cross for the same target triplet can be installed
 # at the same time as we are populating a non-version-specific sysroot
 Provides:       %{gcc_target_arch}-gcc
@@ -303,7 +302,7 @@ Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 # The -bootstrap packages file-conflict with the non-bootstrap variants.
 # Even if we don't actually (want to) distribute the bootstrap variants
 # the following avoids repo-checker spamming us endlessly.
-Conflicts:      cross-%{cross_arch}-gcc13
+Conflicts:      %{gcc_target_arch}-gcc
 %endif
 #!BuildIgnore: gcc-PIE
 %if 0%{build_cp:1}
@@ -312,7 +311,6 @@ Conflicts:      cross-%{cross_arch}-gcc13
 # the libs, though)
 Requires:       libstdc++6-devel-gcc13
 %endif
-AutoReqProv:    off
 %if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
@@ -365,7 +363,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -836,6 +833,9 @@ Newlib development files for the amdgcn offload target compiler.
 
 %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
 
+%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+
 %install
 cd obj-%{GCCDIST}
 
diff --git a/cross-hppa-gcc13.spec b/cross-hppa-gcc13.spec
deleted file mode 100644
index b8678a8..0000000
--- a/cross-hppa-gcc13.spec
+++ /dev/null
@@ -1,1086 +0,0 @@
-#
-# spec file for package cross-hppa-gcc13
-#
-# Copyright (c) 2025 SUSE LLC
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
-#
-
-
-%define pkgname cross-hppa-gcc13
-%define cross_arch hppa
-%define gcc_target_arch hppa-suse-linux
-%define gcc_icecream 1
-# nospeccleaner
-
-%define build_cp 0%{!?gcc_accel:1}
-%if 0%{?gcc_libc_bootstrap:1} || "%{cross_arch}" == "bpf"
-%define build_cp 0
-%endif
-%define build_ada 0
-%define build_libjava 0
-%define build_java 0
-
-%define build_fortran 0%{?gcc_accel:1}
-%define build_objc 0
-%define build_objcp 0
-%define build_go 0
-%define build_nvptx 0
-%define build_gcn 0
-%define build_d 0
-%define build_rust 0
-%define build_m2 0
-
-%define enable_plugins 0
-%define build_jit 0
-%define use_lto_bootstrap 0
-
-%define binutils_target %{cross_arch}
-%if "%{cross_arch}" == "armv7l" || "%{cross_arch}" == "armv7hl"
-%define binutils_target arm
-%endif
-%if "%{cross_arch}" == "armv6l" || "%{cross_arch}" == "armv6hl"
-%define binutils_target arm
-%endif
-%if "%{cross_arch}" == "armv5tel"
-%define binutils_target arm
-%endif
-%if "%{cross_arch}" == "arm-none"
-%define binutils_target arm
-%endif
-%if "%{cross_arch}" == "riscv64-elf"
-%define binutils_target riscv64
-%endif
-%if "%{cross_arch}" == "sparcv9"
-%define binutils_target sparc
-%endif
-%define canonical_target %(echo %{binutils_target} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
-%if "%{binutils_target}" == "avr" || "%{binutils_target}" == "spu" || "%{binutils_target}" == "pru"
-%define binutils_os %{canonical_target}
-%else
-%if "%{binutils_target}" == "epiphany" || "%{binutils_target}" == "nds32le" || "%{binutils_target}" == "rl78" || "%{binutils_target}" == "rx"
-%define binutils_os %{canonical_target}-elf
-%else
-%if "%{binutils_target}" == "arm"
-%define binutils_os %{canonical_target}-suse-linux-gnueabi
-%else
-%if "%{binutils_target}" == "bpf"
-%define binutils_os %{canonical_target}-none
-%else
-%if 0%{?gcc_accel:1}
-%define binutils_os %{gcc_target_arch}
-%else
-%define binutils_os %{canonical_target}-suse-linux
-%endif
-%endif
-%endif
-%endif
-%endif
-
-%if 0%{?gcc_icecream:1}
-%define sysroot %{_prefix}/%{gcc_target_arch}
-%else
-# offloading builds newlib in-tree and can install in
-# the GCC private path without extra sysroot
-%if 0%{!?gcc_accel:1}
-# use same sysroot as in binutils.spec
-%define sysroot %{_prefix}/%{binutils_os}/sys-root
-%endif
-%endif
-
-%if %{suse_version} >= 1220
-%define selfconflict() %1
-%else
-%define selfconflict() otherproviders(%1)
-%endif
-
-Name:           %{pkgname}
-%define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
-
-URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
-Release:        0
-%define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
-%define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
-%define binsuffix -13
-%if %{suse_version} < 1310
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%endif
-Group:          Development/Languages/C and C++
-Source:         gcc-%{version}.tar.xz
-Source1:        change_spec
-Source2:        gcc13-rpmlintrc
-Source3:        gcc13-testresults-rpmlintrc
-Source4:        README.First-for.SuSE.packagers
-Source5:        newlib-4.3.0.20230120.tar.xz
-Patch2:         gcc-add-defaultsspec.diff
-Patch5:         tls-no-direct.diff
-Patch6:         gcc43-no-unwind-tables.diff
-Patch7:         gcc48-libstdc++-api-reference.patch
-Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
-Patch15:        gcc7-avoid-fixinc-error.diff
-Patch16:        gcc9-reproducible-builds.patch
-Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
-Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
-Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
-Patch26:        gcc13-pr101523.patch
-Patch27:        gcc13-amdgcn-remove-fiji.patch
-Patch28:        gcc13-bsc1239566.patch
-# A set of patches from the RH srpm
-Patch51:        gcc41-ppc32-retaddr.patch
-# Some patches taken from Debian
-Patch60:        gcc44-textdomain.patch
-Patch61:        gcc44-rename-info-files.patch
-# Feature backports
-Patch100:       gcc13-pr88345-min-func-alignment.diff
-Patch101:       gcc13-rs6000-msplit-patch-nops.patch
-
-# Define the canonical target and host architecture
-#   %%gcc_target_arch  is supposed to be the full target triple
-#   %%cross_arch       is supposed to be the rpm target variant arch
-#   %%TARGET_ARCH      will be the canonicalized target CPU part
-#   %%HOST_ARCH        will be the canonicalized host CPU part
-%if 0%{?gcc_target_arch:1}
-%define TARGET_ARCH %(echo %{cross_arch} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
-%else
-%define TARGET_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
-%endif
-%if 0%{?disable_32bit:1}
-%define biarch 0
-%else
-%define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
-%endif
-
-%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
-%ifarch ppc
-%define GCCDIST powerpc64-suse-linux
-%else
-%ifarch %sparc
-%define GCCDIST sparc64-suse-linux
-%else
-%ifarch %arm
-%define GCCDIST %{HOST_ARCH}-suse-linux-gnueabi
-%else
-%define GCCDIST %{HOST_ARCH}-suse-linux
-%endif
-%endif
-%endif
-
-%define libsubdir %{_libdir}/gcc/%{GCCDIST}/%{gcc_dir_version}
-%define gxxinclude %{_prefix}/include/c++/%{gcc_dir_version}
-
-%if "%{cross_arch}" != "nvptx"
-%if "%{cross_arch}" != "amdgcn"
-BuildRequires:  cross-%{binutils_target}-binutils
-Requires:       cross-%{binutils_target}-binutils
-%endif
-%endif
-%define hostsuffix %{nil}
-%if 0%{suse_version} < 1220
-%define hostsuffix -4.8
-BuildRequires:  gcc48-c++
-%else
-BuildRequires:  gcc-c++
-%endif
-%if %{suse_version} > 1500
-BuildRequires:  libzstd-devel
-%endif
-BuildRequires:  bison
-BuildRequires:  flex
-BuildRequires:  gettext-devel
-BuildRequires:  glibc-devel-32bit
-%if %{with limitbuild}
-BuildRequires:  memory-constraints
-%endif
-BuildRequires:  mpc-devel
-BuildRequires:  mpfr-devel
-BuildRequires:  perl
-%if %{suse_version} > 1220
-BuildRequires:  makeinfo
-%else
-BuildRequires:  texinfo
-%endif
-BuildRequires:  zlib-devel
-%if %{suse_version} >= 1230
-BuildRequires:  isl-devel
-%endif
-%ifarch ia64
-BuildRequires:  libunwind-devel
-%endif
-%if 0%{!?gcc_icecream:1}
-%if 0%{!?gcc_libc_bootstrap:1}
-%if 0%{?gcc_target_newlib:1}
-%if !0%{?is_opensuse}
-ExclusiveArch:  do-not-build
-%endif
-BuildRequires:  cross-%cross_arch-newlib-devel
-Requires:       cross-%cross_arch-newlib-devel
-%endif
-%if "%{cross_arch}" == "avr"
-%if !0%{?is_opensuse}
-ExclusiveArch:  do-not-build
-%endif
-BuildRequires:  avr-libc
-%endif
-%if 0%{?gcc_target_glibc:1}
-%if %{suse_version} < 1600
-ExclusiveArch:  do-not-build
-%endif
-BuildRequires:  cross-%cross_arch-glibc-devel
-Requires:       cross-%cross_arch-glibc-devel
-%endif
-%endif
-%if "%{cross_arch}" == "nvptx"
-BuildRequires:  nvptx-tools
-Requires:       cross-nvptx-newlib-devel >= %{version}-%{release}
-Requires:       nvptx-tools
-ExclusiveArch:  x86_64
-%define nvptx_newlib 1
-%endif
-%if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
-%if %{suse_version} < 1550
-BuildRequires:  llvm13
-%define product_libs_llvm_ver 13
-%else
-BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld%{product_libs_llvm_ver}
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
-Requires:       llvm%{product_libs_llvm_ver}
-%endif
-Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld%{product_libs_llvm_ver}
-# SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
-# technically also SLE12 SP5 but do not bother there
-%if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
-ExclusiveArch:  x86_64
-%else
-ExclusiveArch:  do-not-build
-%endif
-%define amdgcn_newlib 1
-%endif
-%endif
-%if "%{cross_arch}" == "pru"
-ExclusiveArch:  %arm
-%endif
-%if 0%{?gcc_target_glibc:1}
-%ifarch %{cross_arch}
-ExcludeArch:    %{cross_arch}
-%endif
-%endif
-%if 0%{?gcc_icecream:1}%{?gcc_libc_bootstrap:1}
-ExclusiveArch:  i586 ppc64le ppc64 x86_64 s390x aarch64 riscv64
-%endif
-%define _binary_payload w.ufdio
-# Obsolete cross-ppc-gcc49 from cross-ppc64-gcc49 which has
-# file conflicts with it and is no longer packaged
-%if "%pkgname" == "cross-ppc64-gcc49"
-Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
-%endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
-# Generally only one cross for the same target triplet can be installed
-# at the same time as we are populating a non-version-specific sysroot
-Provides:       %{gcc_target_arch}-gcc
-Conflicts:      %selfconflict %{gcc_target_arch}-gcc
-%endif
-%if 0%{?gcc_libc_bootstrap:1}
-# The -bootstrap packages file-conflict with the non-bootstrap variants.
-# Even if we don't actually (want to) distribute the bootstrap variants
-# the following avoids repo-checker spamming us endlessly.
-Conflicts:      cross-%{cross_arch}-gcc13
-%endif
-#!BuildIgnore: gcc-PIE
-%if 0%{build_cp:1}
-# The cross compiler only packages the arch specific c++ headers, so
-# we need to depend on the host libstdc++ devel headers (we wouldn't need
-# the libs, though)
-Requires:       libstdc++6-devel-gcc13
-%endif
-AutoReqProv:    off
-%if 0%{!?gcc_accel:1}
-BuildRequires:  update-alternatives
-Requires(post): update-alternatives
-Requires(preun): update-alternatives
-%endif
-Summary:        The GNU Compiler Collection targeting %{cross_arch}
-License:        GPL-3.0-or-later
-
-%description
-The GNU Compiler Collection as a cross-compiler targeting %{cross_arch}.
-%if 0%{?gcc_icecream:1}
-Note this is only useful for building freestanding things like the
-kernel since it fails to include target libraries and headers.
-%endif
-%if 0%{?gcc_libc_bootstrap:1}
-This is a package that is necessary for bootstrapping another package
-only, it is not intended for any other use.
-%endif
-
-%if 0%{suse_version} >= 1500
-# Synchronize output by lines, useful for configure output
-%define make_output_sync -Oline
-%endif
-
-%prep
-%if 0%{?nvptx_newlib:1}%{?amdgcn_newlib:1}
-%setup -q -n gcc-%{version} -a 5
-ln -s newlib-4.3.0.20230120/newlib .
-%else
-%setup -q -n gcc-%{version}
-%endif
-
-#test patching start
-
-%patch -P 2
-%patch -P 5
-%patch -P 6
-%patch -P 7
-%patch -P 11
-%patch -P 15
-%patch -P 16
-%patch -P 17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch -P 18 -p1
-%patch -P 20 -p1
-%endif
-# In SLE15 and earlier default to dwarf4, not dwarf5
-%if %{suse_version} < 1550
-%patch -P 19 -p1
-%endif
-%patch -P 21 -p1
-%patch -P 23 -p1
-%patch -P 24 -p1
-%patch -P 26 -p1
-%patch -P 27 -p1
-%patch -P 28 -p1
-%patch -P 51
-%patch -P 60 -p1
-%patch -P 61 -p1
-%patch -P 100 -p1
-%patch -P 101 -p1
-
-#test patching end
-
-%build
-%if %{with limitbuild}
-%limit_build -m 900
-%endif
-%define _lto_cflags %{nil}
-# Avoid rebuilding of generated files
-contrib/gcc_update --touch
-
-# SLE11 does not allow empty rpms
-%if %{suse_version} < 1310
-echo "This is a dummy package to provide a dependency." > README
-%endif
-
-rm -rf obj-%{GCCDIST}
-mkdir obj-%{GCCDIST}
-cd obj-%{GCCDIST}
-# Filter out unwanted flags from $RPM_OPT_FLAGS
-optflags=
-optflags_d=
-for flag in $RPM_OPT_FLAGS; do
-  add_flag=
-  case $flag in
-    -U_FORTIFY_SOURCE|-D_FORTIFY_SOURCE=*) ;;
-    -fno-rtti|-fno-exceptions|-Wmissing-format-attribute|-fstack-protector*) ;;
-    -ffortify=*|-Wall|-m32|-m64) ;;
-%ifarch %ix86
-    # -mcpu is superseded by -mtune but -mtune is not supported by
-    # our bootstrap compiler.  -mcpu gives a warning that stops
-    # the build process, so remove it for now.  Also remove all other
-    # -march and -mtune flags.  They are superseded by proper
-    # default compiler settings now.
-    -mcpu=i?86|-march=i?86|-mtune=i?86) ;;
-%endif
-%ifarch s390 s390x
-    -fsigned-char) ;;
-    -O1) add_flag=-O2 ;;
-%endif
-%if 0%{?gcc_target_arch:1}
-    # Kill all -march/tune/cpu because that screws building the target libs
-    -march=*|-mtune=*|-mcpu=*) ;;
-%endif
-  *) add_flag=$flag ;;
-  esac
-  if test -n "$add_flag"; then
-    optflags+=" $add_flag"
-    case $add_flag in
-      # Filter out -Werror=return-type for D (only valid for C and C++)
-      -Werror=return-type) ;;
-      *) optflags_d+=" $add_flag" ;;
-    esac
-  fi
-done
-
-languages=c
-%if %{build_cp}
-languages=$languages,c++
-%endif
-%if %{build_objc}
-languages=$languages,objc
-%endif
-%if %{build_fortran}
-languages=$languages,fortran
-%endif
-%if %{build_objcp}
-languages=$languages,obj-c++
-%endif
-%if %{build_ada}
-languages=$languages,ada
-%endif
-%if %{build_go}
-languages=$languages,go
-%endif
-%if %{build_d}
-languages=$languages,d
-%endif
-%if %{build_jit}
-languages=$languages,jit
-%endif
-%if %{build_rust}
-languages=$languages,rust
-%endif
-%if %{build_m2}
-languages=$languages,m2
-%endif
-
-# In general we want to ship release checking enabled compilers
-# which is the default for released compilers
-#ENABLE_CHECKING="--enable-checking=yes"
-ENABLE_CHECKING="--enable-checking=release"
-#ENABLE_CHECKING=""
-
-# Work around tail/head -1 changes
-export _POSIX2_VERSION=199209
-
-%if "%{TARGET_ARCH}" == "amdgcn"
-mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
-ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
-export PATH="`pwd`/target-tools/bin:$PATH"
-%endif
-
-%if "%{hostsuffix}" != ""
-mkdir -p host-tools/bin
-# Using the host gnatmake like
-#   CC="gcc%%{hostsuffix}" GNATBIND="gnatbind%%{hostsuffix}"
-#   GNATMAKE="gnatmake%%{hostsuffix}"
-# doesn't work due to PR33857, so an un-suffixed gnatmake has to be
-# available
-%if %{build_ada}
-cp -a /usr/bin/gnatmake%{hostsuffix} host-tools/bin/gnatmake
-cp -a /usr/bin/gnatlink%{hostsuffix} host-tools/bin/gnatlink
-cp -a /usr/bin/gnatbind%{hostsuffix} host-tools/bin/gnatbind
-%endif
-cp -a /usr/bin/gcc%{hostsuffix} host-tools/bin/gcc
-cp -a /usr/bin/g++%{hostsuffix} host-tools/bin/g++
-ln -sf /usr/%{_lib} host-tools/%{_lib}
-export PATH="`pwd`/host-tools/bin:$PATH"
-%endif
-
-%if %{build_d} && %{suse_version} < 1550
-# We are using gcc11-d to bootstrap d
-export GDC=gdc-11
-%endif
-
-# libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
-# we don't have that yet in a pure cross environment
-%if 0%{?gcc_target_arch:1}
-	CONFARGS="$CONFARGS --disable-libsanitizer"
-%endif
-
-../configure \
-	CFLAGS="$optflags" \
-	CXXFLAGS="$optflags" \
-	XCFLAGS="$optflags" \
-	TCFLAGS="$optflags" \
-	GDCFLAGS="$optflags_d" \
-	--prefix=%{_prefix} \
-	--infodir=%{_infodir} \
-	--mandir=%{_mandir} \
-	--libdir=%{_libdir} \
-	--libexecdir=%{_libdir} \
-	--enable-languages=$languages \
-%if %{build_nvptx} || %{build_gcn}
-	--enable-offload-targets=\
-%if %{build_nvptx}
-nvptx-none,\
-%endif
-%if %{build_gcn}
-amdgcn-amdhsa,\
-%endif
-  --enable-offload-defaulted \
-%endif
-%if %{build_nvptx}
-	--without-cuda-driver \
-%endif
-%if %{build_jit}
-  --enable-host-shared \
-%endif
-	$ENABLE_CHECKING \
-	--disable-werror \
-	--with-gxx-include-dir=%{_prefix}/include/c++/%{gcc_dir_version} \
-	--with-libstdcxx-zoneinfo=%{_datadir}/zoneinfo \
-	--enable-ssp \
-	--disable-libssp \
-%if 0%{!?build_libvtv:1}
-	--disable-libvtv \
-%endif
-%if 0%{suse_version} >= 1500
-	--enable-cet=auto \
-%else
-	--disable-cet \
-%endif
-	--disable-libcc1 \
-%if %{enable_plugins}
-	--enable-plugin \
-%else
-	--disable-plugin \
-%endif
-	--with-bugurl="https://bugs.opensuse.org/" \
-	--with-pkgversion="SUSE Linux" \
-%if 0%{?sysroot:1}
-	--with-slibdir=%{sysroot}/%{_lib} \
-%else
-	--with-slibdir=/%{_lib} \
-%endif
-	--with-system-zlib \
-	--enable-libstdcxx-allocator=new \
-	--disable-libstdcxx-pch \
-%if 0%{suse_version} <= 1320
-	--with-default-libstdcxx-abi=gcc4-compatible \
-%endif
-%if %{build_d}
-	--enable-libphobos \
-%endif
-	--enable-version-specific-runtime-libs \
-	--with-gcc-major-version-only \
-%if 0%{!?gcc_target_arch:1}
-	--enable-linker-build-id \
-%else
-%if 0%{?gcc_target_glibc:1}
-	--enable-linker-build-id \
-%endif
-%endif
-	--enable-linux-futex \
-%if %{suse_version} >= 1315
-%ifarch %ix86 x86_64 ppc ppc64 ppc64le %arm aarch64 s390 s390x %sparc
-	--enable-gnu-indirect-function \
-%endif
-%endif
-	--program-suffix=%{binsuffix} \
-%ifarch %{disable_multilib_arch}
-	--disable-multilib \
-%endif
-%if 0%{!?gcc_target_arch:1}
-%ifarch ia64
-	--with-system-libunwind \
-%else
-	--without-system-libunwind \
-%endif
-%endif
-%if 0%{?gcc_target_arch:1}
-	--program-prefix=%{gcc_target_arch}- \
-	--target=%{gcc_target_arch} \
-	--disable-nls \
-%if 0%{?sysroot:1}
-	--with-sysroot=%sysroot \
-%endif
-%if 0%{?build_sysroot:1}
-	--with-build-sysroot=%{build_sysroot} \
-%else
-%if 0%{?sysroot:1}
-	--with-build-sysroot=%{sysroot} \
-%endif
-%endif
-%if 0%{?binutils_os:1}
-	--with-build-time-tools=/usr/%{binutils_os}/bin \
-%endif
-%if 0%{?gcc_target_newlib}
-	--with-newlib \
-%if 0%{?gcc_libc_bootstrap:1}
-	--disable-gcov \
-%endif
-%else
-%if 0%{?gcc_libc_bootstrap:1}
-	--disable-gcov --disable-threads --disable-shared \
-	--disable-libmudflap --disable-libssp --disable-libgomp \
-	--disable-libquadmath --disable-libatomic \
-	--without-headers --with-newlib \
-%endif
-%endif
-%if "%{TARGET_ARCH}" == "bpf"
-	--disable-gcov \
-%endif
-%if "%{TARGET_ARCH}" == "spu"
-	--with-gxx-include-dir=%sysroot/include/c++/%{gcc_dir_version} \
-	--with-newlib \
-%endif
-%if "%{TARGET_ARCH}" == "nvptx"
-	--enable-as-accelerator-for=%{GCCDIST} \
-	--disable-sjlj-exceptions \
-	--enable-newlib-io-long-long \
-%endif
-%if "%{TARGET_ARCH}" == "amdgcn"
-	--enable-as-accelerator-for=%{GCCDIST} \
-	--enable-libgomp \
-%endif
-%if "%{TARGET_ARCH}" == "avr"
-	--enable-lto \
-	--without-gxx-include-dir \
-	--with-native-system-header-dir=/include \
-%endif
-%endif
-%if "%{TARGET_ARCH}" == "arm-none"
-	--enable-multilib \
-	--with-multilib-list=aprofile,rmprofile \
-	--disable-decimal-float \
-	--disable-libffi \
-	--disable-libgomp \
-	--disable-libmudflap \
-	--disable-libquadmath \
-	--disable-shared \
-	--disable-threads \
-	--disable-tls \
-%endif
-%if "%{TARGET_ARCH}" == "armv6hl" || "%{TARGET_ARCH}" == "arm"
-	--with-cpu=arm1176jzf-s \
-        --with-float=hard \
-        --with-abi=aapcs-linux \
-        --with-fpu=vfpv2 \
-        --disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "armv7hl"
-	--with-cpu=generic-armv7-a \
-	--with-float=hard \
-	--with-abi=aapcs-linux \
-	--with-fpu=vfpv3-d16 \
-	--disable-sjlj-exceptions \
-%endif
-%if "%{TARGET_ARCH}" == "aarch64"
-	--enable-fix-cortex-a53-835769 \
-	--enable-fix-cortex-a53-843419 \
-%endif
-%if "%{TARGET_ARCH}" == "powerpc64le"
-%if 0%{?cross_arch:1}
-	--with-glibc-version=2.32 \
-%endif
-%if %{suse_version} >= 1600 && !0%{?is_opensuse}
-	--with-cpu=power9 \
-	--with-tune=power9 \
-%else
-%if %{suse_version} >= 1350
-	--with-cpu=power8 \
-	--with-tune=power9 \
-%else
-%if %{suse_version} >= 1315 && %{suse_version} != 1320
-	--with-cpu=power8 \
-	--with-tune=power8 \
-%else
-	--with-cpu=power7 \
-	--with-tune=power7 \
-%endif
-%endif
-%endif
-%if %{suse_version} > 1500
-	--with-long-double-format=ieee \
-%else
-	--with-long-double-format=ibm \
-%endif
-	--enable-secureplt \
-	--with-long-double-128 \
-	--enable-targets=powerpcle-linux \
-	--disable-multilib \
-%endif
-%if "%{TARGET_ARCH}" == "powerpc" || "%{TARGET_ARCH}" == "powerpc64"
-%if "%{TARGET_ARCH}" == "powerpc"
-        --with-cpu=default32 \
-%endif
-	--with-cpu-64=power4 \
-	--enable-secureplt \
-	--with-long-double-128 \
-%endif
-%if "%{TARGET_ARCH}" == "sparc64"
-	--with-cpu=ultrasparc \
-	--with-long-double-128 \
-%endif
-%if "%{TARGET_ARCH}" == "sparc"
-	--with-cpu=v8 \
-	--with-long-double-128 \
-%endif
-%if "%{TARGET_ARCH}" == "i586"
-%if %{suse_version} >= 1600 && !0%{?is_opensuse}
-	--with-arch-32=x86-64-v2 \
-%else
-%if 0%{?sle_version:%sle_version} >= 150000
-	--with-arch-32=x86-64 \
-%else
-	--with-arch-32=i586 \
-%endif
-%endif
-	--with-tune=generic \
-%endif
-%if "%{TARGET_ARCH}" == "x86_64"
-%ifnarch %{disable_multilib_arch}
-	--enable-multilib \
-%if %{suse_version} >= 1600 && !0%{?is_opensuse}
-	--with-arch-32=x86-64-v2 \
-%else
-	--with-arch-32=x86-64 \
-%endif
-%endif
-%if %{suse_version} >= 1600 && !0%{?is_opensuse}
-	--with-arch=x86-64-v2 \
-%endif
-	--with-tune=generic \
-%endif
-%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x"
-%if %{suse_version} >= 1600 && !0%{?is_opensuse}
-        --with-tune=z14 --with-arch=z14 \
-%else
-%if %{suse_version} >= 1310
-        --with-tune=zEC12 --with-arch=z196 \
-%else
-	--with-tune=z9-109 --with-arch=z900 \
-%endif
-%endif
-	--with-long-double-128 \
-	--enable-decimal-float \
-%if 0%{?cross_arch:1}
-	--disable-multilib \
-%endif
-%endif
-%if "%{TARGET_ARCH}" == "m68k"
-	--disable-multilib \
-%endif
-%if "%{TARGET_ARCH}" == "riscv64"
-	--disable-multilib \
-%endif
-%if %{with bootstrap}
-%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
-	--with-build-config=bootstrap-lto-lean \
-%endif
-%else
-	--disable-bootstrap \
-%endif
-	--enable-link-serialization \
-	$CONFARGS \
-	--build=%{GCCDIST} \
-	--host=%{GCCDIST} || \
-  {
-    rc=$?;
-    echo "------- BEGIN config.log ------";
-    %{__cat} config.log;
-    echo "------- END config.log ------";
-    exit $rc;
-  }
-
-%if 0%{!?gcc_icecream:1}
-make %{?make_output_sync} %{?_smp_mflags}
-%else
-make %{?make_output_sync} %{?_smp_mflags} all-host
-%endif
-
-%if 0%{?gcc_icecream:%gcc_icecream}
-%package -n cross-%cross_arch-gcc13-icecream-backend
-Summary:        Icecream backend for the GNU C Compiler
-Group:          Development/Languages/C and C++
-
-%description -n cross-%cross_arch-gcc13-icecream-backend
-This package contains the icecream environment for the GNU C Compiler
-%endif
-
-%if 0%{?nvptx_newlib:1}
-%package -n cross-nvptx-newlib13-devel
-Summary:        Newlib for the nvptx offload target
-Group:          Development/Languages/C and C++
-Provides:       cross-nvptx-newlib-devel = %{version}-%{release}
-Conflicts:      cross-nvptx-newlib-devel
-
-%description -n cross-nvptx-newlib13-devel
-Newlib development files for the nvptx offload target compiler.
-%endif
-
-%if 0%{?amdgcn_newlib:1}
-%package -n cross-amdgcn-newlib13-devel
-Summary:        Newlib for the amdgcn offload target
-Group:          Development/Languages/C and C++
-Provides:       cross-amdgcn-newlib-devel = %{version}-%{release}
-Conflicts:      cross-amdgcn-newlib-devel
-
-%description -n cross-amdgcn-newlib13-devel
-Newlib development files for the amdgcn offload target compiler.
-%endif
-
-%define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
-
-%install
-cd obj-%{GCCDIST}
-
-%if "%{TARGET_ARCH}" == "amdgcn"
-# libtool needs to be able to call ranlib
-export PATH="`pwd`/target-tools/bin:$PATH"
-%endif
-
-# install and fixup host parts
-make DESTDIR=$RPM_BUILD_ROOT install-host
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
-rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
-# common fixup
-rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
-
-# install and fixup target parts
-%if 0%{?gcc_icecream:1}
-# so expect the sysroot to be populated from natively built binaries
-%else
-# We want shared libraries to reside in the sysroot but the .so symlinks
-# on the host.  Once we have a cross target that has shared libs we need
-# to manually fix up things here like we do for non-cross compilers
-mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot}
-make DESTDIR=$RPM_BUILD_ROOT install-target
-%if %{build_cp}
-# So we installed libstdc++ headers into %prefix where they conflict
-# with other host compilers.  Rip out the non-target specific parts
-# again.  Note not all cross targets support libstdc++, so create the
-# directory to make things easier.
-mkdir -p $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version}
-find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -mindepth 1 -maxdepth 1 -type d -a -not -name %{gcc_target_arch} | xargs -r rm -r
-find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -maxdepth 1 -type f | xargs -r rm
-# And also remove installed pretty printers which conflict in similar ways
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/gcc%{binsuffix}
-%endif
-%endif
-
-%if 0%{?binutils_os:1}
-for prog in as ld; do
-  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{targetlibsubdir}/
-done
-%endif
-
-# remove docs
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-rm -rf $RPM_BUILD_ROOT%{_infodir}
-
-# for accelerators remove all frontends but lto1 and also install-tools
-%if 0%{?gcc_accel:1}
-rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1
-rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus
-rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools
-rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
-# also move things from target directories into the accel path since
-# that is the place where we later search for (only)
-( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - )
-rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
-%endif
-# for amdgcn install the symlinks to the llvm tools
-# follow alternatives symlinks to the hardcoded version requirement
-%if "%{TARGET_ARCH}" == "amdgcn"
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
-ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
-ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
-ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
-ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
-ln -s %{_prefix}/amdgcn-amdhsa/bin/nm $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-nm
-ln -s %{_prefix}/amdgcn-amdhsa/bin/ranlib $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ranlib
-%endif
-
-%if 0%{?gcc_icecream:%gcc_icecream}
-# Build an icecream environment
-# The assembler comes from the cross-binutils, and hence is _not_
-# named funnily, not even on ppc, so there we need the original target
-install -s -D %{_prefix}/bin/%{binutils_os}-as \
-	$RPM_BUILD_ROOT/env/usr/bin/as
-install -s $RPM_BUILD_ROOT/%{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix} \
-	$RPM_BUILD_ROOT/env/usr/bin/g++
-install -s $RPM_BUILD_ROOT/%{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} \
-	$RPM_BUILD_ROOT/env/usr/bin/gcc
-
-for back in cc1 cc1plus; do
-	install -s -D $RPM_BUILD_ROOT/%{targetlibsubdir}/$back \
-		$RPM_BUILD_ROOT/env%{targetlibsubdir}/$back
-done
-if test -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.so; then
-  install -s -D $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.so \
-		$RPM_BUILD_ROOT/env%{targetlibsubdir}/liblto_plugin.so
-fi
-
-# Make sure to also pull in all shared library requirements for the
-# binaries we put into the environment which is operated by chrooting
-# into it and execing the compiler
-libs=`for bin in $RPM_BUILD_ROOT/env/usr/bin/* $RPM_BUILD_ROOT/env%{targetlibsubdir}/*; do \
-  ldd $bin | sed -n '\,^[^/]*\(/[^ ]*\).*,{ s//\1/; p; }'  ;\
-done | sort -u `
-for lib in $libs; do
-  # Check wether the same library also exists in the parent directory,
-  # and prefer that on the assumption that it is a more generic one.
-  baselib=`echo "$lib" | sed 's,/[^/]*\(/[^/]*\)$,\1,'`
-  test -f "$baselib" && lib=$baselib
-  install -s -D $lib $RPM_BUILD_ROOT/env$lib
-done
-
-cd $RPM_BUILD_ROOT/env
-tar --no-recursion --mtime @${SOURCE_DATE_EPOCH:-$(date +%s)} --format=gnu -cv `find *|LC_ALL=C sort` |\
-  gzip -n9 > ../%{name}_%{_arch}.tar.gz
-cd ..
-mkdir -p usr/share/icecream-envs
-mv %{name}_%{_arch}.tar.gz usr/share/icecream-envs
-rpm -q --changelog glibc >  usr/share/icecream-envs/%{name}_%{_arch}.glibc
-rpm -q --changelog binutils >  usr/share/icecream-envs/%{name}_%{_arch}.binutils
-rm -r env
-%endif
-
-# we provide update-alternatives for selecting a compiler version for
-# crosses
-%if 0%{!?gcc_accel:1}
-mkdir -p %{buildroot}%{_sysconfdir}/alternatives
-for ex in gcc cpp \
-%if %{build_cp}
-          c++ g++ \
-%endif
-          gcc-ar gcc-nm gcc-ranlib lto-dump \
-%if 0%{!?gcc_libc_bootstrap:1} && "%{cross_arch}" != "bpf"
-          gcov gcov-dump gcov-tool \
-%endif
-	  ; do
-  ln -s %{_sysconfdir}/alternatives/%{gcc_target_arch}-$ex \
-	%{buildroot}%{_bindir}/%{gcc_target_arch}-$ex
-done
-
-%post
-%{_sbindir}/update-alternatives \
-  --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 13 \
-  --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
-%if %{build_cp}
-  --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
-  --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
-%endif
-%if 0%{!?gcc_libc_bootstrap:1} && "%{cross_arch}" != "bpf"
-  --slave %{_bindir}/%{gcc_target_arch}-gcov %{gcc_target_arch}-gcov %{_bindir}/%{gcc_target_arch}-gcov%{binsuffix} \
-  --slave %{_bindir}/%{gcc_target_arch}-gcov-dump %{gcc_target_arch}-gcov-dump %{_bindir}/%{gcc_target_arch}-gcov-dump%{binsuffix} \
-  --slave %{_bindir}/%{gcc_target_arch}-gcov-tool %{gcc_target_arch}-gcov-tool %{_bindir}/%{gcc_target_arch}-gcov-tool%{binsuffix} \
-%endif
-  --slave %{_bindir}/%{gcc_target_arch}-gcc-ar %{gcc_target_arch}-gcc-ar %{_bindir}/%{gcc_target_arch}-gcc-ar%{binsuffix} \
-  --slave %{_bindir}/%{gcc_target_arch}-gcc-nm %{gcc_target_arch}-gcc-nm %{_bindir}/%{gcc_target_arch}-gcc-nm%{binsuffix} \
-  --slave %{_bindir}/%{gcc_target_arch}-lto-dump %{gcc_target_arch}-lto-dump %{_bindir}/%{gcc_target_arch}-lto-dump%{binsuffix} \
-  --slave %{_bindir}/%{gcc_target_arch}-gcc-ranlib %{gcc_target_arch}-gcc-ranlib %{_bindir}/%{gcc_target_arch}-gcc-ranlib%{binsuffix}
-
-%postun
-if [ ! -f %{_bindir}/%{gcc_target_arch}-gcc ] ; then
-  %{_sbindir}/update-alternatives --remove %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix}
-fi
-%endif
-
-%files
-%defattr(-,root,root)
-%if 0%{?gcc_accel:1}
-%{_prefix}/bin/%{GCCDIST}-accel-%{gcc_target_arch}-*
-%dir %{libsubdir}
-%dir %{libsubdir}/accel
-%{libsubdir}/accel/%{gcc_target_arch}
-%if "%{cross_arch}" == "amdgcn"
-%{_prefix}/%{gcc_target_arch}/bin
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
-%endif
-%else
-%{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
-%{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
-%{_prefix}/bin/%{gcc_target_arch}-gcc-ar%{binsuffix}
-%{_prefix}/bin/%{gcc_target_arch}-gcc-nm%{binsuffix}
-%{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib%{binsuffix}
-%{_prefix}/bin/%{gcc_target_arch}-lto-dump%{binsuffix}
-%if 0%{!?gcc_libc_bootstrap:1} && "%{cross_arch}" != "bpf"
-%{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
-%{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
-%{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
-%{_prefix}/bin/%{gcc_target_arch}-gcov
-%{_prefix}/bin/%{gcc_target_arch}-gcov-dump
-%{_prefix}/bin/%{gcc_target_arch}-gcov-tool
-%endif
-%{_prefix}/bin/%{gcc_target_arch}-gcc
-%{_prefix}/bin/%{gcc_target_arch}-cpp
-%{_prefix}/bin/%{gcc_target_arch}-gcc-ar
-%{_prefix}/bin/%{gcc_target_arch}-gcc-nm
-%{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib
-%{_prefix}/bin/%{gcc_target_arch}-lto-dump
-%ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc
-%ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-cpp
-%ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc-ar
-%ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc-nm
-%ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc-ranlib
-%ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-lto-dump
-%if 0%{!?gcc_libc_bootstrap:1} && "%{cross_arch}" != "bpf"
-%ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov
-%ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
-%ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
-%endif
-%if %{build_cp}
-%{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
-%{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
-%{_prefix}/bin/%{gcc_target_arch}-c++
-%{_prefix}/bin/%{gcc_target_arch}-g++
-%ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-c++
-%ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-g++
-%if 0%{!?gcc_libc_bootstrap:1}
-%if "%{cross_arch}" == "avr" || 0%{?gcc_target_newlib:1} || 0%{?gcc_target_glibc:1}
-%{_prefix}/include/c++
-%endif
-%endif
-%endif
-%dir %{targetlibsubdir}
-%dir %{_libdir}/gcc/%{gcc_target_arch}
-%{targetlibsubdir}
-%endif
-%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
-%{sysroot}
-%endif
-
-%if 0%{?gcc_icecream:%gcc_icecream}
-%files -n cross-%cross_arch-gcc13-icecream-backend
-%defattr(-,root,root)
-/usr/share/icecream-envs
-%endif
-
-%if 0%{?nvptx_newlib:1}
-%files -n cross-nvptx-newlib13-devel
-%defattr(-,root,root)
-%{_prefix}/%{gcc_target_arch}
-%endif
-
-%if 0%{?amdgcn_newlib:1}
-%files -n cross-amdgcn-newlib13-devel
-%defattr(-,root,root)
-%{_prefix}/%{gcc_target_arch}
-%exclude %{_prefix}/%{gcc_target_arch}/bin
-%endif
-
-%changelog
diff --git a/cross-m68k-gcc13.spec b/cross-m68k-gcc13.spec
index d766f1a..a997e7e 100644
--- a/cross-m68k-gcc13.spec
+++ b/cross-m68k-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -134,7 +134,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -293,7 +292,7 @@ ExclusiveArch:  i586 ppc64le ppc64 x86_64 s390x aarch64 riscv64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
+%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1} || "%{cross_arch}" == "avr"
 # Generally only one cross for the same target triplet can be installed
 # at the same time as we are populating a non-version-specific sysroot
 Provides:       %{gcc_target_arch}-gcc
@@ -303,7 +302,7 @@ Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 # The -bootstrap packages file-conflict with the non-bootstrap variants.
 # Even if we don't actually (want to) distribute the bootstrap variants
 # the following avoids repo-checker spamming us endlessly.
-Conflicts:      cross-%{cross_arch}-gcc13
+Conflicts:      %{gcc_target_arch}-gcc
 %endif
 #!BuildIgnore: gcc-PIE
 %if 0%{build_cp:1}
@@ -312,7 +311,6 @@ Conflicts:      cross-%{cross_arch}-gcc13
 # the libs, though)
 Requires:       libstdc++6-devel-gcc13
 %endif
-AutoReqProv:    off
 %if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
@@ -365,7 +363,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -836,6 +833,9 @@ Newlib development files for the amdgcn offload target compiler.
 
 %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
 
+%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+
 %install
 cd obj-%{GCCDIST}
 
diff --git a/cross-mips-gcc13.spec b/cross-mips-gcc13.spec
index df74795..07a8548 100644
--- a/cross-mips-gcc13.spec
+++ b/cross-mips-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -134,7 +134,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -293,7 +292,7 @@ ExclusiveArch:  i586 ppc64le ppc64 x86_64 s390x aarch64 riscv64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
+%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1} || "%{cross_arch}" == "avr"
 # Generally only one cross for the same target triplet can be installed
 # at the same time as we are populating a non-version-specific sysroot
 Provides:       %{gcc_target_arch}-gcc
@@ -303,7 +302,7 @@ Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 # The -bootstrap packages file-conflict with the non-bootstrap variants.
 # Even if we don't actually (want to) distribute the bootstrap variants
 # the following avoids repo-checker spamming us endlessly.
-Conflicts:      cross-%{cross_arch}-gcc13
+Conflicts:      %{gcc_target_arch}-gcc
 %endif
 #!BuildIgnore: gcc-PIE
 %if 0%{build_cp:1}
@@ -312,7 +311,6 @@ Conflicts:      cross-%{cross_arch}-gcc13
 # the libs, though)
 Requires:       libstdc++6-devel-gcc13
 %endif
-AutoReqProv:    off
 %if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
@@ -365,7 +363,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -836,6 +833,9 @@ Newlib development files for the amdgcn offload target compiler.
 
 %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
 
+%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+
 %install
 cd obj-%{GCCDIST}
 
diff --git a/cross-nvptx-gcc13.spec b/cross-nvptx-gcc13.spec
index 22eb1f5..6c76a85 100644
--- a/cross-nvptx-gcc13.spec
+++ b/cross-nvptx-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -134,7 +134,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -293,7 +292,7 @@ ExclusiveArch:  i586 ppc64le ppc64 x86_64 s390x aarch64 riscv64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
+%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1} || "%{cross_arch}" == "avr"
 # Generally only one cross for the same target triplet can be installed
 # at the same time as we are populating a non-version-specific sysroot
 Provides:       %{gcc_target_arch}-gcc
@@ -303,7 +302,7 @@ Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 # The -bootstrap packages file-conflict with the non-bootstrap variants.
 # Even if we don't actually (want to) distribute the bootstrap variants
 # the following avoids repo-checker spamming us endlessly.
-Conflicts:      cross-%{cross_arch}-gcc13
+Conflicts:      %{gcc_target_arch}-gcc
 %endif
 #!BuildIgnore: gcc-PIE
 %if 0%{build_cp:1}
@@ -312,7 +311,6 @@ Conflicts:      cross-%{cross_arch}-gcc13
 # the libs, though)
 Requires:       libstdc++6-devel-gcc13
 %endif
-AutoReqProv:    off
 %if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
@@ -365,7 +363,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -836,6 +833,9 @@ Newlib development files for the amdgcn offload target compiler.
 
 %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
 
+%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+
 %install
 cd obj-%{GCCDIST}
 
diff --git a/cross-ppc64-gcc13.spec b/cross-ppc64-gcc13.spec
index 29dd108..bbfb50c 100644
--- a/cross-ppc64-gcc13.spec
+++ b/cross-ppc64-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -134,7 +134,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -293,7 +292,7 @@ ExclusiveArch:  i586 ppc64le  x86_64 s390x aarch64 riscv64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
+%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1} || "%{cross_arch}" == "avr"
 # Generally only one cross for the same target triplet can be installed
 # at the same time as we are populating a non-version-specific sysroot
 Provides:       %{gcc_target_arch}-gcc
@@ -303,7 +302,7 @@ Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 # The -bootstrap packages file-conflict with the non-bootstrap variants.
 # Even if we don't actually (want to) distribute the bootstrap variants
 # the following avoids repo-checker spamming us endlessly.
-Conflicts:      cross-%{cross_arch}-gcc13
+Conflicts:      %{gcc_target_arch}-gcc
 %endif
 #!BuildIgnore: gcc-PIE
 %if 0%{build_cp:1}
@@ -312,7 +311,6 @@ Conflicts:      cross-%{cross_arch}-gcc13
 # the libs, though)
 Requires:       libstdc++6-devel-gcc13
 %endif
-AutoReqProv:    off
 %if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
@@ -365,7 +363,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -836,6 +833,9 @@ Newlib development files for the amdgcn offload target compiler.
 
 %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
 
+%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+
 %install
 cd obj-%{GCCDIST}
 
diff --git a/cross-ppc64le-gcc13-bootstrap.spec b/cross-ppc64le-gcc13-bootstrap.spec
index 64e7733..f1062a1 100644
--- a/cross-ppc64le-gcc13-bootstrap.spec
+++ b/cross-ppc64le-gcc13-bootstrap.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -134,7 +134,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -293,7 +292,7 @@ ExclusiveArch:  i586  ppc64 x86_64 s390x aarch64 riscv64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
+%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1} || "%{cross_arch}" == "avr"
 # Generally only one cross for the same target triplet can be installed
 # at the same time as we are populating a non-version-specific sysroot
 Provides:       %{gcc_target_arch}-gcc
@@ -303,7 +302,7 @@ Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 # The -bootstrap packages file-conflict with the non-bootstrap variants.
 # Even if we don't actually (want to) distribute the bootstrap variants
 # the following avoids repo-checker spamming us endlessly.
-Conflicts:      cross-%{cross_arch}-gcc13
+Conflicts:      %{gcc_target_arch}-gcc
 %endif
 #!BuildIgnore: gcc-PIE
 %if 0%{build_cp:1}
@@ -312,7 +311,6 @@ Conflicts:      cross-%{cross_arch}-gcc13
 # the libs, though)
 Requires:       libstdc++6-devel-gcc13
 %endif
-AutoReqProv:    off
 %if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
@@ -365,7 +363,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -836,6 +833,9 @@ Newlib development files for the amdgcn offload target compiler.
 
 %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
 
+%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+
 %install
 cd obj-%{GCCDIST}
 
diff --git a/cross-ppc64le-gcc13.spec b/cross-ppc64le-gcc13.spec
index 7755717..7deeed2 100644
--- a/cross-ppc64le-gcc13.spec
+++ b/cross-ppc64le-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -134,7 +134,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -293,7 +292,7 @@ ExclusiveArch:  i586  ppc64 x86_64 s390x aarch64 riscv64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
+%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1} || "%{cross_arch}" == "avr"
 # Generally only one cross for the same target triplet can be installed
 # at the same time as we are populating a non-version-specific sysroot
 Provides:       %{gcc_target_arch}-gcc
@@ -303,7 +302,7 @@ Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 # The -bootstrap packages file-conflict with the non-bootstrap variants.
 # Even if we don't actually (want to) distribute the bootstrap variants
 # the following avoids repo-checker spamming us endlessly.
-Conflicts:      cross-%{cross_arch}-gcc13
+Conflicts:      %{gcc_target_arch}-gcc
 %endif
 #!BuildIgnore: gcc-PIE
 %if 0%{build_cp:1}
@@ -312,7 +311,6 @@ Conflicts:      cross-%{cross_arch}-gcc13
 # the libs, though)
 Requires:       libstdc++6-devel-gcc13
 %endif
-AutoReqProv:    off
 %if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
@@ -365,7 +363,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -836,6 +833,9 @@ Newlib development files for the amdgcn offload target compiler.
 
 %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
 
+%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+
 %install
 cd obj-%{GCCDIST}
 
diff --git a/cross-pru-gcc13-bootstrap.spec b/cross-pru-gcc13-bootstrap.spec
index 1aec8e8..b38de14 100644
--- a/cross-pru-gcc13-bootstrap.spec
+++ b/cross-pru-gcc13-bootstrap.spec
@@ -108,7 +108,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -135,7 +135,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -294,7 +293,7 @@ ExclusiveArch:  i586 ppc64le ppc64 x86_64 s390x aarch64 riscv64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
+%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1} || "%{cross_arch}" == "avr"
 # Generally only one cross for the same target triplet can be installed
 # at the same time as we are populating a non-version-specific sysroot
 Provides:       %{gcc_target_arch}-gcc
@@ -304,7 +303,7 @@ Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 # The -bootstrap packages file-conflict with the non-bootstrap variants.
 # Even if we don't actually (want to) distribute the bootstrap variants
 # the following avoids repo-checker spamming us endlessly.
-Conflicts:      cross-%{cross_arch}-gcc13
+Conflicts:      %{gcc_target_arch}-gcc
 %endif
 #!BuildIgnore: gcc-PIE
 %if 0%{build_cp:1}
@@ -313,7 +312,6 @@ Conflicts:      cross-%{cross_arch}-gcc13
 # the libs, though)
 Requires:       libstdc++6-devel-gcc13
 %endif
-AutoReqProv:    off
 %if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
@@ -366,7 +364,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -837,6 +834,9 @@ Newlib development files for the amdgcn offload target compiler.
 
 %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
 
+%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+
 %install
 cd obj-%{GCCDIST}
 
diff --git a/cross-pru-gcc13.spec b/cross-pru-gcc13.spec
index d96798f..e6cdf16 100644
--- a/cross-pru-gcc13.spec
+++ b/cross-pru-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -134,7 +134,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -293,7 +292,7 @@ ExclusiveArch:  i586 ppc64le ppc64 x86_64 s390x aarch64 riscv64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
+%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1} || "%{cross_arch}" == "avr"
 # Generally only one cross for the same target triplet can be installed
 # at the same time as we are populating a non-version-specific sysroot
 Provides:       %{gcc_target_arch}-gcc
@@ -303,7 +302,7 @@ Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 # The -bootstrap packages file-conflict with the non-bootstrap variants.
 # Even if we don't actually (want to) distribute the bootstrap variants
 # the following avoids repo-checker spamming us endlessly.
-Conflicts:      cross-%{cross_arch}-gcc13
+Conflicts:      %{gcc_target_arch}-gcc
 %endif
 #!BuildIgnore: gcc-PIE
 %if 0%{build_cp:1}
@@ -312,7 +311,6 @@ Conflicts:      cross-%{cross_arch}-gcc13
 # the libs, though)
 Requires:       libstdc++6-devel-gcc13
 %endif
-AutoReqProv:    off
 %if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
@@ -365,7 +363,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -836,6 +833,9 @@ Newlib development files for the amdgcn offload target compiler.
 
 %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
 
+%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+
 %install
 cd obj-%{GCCDIST}
 
diff --git a/cross-riscv64-elf-gcc13-bootstrap.spec b/cross-riscv64-elf-gcc13-bootstrap.spec
index 9d14ff8..6a0a1e2 100644
--- a/cross-riscv64-elf-gcc13-bootstrap.spec
+++ b/cross-riscv64-elf-gcc13-bootstrap.spec
@@ -108,7 +108,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -135,7 +135,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -294,7 +293,7 @@ ExclusiveArch:  i586 ppc64le ppc64 x86_64 s390x aarch64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
+%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1} || "%{cross_arch}" == "avr"
 # Generally only one cross for the same target triplet can be installed
 # at the same time as we are populating a non-version-specific sysroot
 Provides:       %{gcc_target_arch}-gcc
@@ -304,7 +303,7 @@ Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 # The -bootstrap packages file-conflict with the non-bootstrap variants.
 # Even if we don't actually (want to) distribute the bootstrap variants
 # the following avoids repo-checker spamming us endlessly.
-Conflicts:      cross-%{cross_arch}-gcc13
+Conflicts:      %{gcc_target_arch}-gcc
 %endif
 #!BuildIgnore: gcc-PIE
 %if 0%{build_cp:1}
@@ -313,7 +312,6 @@ Conflicts:      cross-%{cross_arch}-gcc13
 # the libs, though)
 Requires:       libstdc++6-devel-gcc13
 %endif
-AutoReqProv:    off
 %if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
@@ -366,7 +364,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -837,6 +834,9 @@ Newlib development files for the amdgcn offload target compiler.
 
 %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
 
+%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+
 %install
 cd obj-%{GCCDIST}
 
diff --git a/cross-riscv64-elf-gcc13.spec b/cross-riscv64-elf-gcc13.spec
index 857b13c..d6b8868 100644
--- a/cross-riscv64-elf-gcc13.spec
+++ b/cross-riscv64-elf-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -134,7 +134,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -293,7 +292,7 @@ ExclusiveArch:  i586 ppc64le ppc64 x86_64 s390x aarch64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
+%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1} || "%{cross_arch}" == "avr"
 # Generally only one cross for the same target triplet can be installed
 # at the same time as we are populating a non-version-specific sysroot
 Provides:       %{gcc_target_arch}-gcc
@@ -303,7 +302,7 @@ Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 # The -bootstrap packages file-conflict with the non-bootstrap variants.
 # Even if we don't actually (want to) distribute the bootstrap variants
 # the following avoids repo-checker spamming us endlessly.
-Conflicts:      cross-%{cross_arch}-gcc13
+Conflicts:      %{gcc_target_arch}-gcc
 %endif
 #!BuildIgnore: gcc-PIE
 %if 0%{build_cp:1}
@@ -312,7 +311,6 @@ Conflicts:      cross-%{cross_arch}-gcc13
 # the libs, though)
 Requires:       libstdc++6-devel-gcc13
 %endif
-AutoReqProv:    off
 %if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
@@ -365,7 +363,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -836,6 +833,9 @@ Newlib development files for the amdgcn offload target compiler.
 
 %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
 
+%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+
 %install
 cd obj-%{GCCDIST}
 
diff --git a/cross-riscv64-gcc13-bootstrap.spec b/cross-riscv64-gcc13-bootstrap.spec
index a52c208..4475737 100644
--- a/cross-riscv64-gcc13-bootstrap.spec
+++ b/cross-riscv64-gcc13-bootstrap.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -134,7 +134,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -293,7 +292,7 @@ ExclusiveArch:  i586 ppc64le ppc64 x86_64 s390x aarch64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
+%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1} || "%{cross_arch}" == "avr"
 # Generally only one cross for the same target triplet can be installed
 # at the same time as we are populating a non-version-specific sysroot
 Provides:       %{gcc_target_arch}-gcc
@@ -303,7 +302,7 @@ Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 # The -bootstrap packages file-conflict with the non-bootstrap variants.
 # Even if we don't actually (want to) distribute the bootstrap variants
 # the following avoids repo-checker spamming us endlessly.
-Conflicts:      cross-%{cross_arch}-gcc13
+Conflicts:      %{gcc_target_arch}-gcc
 %endif
 #!BuildIgnore: gcc-PIE
 %if 0%{build_cp:1}
@@ -312,7 +311,6 @@ Conflicts:      cross-%{cross_arch}-gcc13
 # the libs, though)
 Requires:       libstdc++6-devel-gcc13
 %endif
-AutoReqProv:    off
 %if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
@@ -365,7 +363,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -836,6 +833,9 @@ Newlib development files for the amdgcn offload target compiler.
 
 %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
 
+%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+
 %install
 cd obj-%{GCCDIST}
 
diff --git a/cross-riscv64-gcc13.spec b/cross-riscv64-gcc13.spec
index 5def4c2..559bd69 100644
--- a/cross-riscv64-gcc13.spec
+++ b/cross-riscv64-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -134,7 +134,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -293,7 +292,7 @@ ExclusiveArch:  i586 ppc64le ppc64 x86_64 s390x aarch64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
+%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1} || "%{cross_arch}" == "avr"
 # Generally only one cross for the same target triplet can be installed
 # at the same time as we are populating a non-version-specific sysroot
 Provides:       %{gcc_target_arch}-gcc
@@ -303,7 +302,7 @@ Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 # The -bootstrap packages file-conflict with the non-bootstrap variants.
 # Even if we don't actually (want to) distribute the bootstrap variants
 # the following avoids repo-checker spamming us endlessly.
-Conflicts:      cross-%{cross_arch}-gcc13
+Conflicts:      %{gcc_target_arch}-gcc
 %endif
 #!BuildIgnore: gcc-PIE
 %if 0%{build_cp:1}
@@ -312,7 +311,6 @@ Conflicts:      cross-%{cross_arch}-gcc13
 # the libs, though)
 Requires:       libstdc++6-devel-gcc13
 %endif
-AutoReqProv:    off
 %if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
@@ -365,7 +363,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -836,6 +833,9 @@ Newlib development files for the amdgcn offload target compiler.
 
 %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
 
+%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+
 %install
 cd obj-%{GCCDIST}
 
diff --git a/cross-rx-gcc13-bootstrap.spec b/cross-rx-gcc13-bootstrap.spec
index 55eb8ea..0a67d20 100644
--- a/cross-rx-gcc13-bootstrap.spec
+++ b/cross-rx-gcc13-bootstrap.spec
@@ -108,7 +108,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -135,7 +135,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -294,7 +293,7 @@ ExclusiveArch:  i586 ppc64le ppc64 x86_64 s390x aarch64 riscv64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
+%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1} || "%{cross_arch}" == "avr"
 # Generally only one cross for the same target triplet can be installed
 # at the same time as we are populating a non-version-specific sysroot
 Provides:       %{gcc_target_arch}-gcc
@@ -304,7 +303,7 @@ Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 # The -bootstrap packages file-conflict with the non-bootstrap variants.
 # Even if we don't actually (want to) distribute the bootstrap variants
 # the following avoids repo-checker spamming us endlessly.
-Conflicts:      cross-%{cross_arch}-gcc13
+Conflicts:      %{gcc_target_arch}-gcc
 %endif
 #!BuildIgnore: gcc-PIE
 %if 0%{build_cp:1}
@@ -313,7 +312,6 @@ Conflicts:      cross-%{cross_arch}-gcc13
 # the libs, though)
 Requires:       libstdc++6-devel-gcc13
 %endif
-AutoReqProv:    off
 %if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
@@ -366,7 +364,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -837,6 +834,9 @@ Newlib development files for the amdgcn offload target compiler.
 
 %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
 
+%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+
 %install
 cd obj-%{GCCDIST}
 
diff --git a/cross-rx-gcc13.spec b/cross-rx-gcc13.spec
index 0efc959..a42e729 100644
--- a/cross-rx-gcc13.spec
+++ b/cross-rx-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -134,7 +134,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -293,7 +292,7 @@ ExclusiveArch:  i586 ppc64le ppc64 x86_64 s390x aarch64 riscv64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
+%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1} || "%{cross_arch}" == "avr"
 # Generally only one cross for the same target triplet can be installed
 # at the same time as we are populating a non-version-specific sysroot
 Provides:       %{gcc_target_arch}-gcc
@@ -303,7 +302,7 @@ Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 # The -bootstrap packages file-conflict with the non-bootstrap variants.
 # Even if we don't actually (want to) distribute the bootstrap variants
 # the following avoids repo-checker spamming us endlessly.
-Conflicts:      cross-%{cross_arch}-gcc13
+Conflicts:      %{gcc_target_arch}-gcc
 %endif
 #!BuildIgnore: gcc-PIE
 %if 0%{build_cp:1}
@@ -312,7 +311,6 @@ Conflicts:      cross-%{cross_arch}-gcc13
 # the libs, though)
 Requires:       libstdc++6-devel-gcc13
 %endif
-AutoReqProv:    off
 %if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
@@ -365,7 +363,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -836,6 +833,9 @@ Newlib development files for the amdgcn offload target compiler.
 
 %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
 
+%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+
 %install
 cd obj-%{GCCDIST}
 
diff --git a/cross-s390x-gcc13-bootstrap.spec b/cross-s390x-gcc13-bootstrap.spec
index c4c6465..bd9b601 100644
--- a/cross-s390x-gcc13-bootstrap.spec
+++ b/cross-s390x-gcc13-bootstrap.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -134,7 +134,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -293,7 +292,7 @@ ExclusiveArch:  i586 ppc64le ppc64 x86_64  aarch64 riscv64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
+%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1} || "%{cross_arch}" == "avr"
 # Generally only one cross for the same target triplet can be installed
 # at the same time as we are populating a non-version-specific sysroot
 Provides:       %{gcc_target_arch}-gcc
@@ -303,7 +302,7 @@ Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 # The -bootstrap packages file-conflict with the non-bootstrap variants.
 # Even if we don't actually (want to) distribute the bootstrap variants
 # the following avoids repo-checker spamming us endlessly.
-Conflicts:      cross-%{cross_arch}-gcc13
+Conflicts:      %{gcc_target_arch}-gcc
 %endif
 #!BuildIgnore: gcc-PIE
 %if 0%{build_cp:1}
@@ -312,7 +311,6 @@ Conflicts:      cross-%{cross_arch}-gcc13
 # the libs, though)
 Requires:       libstdc++6-devel-gcc13
 %endif
-AutoReqProv:    off
 %if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
@@ -365,7 +363,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -836,6 +833,9 @@ Newlib development files for the amdgcn offload target compiler.
 
 %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
 
+%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+
 %install
 cd obj-%{GCCDIST}
 
diff --git a/cross-s390x-gcc13.spec b/cross-s390x-gcc13.spec
index 9456403..b218c1d 100644
--- a/cross-s390x-gcc13.spec
+++ b/cross-s390x-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -134,7 +134,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -293,7 +292,7 @@ ExclusiveArch:  i586 ppc64le ppc64 x86_64  aarch64 riscv64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
+%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1} || "%{cross_arch}" == "avr"
 # Generally only one cross for the same target triplet can be installed
 # at the same time as we are populating a non-version-specific sysroot
 Provides:       %{gcc_target_arch}-gcc
@@ -303,7 +302,7 @@ Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 # The -bootstrap packages file-conflict with the non-bootstrap variants.
 # Even if we don't actually (want to) distribute the bootstrap variants
 # the following avoids repo-checker spamming us endlessly.
-Conflicts:      cross-%{cross_arch}-gcc13
+Conflicts:      %{gcc_target_arch}-gcc
 %endif
 #!BuildIgnore: gcc-PIE
 %if 0%{build_cp:1}
@@ -312,7 +311,6 @@ Conflicts:      cross-%{cross_arch}-gcc13
 # the libs, though)
 Requires:       libstdc++6-devel-gcc13
 %endif
-AutoReqProv:    off
 %if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
@@ -365,7 +363,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -836,6 +833,9 @@ Newlib development files for the amdgcn offload target compiler.
 
 %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
 
+%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+
 %install
 cd obj-%{GCCDIST}
 
diff --git a/cross-sparc-gcc13.spec b/cross-sparc-gcc13.spec
index 2e1774e..be072ba 100644
--- a/cross-sparc-gcc13.spec
+++ b/cross-sparc-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -134,7 +134,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -293,7 +292,7 @@ ExclusiveArch:  i586 ppc64le ppc64 x86_64 s390x aarch64 riscv64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
+%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1} || "%{cross_arch}" == "avr"
 # Generally only one cross for the same target triplet can be installed
 # at the same time as we are populating a non-version-specific sysroot
 Provides:       %{gcc_target_arch}-gcc
@@ -303,7 +302,7 @@ Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 # The -bootstrap packages file-conflict with the non-bootstrap variants.
 # Even if we don't actually (want to) distribute the bootstrap variants
 # the following avoids repo-checker spamming us endlessly.
-Conflicts:      cross-%{cross_arch}-gcc13
+Conflicts:      %{gcc_target_arch}-gcc
 %endif
 #!BuildIgnore: gcc-PIE
 %if 0%{build_cp:1}
@@ -312,7 +311,6 @@ Conflicts:      cross-%{cross_arch}-gcc13
 # the libs, though)
 Requires:       libstdc++6-devel-gcc13
 %endif
-AutoReqProv:    off
 %if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
@@ -365,7 +363,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -836,6 +833,9 @@ Newlib development files for the amdgcn offload target compiler.
 
 %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
 
+%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+
 %install
 cd obj-%{GCCDIST}
 
diff --git a/cross-sparc64-gcc13.spec b/cross-sparc64-gcc13.spec
index 450ac4c..ed96a1a 100644
--- a/cross-sparc64-gcc13.spec
+++ b/cross-sparc64-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -134,7 +134,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -293,7 +292,7 @@ ExclusiveArch:  i586 ppc64le ppc64 x86_64 s390x aarch64 riscv64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
+%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1} || "%{cross_arch}" == "avr"
 # Generally only one cross for the same target triplet can be installed
 # at the same time as we are populating a non-version-specific sysroot
 Provides:       %{gcc_target_arch}-gcc
@@ -303,7 +302,7 @@ Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 # The -bootstrap packages file-conflict with the non-bootstrap variants.
 # Even if we don't actually (want to) distribute the bootstrap variants
 # the following avoids repo-checker spamming us endlessly.
-Conflicts:      cross-%{cross_arch}-gcc13
+Conflicts:      %{gcc_target_arch}-gcc
 %endif
 #!BuildIgnore: gcc-PIE
 %if 0%{build_cp:1}
@@ -312,7 +311,6 @@ Conflicts:      cross-%{cross_arch}-gcc13
 # the libs, though)
 Requires:       libstdc++6-devel-gcc13
 %endif
-AutoReqProv:    off
 %if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
@@ -365,7 +363,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -836,6 +833,9 @@ Newlib development files for the amdgcn offload target compiler.
 
 %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
 
+%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+
 %install
 cd obj-%{GCCDIST}
 
diff --git a/cross-x86_64-gcc13.spec b/cross-x86_64-gcc13.spec
index de1f8cc..54029d5 100644
--- a/cross-x86_64-gcc13.spec
+++ b/cross-x86_64-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -134,7 +134,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -293,7 +292,7 @@ ExclusiveArch:  i586 ppc64le ppc64  s390x aarch64 riscv64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
+%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1} || "%{cross_arch}" == "avr"
 # Generally only one cross for the same target triplet can be installed
 # at the same time as we are populating a non-version-specific sysroot
 Provides:       %{gcc_target_arch}-gcc
@@ -303,7 +302,7 @@ Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 # The -bootstrap packages file-conflict with the non-bootstrap variants.
 # Even if we don't actually (want to) distribute the bootstrap variants
 # the following avoids repo-checker spamming us endlessly.
-Conflicts:      cross-%{cross_arch}-gcc13
+Conflicts:      %{gcc_target_arch}-gcc
 %endif
 #!BuildIgnore: gcc-PIE
 %if 0%{build_cp:1}
@@ -312,7 +311,6 @@ Conflicts:      cross-%{cross_arch}-gcc13
 # the libs, though)
 Requires:       libstdc++6-devel-gcc13
 %endif
-AutoReqProv:    off
 %if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
@@ -365,7 +363,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -836,6 +833,9 @@ Newlib development files for the amdgcn offload target compiler.
 
 %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
 
+%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+
 %install
 cd obj-%{GCCDIST}
 
diff --git a/cross.spec.in b/cross.spec.in
index a3b1657..de87ced 100644
--- a/cross.spec.in
+++ b/cross.spec.in
@@ -195,7 +195,7 @@ ExclusiveArch: i586 ppc64le ppc64 x86_64 s390x aarch64 riscv64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes: cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1}
+%if 0%{?gcc_target_newlib:1}%{?gcc_target_glibc:1} || "%{cross_arch}" == "avr"
 # Generally only one cross for the same target triplet can be installed
 # at the same time as we are populating a non-version-specific sysroot
 Provides: %{gcc_target_arch}-gcc
@@ -205,7 +205,7 @@ Conflicts: %selfconflict %{gcc_target_arch}-gcc
 # The -bootstrap packages file-conflict with the non-bootstrap variants.
 # Even if we don't actually (want to) distribute the bootstrap variants
 # the following avoids repo-checker spamming us endlessly.
-Conflicts: cross-%{cross_arch}-gcc@base_ver@
+Conflicts: %{gcc_target_arch}-gcc
 %endif
 #!BuildIgnore: gcc-PIE
 %if 0%{build_cp:1}
@@ -214,7 +214,6 @@ Conflicts: cross-%{cross_arch}-gcc@base_ver@
 # the libs, though)
 Requires:       libstdc++6-devel-gcc@base_ver@
 %endif
-AutoReqProv:    off
 %if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
@@ -279,6 +278,9 @@ Newlib development files for the amdgcn offload target compiler.
 
 %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
 
+%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$
+
 %install
 cd obj-%{GCCDIST}
 
diff --git a/gcc-13.3.1+git9426.tar.xz b/gcc-13.3.1+git9426.tar.xz
deleted file mode 120000
index 5f1d161..0000000
--- a/gcc-13.3.1+git9426.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeiahd3nmrcxndftcjuu6mk7qzwhtfdruq6sdj3cey4yyzm35n3wopu
\ No newline at end of file
diff --git a/gcc-13.4.0+git9739.tar.xz b/gcc-13.4.0+git9739.tar.xz
new file mode 120000
index 0000000..6735589
--- /dev/null
+++ b/gcc-13.4.0+git9739.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeiejfsps47k3apw4ymi6lykg62ctcwdx7rwve44lpdkahvrk37cw3m
\ No newline at end of file
diff --git a/gcc.spec.in b/gcc.spec.in
index 32ce8cb..16d84b3 100644
--- a/gcc.spec.in
+++ b/gcc.spec.in
@@ -209,7 +209,7 @@
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:          https://gcc.gnu.org/
-Version: 13.3.1+git9426
+Version: 13.4.0+git9739
 Release:      1
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -391,7 +391,6 @@ Patch18:	gcc10-amdgcn-llvm-as.patch
 Patch19:	gcc11-gdwarf-4-default.patch
 Patch20:	gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:	gcc13-bsc1216664.patch
 Patch24:	gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:	gcc13-pr101523.patch
 Patch27:	gcc13-amdgcn-remove-fiji.patch
@@ -1368,7 +1367,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -1825,6 +1823,8 @@ mkdir ../testresults
 ../contrib/test_summary | tee ../testresults/test_summary.txt
 %endif
 
+%define __provides_exclude_from ^%{libsubdir}/.*\.so.*$
+
 %install
 # Make sure libtool re-linking libasan at install time doesn't drop the
 # libstdc++ reference to make asan of C++ modules in python work
diff --git a/gcc13-bsc1216664.patch b/gcc13-bsc1216664.patch
deleted file mode 100644
index 87222f6..0000000
--- a/gcc13-bsc1216664.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 7562f089a190953b8ef615b90b7b0520e812a930 Mon Sep 17 00:00:00 2001
-From: Richard Biener <rguenther@suse.de>
-Date: Mon, 6 Nov 2023 11:31:40 +0100
-Subject: [PATCH] libstdc++/112351 - deal with __gthread_once failure during
- locale init
-To: gcc-patches@gcc.gnu.org
-
-The following makes the C++98 locale init path follow the way the
-C++11 performs initialization.  This way we deal with pthread_once
-failing, falling back to non-threadsafe initialization which, given we
-initialize from the library, should be serialized by the dynamic
-loader already.
-
-	PR libstdc++/112351
-libstdc++-v3/
-	* src/c++98/locale.cc (locale::facet::_S_initialize_once):
-	Check whether _S_c_locale is already initialized.
-	(locale::facet::_S_get_c_locale): Always perform non-threadsafe
-	init when threadsafe init failed.
----
- libstdc++-v3/src/c++98/locale.cc | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/libstdc++-v3/src/c++98/locale.cc b/libstdc++-v3/src/c++98/locale.cc
-index d308140bab7..1ef0c394cd7 100644
---- a/libstdc++-v3/src/c++98/locale.cc
-+++ b/libstdc++-v3/src/c++98/locale.cc
-@@ -206,6 +206,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
-   void
-   locale::facet::_S_initialize_once()
-   {
-+    // Need to check this because we could get called once from
-+    // _S_get_c_locale() when the program is single-threaded, and then again
-+    // (via __gthread_once) when it's multi-threaded.
-+    if (_S_c_locale)
-+      return;
-+
-     // Initialize the underlying locale model.
-     _S_create_c_locale(_S_c_locale, _S_c_name);
-   }
-@@ -216,12 +222,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
- #ifdef __GTHREADS
-     if (__gthread_active_p())
-       __gthread_once(&_S_once, _S_initialize_once);
--    else
- #endif
--      {
--	if (!_S_c_locale)
--	  _S_initialize_once();
--      }
-+    if (__builtin_expect (!_S_c_locale, 0))
-+      _S_initialize_once();
-     return _S_c_locale;
-   }
- 
--- 
-2.35.3
-
diff --git a/gcc13-testresults.spec b/gcc13-testresults.spec
index c288a45..eeda620 100644
--- a/gcc13-testresults.spec
+++ b/gcc13-testresults.spec
@@ -226,7 +226,7 @@
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -407,7 +407,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -554,7 +553,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -1008,6 +1006,8 @@ mkdir ../testresults
 ../contrib/test_summary | tee ../testresults/test_summary.txt
 %endif
 
+%define __provides_exclude_from ^%{libsubdir}/.*\.so.*$
+
 %install
 # Make sure libtool re-linking libasan at install time doesn't drop the
 # libstdc++ reference to make asan of C++ modules in python work
diff --git a/gcc13.changes b/gcc13.changes
index 87452b1..8492be3 100644
--- a/gcc13.changes
+++ b/gcc13.changes
@@ -1,4 +1,35 @@
 -------------------------------------------------------------------
+Thu Jun  5 17:02:16 UTC 2025 - Richard Biener <rguenther@suse.com>
+
+- Update to GCC 13.4 release
+  * collects regression fixes from the last year
+- Remove hppa icecream backend to avoid conflicts with the
+  hppa bootstrap compiler
+
+-------------------------------------------------------------------
+Wed Jun  4 11:38:59 UTC 2025 - Richard Biener <rguenther@suse.com>
+
+- Re-enable AutoReqProv for cross packages but filter files processed
+  via __requires_exclude_from and __provides_exclude_from.
+  [boo#1219031]
+- Exclude shared objects present for link editing in the GCC specific
+  subdirectory from provides processing via __provides_exclude_from.
+  [bsc#1244050][bsc#1243991]
+
+-------------------------------------------------------------------
+Tue Jun  3 12:36:35 UTC 2025 - Richard Biener <rguenther@suse.com>
+
+- Make cross-*-gcc13-bootstrap package conflict with the non-bootstrap
+  variant conflict with the unversioned cross-*-gcc package.
+
+-------------------------------------------------------------------
+Fri May 30 13:49:58 UTC 2025 - Richard Biener <rguenther@suse.com>
+
+- Update to gcc-13 branch head, ec78a0d9962f144b13c6da3ebe, git9730
+  * GCC 13.4 RC2
+  * Includes gcc13-bsc1216664.patch
+
+-------------------------------------------------------------------
 Tue Apr 22 14:31:57 UTC 2025 - Richard Biener <rguenther@suse.com>
 
 - Fix s390x build by using a glob for installed libgcc_s.so and
diff --git a/gcc13.spec b/gcc13.spec
index a79a52b..a053389 100644
--- a/gcc13.spec
+++ b/gcc13.spec
@@ -205,7 +205,7 @@
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.3.1+git9426
+Version:        13.4.0+git9739
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -386,7 +386,6 @@ Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 Patch21:        gdcflags.patch
-Patch23:        gcc13-bsc1216664.patch
 Patch24:        gcc13-sanitizer-remove-crypt-interception.patch
 Patch26:        gcc13-pr101523.patch
 Patch27:        gcc13-amdgcn-remove-fiji.patch
@@ -2378,7 +2377,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch -P 19 -p1
 %endif
 %patch -P 21 -p1
-%patch -P 23 -p1
 %patch -P 24 -p1
 %patch -P 26 -p1
 %patch -P 27 -p1
@@ -2832,6 +2830,8 @@ mkdir ../testresults
 ../contrib/test_summary | tee ../testresults/test_summary.txt
 %endif
 
+%define __provides_exclude_from ^%{libsubdir}/.*\.so.*$
+
 %install
 # Make sure libtool re-linking libasan at install time doesn't drop the
 # libstdc++ reference to make asan of C++ modules in python work