Accepting request 1290114 from devel:gcc

- Tune for power10 for SLES 16.  [jsc#PED-12029]
- Tune for z15 for SLES 16.  [jsc#PED-253]

OBS-URL: https://build.opensuse.org/request/show/1290114
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gcc13?expand=0&rev=37

_multibuild

@@ -14,7 +14,11 @@
 <flavor>cross-pru-gcc13-bootstrap</flavor>
 <flavor>cross-pru-gcc13</flavor>
 <flavor>cross-x86_64-gcc13</flavor>
+<flavor>cross-sparc-gcc13</flavor>
+<flavor>cross-sparc64-gcc13</flavor>
 <flavor>cross-ppc64-gcc13</flavor>
+<flavor>cross-m68k-gcc13</flavor>
+<flavor>cross-mips-gcc13</flavor>
 <flavor>cross-hppa-gcc13-bootstrap</flavor>
 <flavor>cross-arm-none-gcc13-bootstrap</flavor>
 <flavor>cross-arm-none-gcc13</flavor>

change_spec

@@ -87,16 +87,10 @@ add_newlib_cross() {
 }
 
 add_glibc_cross() {
-  add_cross $1-bootstrap $2 $3 "%define gcc_target_glibc 1
-%define gcc_libc_bootstrap 1"
+  add_cross $1-bootstrap $2 $3 "%define gcc_libc_bootstrap 1"
   add_cross $1           $2 $3 "%define gcc_target_glibc 1"
 }
 
-add_glibc_bootstrap_cross() {
-  add_cross $1 $2 $3 "%define gcc_target_glibc 1
-%define gcc_libc_bootstrap 1"
-}
-
 # We now support "proper" cross-compilers to suse targets via a
 # cross-glibc package, enable that via for example
 #
@@ -108,16 +102,16 @@ add_glibc_cross cross-aarch64-gcc$base_ver aarch64 aarch64-suse-linux
 add_glibc_cross cross-riscv64-gcc$base_ver riscv64 riscv64-suse-linux
 add_glibc_cross cross-s390x-gcc$base_ver s390x s390x-suse-linux
 add_glibc_cross cross-ppc64le-gcc$base_ver ppc64le powerpc64le-suse-linux
-add_glibc_bootstrap_cross cross-arm-gcc$base_ver arm arm-suse-linux-gnueabi
+add_cross cross-arm-gcc$base_ver arm arm-suse-linux-gnueabi %define gcc_icecream 1
 add_cross cross-avr-gcc$base_ver-bootstrap avr avr "%define gcc_libc_bootstrap 1"
 add_cross cross-avr-gcc$base_ver avr avr
 add_newlib_cross cross-pru-gcc$base_ver pru pru
-add_glibc_bootstrap_cross cross-x86_64-gcc$base_ver x86_64 x86_64-suse-linux
-#add_cross cross-sparc-gcc$base_ver sparcv9 sparc-suse-linux %define gcc_icecream 1
-#add_cross cross-sparc64-gcc$base_ver sparc64 sparc64-suse-linux %define gcc_icecream 1
-add_glibc_bootstrap_cross cross-ppc64-gcc$base_ver ppc64 powerpc64-suse-linux
-#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-x86_64-gcc$base_ver x86_64 x86_64-suse-linux %define gcc_icecream 1
+add_cross cross-sparc-gcc$base_ver sparcv9 sparc-suse-linux %define gcc_icecream 1
+add_cross cross-sparc64-gcc$base_ver sparc64 sparc64-suse-linux %define gcc_icecream 1
+add_cross cross-ppc64-gcc$base_ver ppc64 powerpc64-suse-linux %define gcc_icecream 1
+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_newlib_cross cross-arm-none-gcc$base_ver arm-none arm-none-eabi
 #add_newlib_cross cross-epiphany-gcc$base_ver epiphany epiphany-elf

cross-aarch64-gcc13-bootstrap.spec

@@ -19,7 +19,6 @@
 %define pkgname cross-aarch64-gcc13-bootstrap
 %define cross_arch aarch64
 %define gcc_target_arch aarch64-suse-linux
-%define gcc_target_glibc 1
 %define gcc_libc_bootstrap 1
 # nospeccleaner
 
@@ -293,24 +292,26 @@ 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_accel: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
+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.
-Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %{gcc_target_arch}-gcc
-Conflicts:      %{pkgname}-bootstrap
 %endif
 #!BuildIgnore: gcc-PIE
-%if %{build_cp}
+%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
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun): update-alternatives
@@ -586,11 +587,11 @@ amdgcn-amdhsa,\
 	--enable-gnu-indirect-function \
 %endif
 %endif
+	--program-suffix=%{binsuffix} \
 %ifarch %{disable_multilib_arch}
 	--disable-multilib \
 %endif
 %if 0%{!?gcc_target_arch:1}
-	--program-suffix=%{binsuffix} \
 %ifarch ia64
 	--with-system-libunwind \
 %else
@@ -598,9 +599,6 @@ amdgcn-amdhsa,\
 %endif
 %endif
 %if 0%{?gcc_target_arch:1}
-%if 0%{?gcc_accel:1} || %{suse_version} < 1600
-	--program-suffix=%{binsuffix} \
-%endif
 	--program-prefix=%{gcc_target_arch}- \
 	--target=%{gcc_target_arch} \
 	--disable-nls \
@@ -863,7 +861,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 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
+# 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.
@@ -888,7 +886,6 @@ 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}/f951
 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
@@ -896,8 +893,6 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 # 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}
-# also remove installed libstdc++ headers
-rm -rf $RPM_BUILD_ROOT%{_prefix}/include/c++
 %endif
 # for amdgcn install the symlinks to the llvm tools
 # follow alternatives symlinks to the hardcoded version requirement
@@ -962,7 +957,7 @@ rm -r env
 
 # we provide update-alternatives for selecting a compiler version for
 # crosses
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
 %if %{build_cp}
@@ -1018,19 +1013,15 @@ fi
 %endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
-%if %{suse_version} < 1600
 %{_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}
-%endif
 %if 0%{!?gcc_libc_bootstrap:1} && "%{cross_arch}" != "bpf"
-%if %{suse_version} < 1600
 %{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
-%endif
 %{_prefix}/bin/%{gcc_target_arch}-gcov
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool
@@ -1041,7 +1032,6 @@ fi
 %{_prefix}/bin/%{gcc_target_arch}-gcc-nm
 %{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib
 %{_prefix}/bin/%{gcc_target_arch}-lto-dump
-%if %{suse_version} < 1600
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-cpp
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc-ar
@@ -1053,16 +1043,13 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
 %endif
-%endif
 %if %{build_cp}
-%{_prefix}/bin/%{gcc_target_arch}-c++
-%{_prefix}/bin/%{gcc_target_arch}-g++
-%if %{suse_version} < 1600
 %{_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++
-%endif
 %if 0%{!?gcc_libc_bootstrap:1}
 %if "%{cross_arch}" == "avr" || 0%{?gcc_target_newlib:1} || 0%{?gcc_target_glibc:1}
 %{_prefix}/include/c++

cross-aarch64-gcc13.spec

@@ -292,24 +292,26 @@ 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_accel: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
+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.
-Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %{gcc_target_arch}-gcc
-Conflicts:      %{pkgname}-bootstrap
 %endif
 #!BuildIgnore: gcc-PIE
-%if %{build_cp}
+%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
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun): update-alternatives
@@ -585,11 +587,11 @@ amdgcn-amdhsa,\
 	--enable-gnu-indirect-function \
 %endif
 %endif
+	--program-suffix=%{binsuffix} \
 %ifarch %{disable_multilib_arch}
 	--disable-multilib \
 %endif
 %if 0%{!?gcc_target_arch:1}
-	--program-suffix=%{binsuffix} \
 %ifarch ia64
 	--with-system-libunwind \
 %else
@@ -597,9 +599,6 @@ amdgcn-amdhsa,\
 %endif
 %endif
 %if 0%{?gcc_target_arch:1}
-%if 0%{?gcc_accel:1} || %{suse_version} < 1600
-	--program-suffix=%{binsuffix} \
-%endif
 	--program-prefix=%{gcc_target_arch}- \
 	--target=%{gcc_target_arch} \
 	--disable-nls \
@@ -862,7 +861,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 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
+# 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.
@@ -887,7 +886,6 @@ 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}/f951
 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
@@ -895,8 +893,6 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 # 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}
-# also remove installed libstdc++ headers
-rm -rf $RPM_BUILD_ROOT%{_prefix}/include/c++
 %endif
 # for amdgcn install the symlinks to the llvm tools
 # follow alternatives symlinks to the hardcoded version requirement
@@ -961,7 +957,7 @@ rm -r env
 
 # we provide update-alternatives for selecting a compiler version for
 # crosses
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
 %if %{build_cp}
@@ -1017,19 +1013,15 @@ fi
 %endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
-%if %{suse_version} < 1600
 %{_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}
-%endif
 %if 0%{!?gcc_libc_bootstrap:1} && "%{cross_arch}" != "bpf"
-%if %{suse_version} < 1600
 %{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
-%endif
 %{_prefix}/bin/%{gcc_target_arch}-gcov
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool
@@ -1040,7 +1032,6 @@ fi
 %{_prefix}/bin/%{gcc_target_arch}-gcc-nm
 %{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib
 %{_prefix}/bin/%{gcc_target_arch}-lto-dump
-%if %{suse_version} < 1600
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-cpp
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc-ar
@@ -1052,16 +1043,13 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
 %endif
-%endif
 %if %{build_cp}
-%{_prefix}/bin/%{gcc_target_arch}-c++
-%{_prefix}/bin/%{gcc_target_arch}-g++
-%if %{suse_version} < 1600
 %{_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++
-%endif
 %if 0%{!?gcc_libc_bootstrap:1}
 %if "%{cross_arch}" == "avr" || 0%{?gcc_target_newlib:1} || 0%{?gcc_target_glibc:1}
 %{_prefix}/include/c++

cross-amdgcn-gcc13.spec

@@ -292,24 +292,26 @@ 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_accel: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
+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.
-Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %{gcc_target_arch}-gcc
-Conflicts:      %{pkgname}-bootstrap
 %endif
 #!BuildIgnore: gcc-PIE
-%if %{build_cp}
+%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
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun): update-alternatives
@@ -585,11 +587,11 @@ amdgcn-amdhsa,\
 	--enable-gnu-indirect-function \
 %endif
 %endif
+	--program-suffix=%{binsuffix} \
 %ifarch %{disable_multilib_arch}
 	--disable-multilib \
 %endif
 %if 0%{!?gcc_target_arch:1}
-	--program-suffix=%{binsuffix} \
 %ifarch ia64
 	--with-system-libunwind \
 %else
@@ -597,9 +599,6 @@ amdgcn-amdhsa,\
 %endif
 %endif
 %if 0%{?gcc_target_arch:1}
-%if 0%{?gcc_accel:1} || %{suse_version} < 1600
-	--program-suffix=%{binsuffix} \
-%endif
 	--program-prefix=%{gcc_target_arch}- \
 	--target=%{gcc_target_arch} \
 	--disable-nls \
@@ -862,7 +861,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 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
+# 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.
@@ -887,7 +886,6 @@ 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}/f951
 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
@@ -895,8 +893,6 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 # 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}
-# also remove installed libstdc++ headers
-rm -rf $RPM_BUILD_ROOT%{_prefix}/include/c++
 %endif
 # for amdgcn install the symlinks to the llvm tools
 # follow alternatives symlinks to the hardcoded version requirement
@@ -961,7 +957,7 @@ rm -r env
 
 # we provide update-alternatives for selecting a compiler version for
 # crosses
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
 %if %{build_cp}
@@ -1017,19 +1013,15 @@ fi
 %endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
-%if %{suse_version} < 1600
 %{_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}
-%endif
 %if 0%{!?gcc_libc_bootstrap:1} && "%{cross_arch}" != "bpf"
-%if %{suse_version} < 1600
 %{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
-%endif
 %{_prefix}/bin/%{gcc_target_arch}-gcov
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool
@@ -1040,7 +1032,6 @@ fi
 %{_prefix}/bin/%{gcc_target_arch}-gcc-nm
 %{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib
 %{_prefix}/bin/%{gcc_target_arch}-lto-dump
-%if %{suse_version} < 1600
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-cpp
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc-ar
@@ -1052,16 +1043,13 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
 %endif
-%endif
 %if %{build_cp}
-%{_prefix}/bin/%{gcc_target_arch}-c++
-%{_prefix}/bin/%{gcc_target_arch}-g++
-%if %{suse_version} < 1600
 %{_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++
-%endif
 %if 0%{!?gcc_libc_bootstrap:1}
 %if "%{cross_arch}" == "avr" || 0%{?gcc_target_newlib:1} || 0%{?gcc_target_glibc:1}
 %{_prefix}/include/c++

cross-arm-gcc13.spec

@@ -19,8 +19,7 @@
 %define pkgname cross-arm-gcc13
 %define cross_arch arm
 %define gcc_target_arch arm-suse-linux-gnueabi
-%define gcc_target_glibc 1
-%define gcc_libc_bootstrap 1
+%define gcc_icecream 1
 # nospeccleaner
 
 %define build_cp 0%{!?gcc_accel:1}
@@ -293,24 +292,26 @@ 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_accel: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
+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.
-Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %{gcc_target_arch}-gcc
-Conflicts:      %{pkgname}-bootstrap
 %endif
 #!BuildIgnore: gcc-PIE
-%if %{build_cp}
+%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
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun): update-alternatives
@@ -586,11 +587,11 @@ amdgcn-amdhsa,\
 	--enable-gnu-indirect-function \
 %endif
 %endif
+	--program-suffix=%{binsuffix} \
 %ifarch %{disable_multilib_arch}
 	--disable-multilib \
 %endif
 %if 0%{!?gcc_target_arch:1}
-	--program-suffix=%{binsuffix} \
 %ifarch ia64
 	--with-system-libunwind \
 %else
@@ -598,9 +599,6 @@ amdgcn-amdhsa,\
 %endif
 %endif
 %if 0%{?gcc_target_arch:1}
-%if 0%{?gcc_accel:1} || %{suse_version} < 1600
-	--program-suffix=%{binsuffix} \
-%endif
 	--program-prefix=%{gcc_target_arch}- \
 	--target=%{gcc_target_arch} \
 	--disable-nls \
@@ -863,7 +861,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 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
+# 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.
@@ -888,7 +886,6 @@ 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}/f951
 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
@@ -896,8 +893,6 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 # 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}
-# also remove installed libstdc++ headers
-rm -rf $RPM_BUILD_ROOT%{_prefix}/include/c++
 %endif
 # for amdgcn install the symlinks to the llvm tools
 # follow alternatives symlinks to the hardcoded version requirement
@@ -962,7 +957,7 @@ rm -r env
 
 # we provide update-alternatives for selecting a compiler version for
 # crosses
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
 %if %{build_cp}
@@ -1018,19 +1013,15 @@ fi
 %endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
-%if %{suse_version} < 1600
 %{_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}
-%endif
 %if 0%{!?gcc_libc_bootstrap:1} && "%{cross_arch}" != "bpf"
-%if %{suse_version} < 1600
 %{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
-%endif
 %{_prefix}/bin/%{gcc_target_arch}-gcov
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool
@@ -1041,7 +1032,6 @@ fi
 %{_prefix}/bin/%{gcc_target_arch}-gcc-nm
 %{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib
 %{_prefix}/bin/%{gcc_target_arch}-lto-dump
-%if %{suse_version} < 1600
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-cpp
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc-ar
@@ -1053,16 +1043,13 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
 %endif
-%endif
 %if %{build_cp}
-%{_prefix}/bin/%{gcc_target_arch}-c++
-%{_prefix}/bin/%{gcc_target_arch}-g++
-%if %{suse_version} < 1600
 %{_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++
-%endif
 %if 0%{!?gcc_libc_bootstrap:1}
 %if "%{cross_arch}" == "avr" || 0%{?gcc_target_newlib:1} || 0%{?gcc_target_glibc:1}
 %{_prefix}/include/c++

cross-arm-none-gcc13-bootstrap.spec

@@ -293,24 +293,26 @@ 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_accel: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
+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.
-Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %{gcc_target_arch}-gcc
-Conflicts:      %{pkgname}-bootstrap
 %endif
 #!BuildIgnore: gcc-PIE
-%if %{build_cp}
+%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
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun): update-alternatives
@@ -586,11 +588,11 @@ amdgcn-amdhsa,\
 	--enable-gnu-indirect-function \
 %endif
 %endif
+	--program-suffix=%{binsuffix} \
 %ifarch %{disable_multilib_arch}
 	--disable-multilib \
 %endif
 %if 0%{!?gcc_target_arch:1}
-	--program-suffix=%{binsuffix} \
 %ifarch ia64
 	--with-system-libunwind \
 %else
@@ -598,9 +600,6 @@ amdgcn-amdhsa,\
 %endif
 %endif
 %if 0%{?gcc_target_arch:1}
-%if 0%{?gcc_accel:1} || %{suse_version} < 1600
-	--program-suffix=%{binsuffix} \
-%endif
 	--program-prefix=%{gcc_target_arch}- \
 	--target=%{gcc_target_arch} \
 	--disable-nls \
@@ -863,7 +862,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 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
+# 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.
@@ -888,7 +887,6 @@ 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}/f951
 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
@@ -896,8 +894,6 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 # 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}
-# also remove installed libstdc++ headers
-rm -rf $RPM_BUILD_ROOT%{_prefix}/include/c++
 %endif
 # for amdgcn install the symlinks to the llvm tools
 # follow alternatives symlinks to the hardcoded version requirement
@@ -962,7 +958,7 @@ rm -r env
 
 # we provide update-alternatives for selecting a compiler version for
 # crosses
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
 %if %{build_cp}
@@ -1018,19 +1014,15 @@ fi
 %endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
-%if %{suse_version} < 1600
 %{_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}
-%endif
 %if 0%{!?gcc_libc_bootstrap:1} && "%{cross_arch}" != "bpf"
-%if %{suse_version} < 1600
 %{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
-%endif
 %{_prefix}/bin/%{gcc_target_arch}-gcov
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool
@@ -1041,7 +1033,6 @@ fi
 %{_prefix}/bin/%{gcc_target_arch}-gcc-nm
 %{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib
 %{_prefix}/bin/%{gcc_target_arch}-lto-dump
-%if %{suse_version} < 1600
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-cpp
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc-ar
@@ -1053,16 +1044,13 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
 %endif
-%endif
 %if %{build_cp}
-%{_prefix}/bin/%{gcc_target_arch}-c++
-%{_prefix}/bin/%{gcc_target_arch}-g++
-%if %{suse_version} < 1600
 %{_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++
-%endif
 %if 0%{!?gcc_libc_bootstrap:1}
 %if "%{cross_arch}" == "avr" || 0%{?gcc_target_newlib:1} || 0%{?gcc_target_glibc:1}
 %{_prefix}/include/c++

cross-arm-none-gcc13.spec

@@ -292,24 +292,26 @@ 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_accel: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
+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.
-Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %{gcc_target_arch}-gcc
-Conflicts:      %{pkgname}-bootstrap
 %endif
 #!BuildIgnore: gcc-PIE
-%if %{build_cp}
+%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
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun): update-alternatives
@@ -585,11 +587,11 @@ amdgcn-amdhsa,\
 	--enable-gnu-indirect-function \
 %endif
 %endif
+	--program-suffix=%{binsuffix} \
 %ifarch %{disable_multilib_arch}
 	--disable-multilib \
 %endif
 %if 0%{!?gcc_target_arch:1}
-	--program-suffix=%{binsuffix} \
 %ifarch ia64
 	--with-system-libunwind \
 %else
@@ -597,9 +599,6 @@ amdgcn-amdhsa,\
 %endif
 %endif
 %if 0%{?gcc_target_arch:1}
-%if 0%{?gcc_accel:1} || %{suse_version} < 1600
-	--program-suffix=%{binsuffix} \
-%endif
 	--program-prefix=%{gcc_target_arch}- \
 	--target=%{gcc_target_arch} \
 	--disable-nls \
@@ -862,7 +861,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 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
+# 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.
@@ -887,7 +886,6 @@ 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}/f951
 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
@@ -895,8 +893,6 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 # 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}
-# also remove installed libstdc++ headers
-rm -rf $RPM_BUILD_ROOT%{_prefix}/include/c++
 %endif
 # for amdgcn install the symlinks to the llvm tools
 # follow alternatives symlinks to the hardcoded version requirement
@@ -961,7 +957,7 @@ rm -r env
 
 # we provide update-alternatives for selecting a compiler version for
 # crosses
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
 %if %{build_cp}
@@ -1017,19 +1013,15 @@ fi
 %endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
-%if %{suse_version} < 1600
 %{_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}
-%endif
 %if 0%{!?gcc_libc_bootstrap:1} && "%{cross_arch}" != "bpf"
-%if %{suse_version} < 1600
 %{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
-%endif
 %{_prefix}/bin/%{gcc_target_arch}-gcov
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool
@@ -1040,7 +1032,6 @@ fi
 %{_prefix}/bin/%{gcc_target_arch}-gcc-nm
 %{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib
 %{_prefix}/bin/%{gcc_target_arch}-lto-dump
-%if %{suse_version} < 1600
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-cpp
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc-ar
@@ -1052,16 +1043,13 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
 %endif
-%endif
 %if %{build_cp}
-%{_prefix}/bin/%{gcc_target_arch}-c++
-%{_prefix}/bin/%{gcc_target_arch}-g++
-%if %{suse_version} < 1600
 %{_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++
-%endif
 %if 0%{!?gcc_libc_bootstrap:1}
 %if "%{cross_arch}" == "avr" || 0%{?gcc_target_newlib:1} || 0%{?gcc_target_glibc:1}
 %{_prefix}/include/c++

cross-avr-gcc13-bootstrap.spec

@@ -292,24 +292,26 @@ 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_accel: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
+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.
-Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %{gcc_target_arch}-gcc
-Conflicts:      %{pkgname}-bootstrap
 %endif
 #!BuildIgnore: gcc-PIE
-%if %{build_cp}
+%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
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun): update-alternatives
@@ -585,11 +587,11 @@ amdgcn-amdhsa,\
 	--enable-gnu-indirect-function \
 %endif
 %endif
+	--program-suffix=%{binsuffix} \
 %ifarch %{disable_multilib_arch}
 	--disable-multilib \
 %endif
 %if 0%{!?gcc_target_arch:1}
-	--program-suffix=%{binsuffix} \
 %ifarch ia64
 	--with-system-libunwind \
 %else
@@ -597,9 +599,6 @@ amdgcn-amdhsa,\
 %endif
 %endif
 %if 0%{?gcc_target_arch:1}
-%if 0%{?gcc_accel:1} || %{suse_version} < 1600
-	--program-suffix=%{binsuffix} \
-%endif
 	--program-prefix=%{gcc_target_arch}- \
 	--target=%{gcc_target_arch} \
 	--disable-nls \
@@ -862,7 +861,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 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
+# 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.
@@ -887,7 +886,6 @@ 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}/f951
 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
@@ -895,8 +893,6 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 # 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}
-# also remove installed libstdc++ headers
-rm -rf $RPM_BUILD_ROOT%{_prefix}/include/c++
 %endif
 # for amdgcn install the symlinks to the llvm tools
 # follow alternatives symlinks to the hardcoded version requirement
@@ -961,7 +957,7 @@ rm -r env
 
 # we provide update-alternatives for selecting a compiler version for
 # crosses
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
 %if %{build_cp}
@@ -1017,19 +1013,15 @@ fi
 %endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
-%if %{suse_version} < 1600
 %{_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}
-%endif
 %if 0%{!?gcc_libc_bootstrap:1} && "%{cross_arch}" != "bpf"
-%if %{suse_version} < 1600
 %{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
-%endif
 %{_prefix}/bin/%{gcc_target_arch}-gcov
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool
@@ -1040,7 +1032,6 @@ fi
 %{_prefix}/bin/%{gcc_target_arch}-gcc-nm
 %{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib
 %{_prefix}/bin/%{gcc_target_arch}-lto-dump
-%if %{suse_version} < 1600
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-cpp
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc-ar
@@ -1052,16 +1043,13 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
 %endif
-%endif
 %if %{build_cp}
-%{_prefix}/bin/%{gcc_target_arch}-c++
-%{_prefix}/bin/%{gcc_target_arch}-g++
-%if %{suse_version} < 1600
 %{_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++
-%endif
 %if 0%{!?gcc_libc_bootstrap:1}
 %if "%{cross_arch}" == "avr" || 0%{?gcc_target_newlib:1} || 0%{?gcc_target_glibc:1}
 %{_prefix}/include/c++

cross-avr-gcc13.spec

@@ -292,24 +292,26 @@ 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_accel: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
+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.
-Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %{gcc_target_arch}-gcc
-Conflicts:      %{pkgname}-bootstrap
 %endif
 #!BuildIgnore: gcc-PIE
-%if %{build_cp}
+%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
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun): update-alternatives
@@ -585,11 +587,11 @@ amdgcn-amdhsa,\
 	--enable-gnu-indirect-function \
 %endif
 %endif
+	--program-suffix=%{binsuffix} \
 %ifarch %{disable_multilib_arch}
 	--disable-multilib \
 %endif
 %if 0%{!?gcc_target_arch:1}
-	--program-suffix=%{binsuffix} \
 %ifarch ia64
 	--with-system-libunwind \
 %else
@@ -597,9 +599,6 @@ amdgcn-amdhsa,\
 %endif
 %endif
 %if 0%{?gcc_target_arch:1}
-%if 0%{?gcc_accel:1} || %{suse_version} < 1600
-	--program-suffix=%{binsuffix} \
-%endif
 	--program-prefix=%{gcc_target_arch}- \
 	--target=%{gcc_target_arch} \
 	--disable-nls \
@@ -862,7 +861,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 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
+# 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.
@@ -887,7 +886,6 @@ 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}/f951
 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
@@ -895,8 +893,6 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 # 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}
-# also remove installed libstdc++ headers
-rm -rf $RPM_BUILD_ROOT%{_prefix}/include/c++
 %endif
 # for amdgcn install the symlinks to the llvm tools
 # follow alternatives symlinks to the hardcoded version requirement
@@ -961,7 +957,7 @@ rm -r env
 
 # we provide update-alternatives for selecting a compiler version for
 # crosses
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
 %if %{build_cp}
@@ -1017,19 +1013,15 @@ fi
 %endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
-%if %{suse_version} < 1600
 %{_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}
-%endif
 %if 0%{!?gcc_libc_bootstrap:1} && "%{cross_arch}" != "bpf"
-%if %{suse_version} < 1600
 %{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
-%endif
 %{_prefix}/bin/%{gcc_target_arch}-gcov
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool
@@ -1040,7 +1032,6 @@ fi
 %{_prefix}/bin/%{gcc_target_arch}-gcc-nm
 %{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib
 %{_prefix}/bin/%{gcc_target_arch}-lto-dump
-%if %{suse_version} < 1600
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-cpp
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc-ar
@@ -1052,16 +1043,13 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
 %endif
-%endif
 %if %{build_cp}
-%{_prefix}/bin/%{gcc_target_arch}-c++
-%{_prefix}/bin/%{gcc_target_arch}-g++
-%if %{suse_version} < 1600
 %{_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++
-%endif
 %if 0%{!?gcc_libc_bootstrap:1}
 %if "%{cross_arch}" == "avr" || 0%{?gcc_target_newlib:1} || 0%{?gcc_target_glibc:1}
 %{_prefix}/include/c++

cross-bpf-gcc13.spec

@@ -292,24 +292,26 @@ 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_accel: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
+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.
-Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %{gcc_target_arch}-gcc
-Conflicts:      %{pkgname}-bootstrap
 %endif
 #!BuildIgnore: gcc-PIE
-%if %{build_cp}
+%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
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun): update-alternatives
@@ -585,11 +587,11 @@ amdgcn-amdhsa,\
 	--enable-gnu-indirect-function \
 %endif
 %endif
+	--program-suffix=%{binsuffix} \
 %ifarch %{disable_multilib_arch}
 	--disable-multilib \
 %endif
 %if 0%{!?gcc_target_arch:1}
-	--program-suffix=%{binsuffix} \
 %ifarch ia64
 	--with-system-libunwind \
 %else
@@ -597,9 +599,6 @@ amdgcn-amdhsa,\
 %endif
 %endif
 %if 0%{?gcc_target_arch:1}
-%if 0%{?gcc_accel:1} || %{suse_version} < 1600
-	--program-suffix=%{binsuffix} \
-%endif
 	--program-prefix=%{gcc_target_arch}- \
 	--target=%{gcc_target_arch} \
 	--disable-nls \
@@ -862,7 +861,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 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
+# 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.
@@ -887,7 +886,6 @@ 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}/f951
 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
@@ -895,8 +893,6 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 # 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}
-# also remove installed libstdc++ headers
-rm -rf $RPM_BUILD_ROOT%{_prefix}/include/c++
 %endif
 # for amdgcn install the symlinks to the llvm tools
 # follow alternatives symlinks to the hardcoded version requirement
@@ -961,7 +957,7 @@ rm -r env
 
 # we provide update-alternatives for selecting a compiler version for
 # crosses
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
 %if %{build_cp}
@@ -1017,19 +1013,15 @@ fi
 %endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
-%if %{suse_version} < 1600
 %{_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}
-%endif
 %if 0%{!?gcc_libc_bootstrap:1} && "%{cross_arch}" != "bpf"
-%if %{suse_version} < 1600
 %{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
-%endif
 %{_prefix}/bin/%{gcc_target_arch}-gcov
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool
@@ -1040,7 +1032,6 @@ fi
 %{_prefix}/bin/%{gcc_target_arch}-gcc-nm
 %{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib
 %{_prefix}/bin/%{gcc_target_arch}-lto-dump
-%if %{suse_version} < 1600
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-cpp
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc-ar
@@ -1052,16 +1043,13 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
 %endif
-%endif
 %if %{build_cp}
-%{_prefix}/bin/%{gcc_target_arch}-c++
-%{_prefix}/bin/%{gcc_target_arch}-g++
-%if %{suse_version} < 1600
 %{_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++
-%endif
 %if 0%{!?gcc_libc_bootstrap:1}
 %if "%{cross_arch}" == "avr" || 0%{?gcc_target_newlib:1} || 0%{?gcc_target_glibc:1}
 %{_prefix}/include/c++

cross-hppa-gcc13-bootstrap.spec

@@ -292,24 +292,26 @@ 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_accel: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
+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.
-Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %{gcc_target_arch}-gcc
-Conflicts:      %{pkgname}-bootstrap
 %endif
 #!BuildIgnore: gcc-PIE
-%if %{build_cp}
+%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
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun): update-alternatives
@@ -585,11 +587,11 @@ amdgcn-amdhsa,\
 	--enable-gnu-indirect-function \
 %endif
 %endif
+	--program-suffix=%{binsuffix} \
 %ifarch %{disable_multilib_arch}
 	--disable-multilib \
 %endif
 %if 0%{!?gcc_target_arch:1}
-	--program-suffix=%{binsuffix} \
 %ifarch ia64
 	--with-system-libunwind \
 %else
@@ -597,9 +599,6 @@ amdgcn-amdhsa,\
 %endif
 %endif
 %if 0%{?gcc_target_arch:1}
-%if 0%{?gcc_accel:1} || %{suse_version} < 1600
-	--program-suffix=%{binsuffix} \
-%endif
 	--program-prefix=%{gcc_target_arch}- \
 	--target=%{gcc_target_arch} \
 	--disable-nls \
@@ -862,7 +861,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 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
+# 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.
@@ -887,7 +886,6 @@ 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}/f951
 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
@@ -895,8 +893,6 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 # 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}
-# also remove installed libstdc++ headers
-rm -rf $RPM_BUILD_ROOT%{_prefix}/include/c++
 %endif
 # for amdgcn install the symlinks to the llvm tools
 # follow alternatives symlinks to the hardcoded version requirement
@@ -961,7 +957,7 @@ rm -r env
 
 # we provide update-alternatives for selecting a compiler version for
 # crosses
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
 %if %{build_cp}
@@ -1017,19 +1013,15 @@ fi
 %endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
-%if %{suse_version} < 1600
 %{_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}
-%endif
 %if 0%{!?gcc_libc_bootstrap:1} && "%{cross_arch}" != "bpf"
-%if %{suse_version} < 1600
 %{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
-%endif
 %{_prefix}/bin/%{gcc_target_arch}-gcov
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool
@@ -1040,7 +1032,6 @@ fi
 %{_prefix}/bin/%{gcc_target_arch}-gcc-nm
 %{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib
 %{_prefix}/bin/%{gcc_target_arch}-lto-dump
-%if %{suse_version} < 1600
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-cpp
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc-ar
@@ -1052,16 +1043,13 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
 %endif
-%endif
 %if %{build_cp}
-%{_prefix}/bin/%{gcc_target_arch}-c++
-%{_prefix}/bin/%{gcc_target_arch}-g++
-%if %{suse_version} < 1600
 %{_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++
-%endif
 %if 0%{!?gcc_libc_bootstrap:1}
 %if "%{cross_arch}" == "avr" || 0%{?gcc_target_newlib:1} || 0%{?gcc_target_glibc:1}
 %{_prefix}/include/c++

cross-nvptx-gcc13.spec

@@ -292,24 +292,26 @@ 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_accel: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
+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.
-Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %{gcc_target_arch}-gcc
-Conflicts:      %{pkgname}-bootstrap
 %endif
 #!BuildIgnore: gcc-PIE
-%if %{build_cp}
+%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
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun): update-alternatives
@@ -585,11 +587,11 @@ amdgcn-amdhsa,\
 	--enable-gnu-indirect-function \
 %endif
 %endif
+	--program-suffix=%{binsuffix} \
 %ifarch %{disable_multilib_arch}
 	--disable-multilib \
 %endif
 %if 0%{!?gcc_target_arch:1}
-	--program-suffix=%{binsuffix} \
 %ifarch ia64
 	--with-system-libunwind \
 %else
@@ -597,9 +599,6 @@ amdgcn-amdhsa,\
 %endif
 %endif
 %if 0%{?gcc_target_arch:1}
-%if 0%{?gcc_accel:1} || %{suse_version} < 1600
-	--program-suffix=%{binsuffix} \
-%endif
 	--program-prefix=%{gcc_target_arch}- \
 	--target=%{gcc_target_arch} \
 	--disable-nls \
@@ -862,7 +861,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 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
+# 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.
@@ -887,7 +886,6 @@ 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}/f951
 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
@@ -895,8 +893,6 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 # 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}
-# also remove installed libstdc++ headers
-rm -rf $RPM_BUILD_ROOT%{_prefix}/include/c++
 %endif
 # for amdgcn install the symlinks to the llvm tools
 # follow alternatives symlinks to the hardcoded version requirement
@@ -961,7 +957,7 @@ rm -r env
 
 # we provide update-alternatives for selecting a compiler version for
 # crosses
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
 %if %{build_cp}
@@ -1017,19 +1013,15 @@ fi
 %endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
-%if %{suse_version} < 1600
 %{_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}
-%endif
 %if 0%{!?gcc_libc_bootstrap:1} && "%{cross_arch}" != "bpf"
-%if %{suse_version} < 1600
 %{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
-%endif
 %{_prefix}/bin/%{gcc_target_arch}-gcov
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool
@@ -1040,7 +1032,6 @@ fi
 %{_prefix}/bin/%{gcc_target_arch}-gcc-nm
 %{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib
 %{_prefix}/bin/%{gcc_target_arch}-lto-dump
-%if %{suse_version} < 1600
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-cpp
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc-ar
@@ -1052,16 +1043,13 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
 %endif
-%endif
 %if %{build_cp}
-%{_prefix}/bin/%{gcc_target_arch}-c++
-%{_prefix}/bin/%{gcc_target_arch}-g++
-%if %{suse_version} < 1600
 %{_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++
-%endif
 %if 0%{!?gcc_libc_bootstrap:1}
 %if "%{cross_arch}" == "avr" || 0%{?gcc_target_newlib:1} || 0%{?gcc_target_glibc:1}
 %{_prefix}/include/c++

cross-ppc64-gcc13.spec

@@ -19,8 +19,7 @@
 %define pkgname cross-ppc64-gcc13
 %define cross_arch ppc64
 %define gcc_target_arch powerpc64-suse-linux
-%define gcc_target_glibc 1
-%define gcc_libc_bootstrap 1
+%define gcc_icecream 1
 # nospeccleaner
 
 %define build_cp 0%{!?gcc_accel:1}
@@ -293,24 +292,26 @@ 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_accel: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
+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.
-Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %{gcc_target_arch}-gcc
-Conflicts:      %{pkgname}-bootstrap
 %endif
 #!BuildIgnore: gcc-PIE
-%if %{build_cp}
+%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
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun): update-alternatives
@@ -586,11 +587,11 @@ amdgcn-amdhsa,\
 	--enable-gnu-indirect-function \
 %endif
 %endif
+	--program-suffix=%{binsuffix} \
 %ifarch %{disable_multilib_arch}
 	--disable-multilib \
 %endif
 %if 0%{!?gcc_target_arch:1}
-	--program-suffix=%{binsuffix} \
 %ifarch ia64
 	--with-system-libunwind \
 %else
@@ -598,9 +599,6 @@ amdgcn-amdhsa,\
 %endif
 %endif
 %if 0%{?gcc_target_arch:1}
-%if 0%{?gcc_accel:1} || %{suse_version} < 1600
-	--program-suffix=%{binsuffix} \
-%endif
 	--program-prefix=%{gcc_target_arch}- \
 	--target=%{gcc_target_arch} \
 	--disable-nls \
@@ -863,7 +861,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 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
+# 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.
@@ -888,7 +886,6 @@ 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}/f951
 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
@@ -896,8 +893,6 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 # 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}
-# also remove installed libstdc++ headers
-rm -rf $RPM_BUILD_ROOT%{_prefix}/include/c++
 %endif
 # for amdgcn install the symlinks to the llvm tools
 # follow alternatives symlinks to the hardcoded version requirement
@@ -962,7 +957,7 @@ rm -r env
 
 # we provide update-alternatives for selecting a compiler version for
 # crosses
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
 %if %{build_cp}
@@ -1018,19 +1013,15 @@ fi
 %endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
-%if %{suse_version} < 1600
 %{_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}
-%endif
 %if 0%{!?gcc_libc_bootstrap:1} && "%{cross_arch}" != "bpf"
-%if %{suse_version} < 1600
 %{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
-%endif
 %{_prefix}/bin/%{gcc_target_arch}-gcov
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool
@@ -1041,7 +1032,6 @@ fi
 %{_prefix}/bin/%{gcc_target_arch}-gcc-nm
 %{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib
 %{_prefix}/bin/%{gcc_target_arch}-lto-dump
-%if %{suse_version} < 1600
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-cpp
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc-ar
@@ -1053,16 +1043,13 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
 %endif
-%endif
 %if %{build_cp}
-%{_prefix}/bin/%{gcc_target_arch}-c++
-%{_prefix}/bin/%{gcc_target_arch}-g++
-%if %{suse_version} < 1600
 %{_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++
-%endif
 %if 0%{!?gcc_libc_bootstrap:1}
 %if "%{cross_arch}" == "avr" || 0%{?gcc_target_newlib:1} || 0%{?gcc_target_glibc:1}
 %{_prefix}/include/c++

cross-ppc64le-gcc13-bootstrap.spec

@@ -19,7 +19,6 @@
 %define pkgname cross-ppc64le-gcc13-bootstrap
 %define cross_arch ppc64le
 %define gcc_target_arch powerpc64le-suse-linux
-%define gcc_target_glibc 1
 %define gcc_libc_bootstrap 1
 # nospeccleaner
 
@@ -293,24 +292,26 @@ 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_accel: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
+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.
-Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %{gcc_target_arch}-gcc
-Conflicts:      %{pkgname}-bootstrap
 %endif
 #!BuildIgnore: gcc-PIE
-%if %{build_cp}
+%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
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun): update-alternatives
@@ -586,11 +587,11 @@ amdgcn-amdhsa,\
 	--enable-gnu-indirect-function \
 %endif
 %endif
+	--program-suffix=%{binsuffix} \
 %ifarch %{disable_multilib_arch}
 	--disable-multilib \
 %endif
 %if 0%{!?gcc_target_arch:1}
-	--program-suffix=%{binsuffix} \
 %ifarch ia64
 	--with-system-libunwind \
 %else
@@ -598,9 +599,6 @@ amdgcn-amdhsa,\
 %endif
 %endif
 %if 0%{?gcc_target_arch:1}
-%if 0%{?gcc_accel:1} || %{suse_version} < 1600
-	--program-suffix=%{binsuffix} \
-%endif
 	--program-prefix=%{gcc_target_arch}- \
 	--target=%{gcc_target_arch} \
 	--disable-nls \
@@ -863,7 +861,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 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
+# 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.
@@ -888,7 +886,6 @@ 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}/f951
 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
@@ -896,8 +893,6 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 # 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}
-# also remove installed libstdc++ headers
-rm -rf $RPM_BUILD_ROOT%{_prefix}/include/c++
 %endif
 # for amdgcn install the symlinks to the llvm tools
 # follow alternatives symlinks to the hardcoded version requirement
@@ -962,7 +957,7 @@ rm -r env
 
 # we provide update-alternatives for selecting a compiler version for
 # crosses
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
 %if %{build_cp}
@@ -1018,19 +1013,15 @@ fi
 %endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
-%if %{suse_version} < 1600
 %{_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}
-%endif
 %if 0%{!?gcc_libc_bootstrap:1} && "%{cross_arch}" != "bpf"
-%if %{suse_version} < 1600
 %{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
-%endif
 %{_prefix}/bin/%{gcc_target_arch}-gcov
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool
@@ -1041,7 +1032,6 @@ fi
 %{_prefix}/bin/%{gcc_target_arch}-gcc-nm
 %{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib
 %{_prefix}/bin/%{gcc_target_arch}-lto-dump
-%if %{suse_version} < 1600
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-cpp
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc-ar
@@ -1053,16 +1043,13 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
 %endif
-%endif
 %if %{build_cp}
-%{_prefix}/bin/%{gcc_target_arch}-c++
-%{_prefix}/bin/%{gcc_target_arch}-g++
-%if %{suse_version} < 1600
 %{_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++
-%endif
 %if 0%{!?gcc_libc_bootstrap:1}
 %if "%{cross_arch}" == "avr" || 0%{?gcc_target_newlib:1} || 0%{?gcc_target_glibc:1}
 %{_prefix}/include/c++

cross-ppc64le-gcc13.spec

@@ -292,24 +292,26 @@ 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_accel: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
+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.
-Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %{gcc_target_arch}-gcc
-Conflicts:      %{pkgname}-bootstrap
 %endif
 #!BuildIgnore: gcc-PIE
-%if %{build_cp}
+%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
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun): update-alternatives
@@ -585,11 +587,11 @@ amdgcn-amdhsa,\
 	--enable-gnu-indirect-function \
 %endif
 %endif
+	--program-suffix=%{binsuffix} \
 %ifarch %{disable_multilib_arch}
 	--disable-multilib \
 %endif
 %if 0%{!?gcc_target_arch:1}
-	--program-suffix=%{binsuffix} \
 %ifarch ia64
 	--with-system-libunwind \
 %else
@@ -597,9 +599,6 @@ amdgcn-amdhsa,\
 %endif
 %endif
 %if 0%{?gcc_target_arch:1}
-%if 0%{?gcc_accel:1} || %{suse_version} < 1600
-	--program-suffix=%{binsuffix} \
-%endif
 	--program-prefix=%{gcc_target_arch}- \
 	--target=%{gcc_target_arch} \
 	--disable-nls \
@@ -862,7 +861,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 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
+# 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.
@@ -887,7 +886,6 @@ 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}/f951
 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
@@ -895,8 +893,6 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 # 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}
-# also remove installed libstdc++ headers
-rm -rf $RPM_BUILD_ROOT%{_prefix}/include/c++
 %endif
 # for amdgcn install the symlinks to the llvm tools
 # follow alternatives symlinks to the hardcoded version requirement
@@ -961,7 +957,7 @@ rm -r env
 
 # we provide update-alternatives for selecting a compiler version for
 # crosses
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
 %if %{build_cp}
@@ -1017,19 +1013,15 @@ fi
 %endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
-%if %{suse_version} < 1600
 %{_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}
-%endif
 %if 0%{!?gcc_libc_bootstrap:1} && "%{cross_arch}" != "bpf"
-%if %{suse_version} < 1600
 %{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
-%endif
 %{_prefix}/bin/%{gcc_target_arch}-gcov
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool
@@ -1040,7 +1032,6 @@ fi
 %{_prefix}/bin/%{gcc_target_arch}-gcc-nm
 %{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib
 %{_prefix}/bin/%{gcc_target_arch}-lto-dump
-%if %{suse_version} < 1600
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-cpp
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc-ar
@@ -1052,16 +1043,13 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
 %endif
-%endif
 %if %{build_cp}
-%{_prefix}/bin/%{gcc_target_arch}-c++
-%{_prefix}/bin/%{gcc_target_arch}-g++
-%if %{suse_version} < 1600
 %{_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++
-%endif
 %if 0%{!?gcc_libc_bootstrap:1}
 %if "%{cross_arch}" == "avr" || 0%{?gcc_target_newlib:1} || 0%{?gcc_target_glibc:1}
 %{_prefix}/include/c++

cross-pru-gcc13-bootstrap.spec

@@ -293,24 +293,26 @@ 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_accel: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
+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.
-Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %{gcc_target_arch}-gcc
-Conflicts:      %{pkgname}-bootstrap
 %endif
 #!BuildIgnore: gcc-PIE
-%if %{build_cp}
+%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
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun): update-alternatives
@@ -586,11 +588,11 @@ amdgcn-amdhsa,\
 	--enable-gnu-indirect-function \
 %endif
 %endif
+	--program-suffix=%{binsuffix} \
 %ifarch %{disable_multilib_arch}
 	--disable-multilib \
 %endif
 %if 0%{!?gcc_target_arch:1}
-	--program-suffix=%{binsuffix} \
 %ifarch ia64
 	--with-system-libunwind \
 %else
@@ -598,9 +600,6 @@ amdgcn-amdhsa,\
 %endif
 %endif
 %if 0%{?gcc_target_arch:1}
-%if 0%{?gcc_accel:1} || %{suse_version} < 1600
-	--program-suffix=%{binsuffix} \
-%endif
 	--program-prefix=%{gcc_target_arch}- \
 	--target=%{gcc_target_arch} \
 	--disable-nls \
@@ -863,7 +862,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 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
+# 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.
@@ -888,7 +887,6 @@ 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}/f951
 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
@@ -896,8 +894,6 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 # 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}
-# also remove installed libstdc++ headers
-rm -rf $RPM_BUILD_ROOT%{_prefix}/include/c++
 %endif
 # for amdgcn install the symlinks to the llvm tools
 # follow alternatives symlinks to the hardcoded version requirement
@@ -962,7 +958,7 @@ rm -r env
 
 # we provide update-alternatives for selecting a compiler version for
 # crosses
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
 %if %{build_cp}
@@ -1018,19 +1014,15 @@ fi
 %endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
-%if %{suse_version} < 1600
 %{_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}
-%endif
 %if 0%{!?gcc_libc_bootstrap:1} && "%{cross_arch}" != "bpf"
-%if %{suse_version} < 1600
 %{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
-%endif
 %{_prefix}/bin/%{gcc_target_arch}-gcov
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool
@@ -1041,7 +1033,6 @@ fi
 %{_prefix}/bin/%{gcc_target_arch}-gcc-nm
 %{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib
 %{_prefix}/bin/%{gcc_target_arch}-lto-dump
-%if %{suse_version} < 1600
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-cpp
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc-ar
@@ -1053,16 +1044,13 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
 %endif
-%endif
 %if %{build_cp}
-%{_prefix}/bin/%{gcc_target_arch}-c++
-%{_prefix}/bin/%{gcc_target_arch}-g++
-%if %{suse_version} < 1600
 %{_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++
-%endif
 %if 0%{!?gcc_libc_bootstrap:1}
 %if "%{cross_arch}" == "avr" || 0%{?gcc_target_newlib:1} || 0%{?gcc_target_glibc:1}
 %{_prefix}/include/c++

cross-pru-gcc13.spec

@@ -292,24 +292,26 @@ 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_accel: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
+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.
-Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %{gcc_target_arch}-gcc
-Conflicts:      %{pkgname}-bootstrap
 %endif
 #!BuildIgnore: gcc-PIE
-%if %{build_cp}
+%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
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun): update-alternatives
@@ -585,11 +587,11 @@ amdgcn-amdhsa,\
 	--enable-gnu-indirect-function \
 %endif
 %endif
+	--program-suffix=%{binsuffix} \
 %ifarch %{disable_multilib_arch}
 	--disable-multilib \
 %endif
 %if 0%{!?gcc_target_arch:1}
-	--program-suffix=%{binsuffix} \
 %ifarch ia64
 	--with-system-libunwind \
 %else
@@ -597,9 +599,6 @@ amdgcn-amdhsa,\
 %endif
 %endif
 %if 0%{?gcc_target_arch:1}
-%if 0%{?gcc_accel:1} || %{suse_version} < 1600
-	--program-suffix=%{binsuffix} \
-%endif
 	--program-prefix=%{gcc_target_arch}- \
 	--target=%{gcc_target_arch} \
 	--disable-nls \
@@ -862,7 +861,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 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
+# 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.
@@ -887,7 +886,6 @@ 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}/f951
 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
@@ -895,8 +893,6 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 # 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}
-# also remove installed libstdc++ headers
-rm -rf $RPM_BUILD_ROOT%{_prefix}/include/c++
 %endif
 # for amdgcn install the symlinks to the llvm tools
 # follow alternatives symlinks to the hardcoded version requirement
@@ -961,7 +957,7 @@ rm -r env
 
 # we provide update-alternatives for selecting a compiler version for
 # crosses
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
 %if %{build_cp}
@@ -1017,19 +1013,15 @@ fi
 %endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
-%if %{suse_version} < 1600
 %{_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}
-%endif
 %if 0%{!?gcc_libc_bootstrap:1} && "%{cross_arch}" != "bpf"
-%if %{suse_version} < 1600
 %{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
-%endif
 %{_prefix}/bin/%{gcc_target_arch}-gcov
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool
@@ -1040,7 +1032,6 @@ fi
 %{_prefix}/bin/%{gcc_target_arch}-gcc-nm
 %{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib
 %{_prefix}/bin/%{gcc_target_arch}-lto-dump
-%if %{suse_version} < 1600
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-cpp
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc-ar
@@ -1052,16 +1043,13 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
 %endif
-%endif
 %if %{build_cp}
-%{_prefix}/bin/%{gcc_target_arch}-c++
-%{_prefix}/bin/%{gcc_target_arch}-g++
-%if %{suse_version} < 1600
 %{_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++
-%endif
 %if 0%{!?gcc_libc_bootstrap:1}
 %if "%{cross_arch}" == "avr" || 0%{?gcc_target_newlib:1} || 0%{?gcc_target_glibc:1}
 %{_prefix}/include/c++

cross-riscv64-elf-gcc13-bootstrap.spec

@@ -293,24 +293,26 @@ 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_accel: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
+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.
-Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %{gcc_target_arch}-gcc
-Conflicts:      %{pkgname}-bootstrap
 %endif
 #!BuildIgnore: gcc-PIE
-%if %{build_cp}
+%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
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun): update-alternatives
@@ -586,11 +588,11 @@ amdgcn-amdhsa,\
 	--enable-gnu-indirect-function \
 %endif
 %endif
+	--program-suffix=%{binsuffix} \
 %ifarch %{disable_multilib_arch}
 	--disable-multilib \
 %endif
 %if 0%{!?gcc_target_arch:1}
-	--program-suffix=%{binsuffix} \
 %ifarch ia64
 	--with-system-libunwind \
 %else
@@ -598,9 +600,6 @@ amdgcn-amdhsa,\
 %endif
 %endif
 %if 0%{?gcc_target_arch:1}
-%if 0%{?gcc_accel:1} || %{suse_version} < 1600
-	--program-suffix=%{binsuffix} \
-%endif
 	--program-prefix=%{gcc_target_arch}- \
 	--target=%{gcc_target_arch} \
 	--disable-nls \
@@ -863,7 +862,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 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
+# 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.
@@ -888,7 +887,6 @@ 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}/f951
 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
@@ -896,8 +894,6 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 # 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}
-# also remove installed libstdc++ headers
-rm -rf $RPM_BUILD_ROOT%{_prefix}/include/c++
 %endif
 # for amdgcn install the symlinks to the llvm tools
 # follow alternatives symlinks to the hardcoded version requirement
@@ -962,7 +958,7 @@ rm -r env
 
 # we provide update-alternatives for selecting a compiler version for
 # crosses
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
 %if %{build_cp}
@@ -1018,19 +1014,15 @@ fi
 %endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
-%if %{suse_version} < 1600
 %{_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}
-%endif
 %if 0%{!?gcc_libc_bootstrap:1} && "%{cross_arch}" != "bpf"
-%if %{suse_version} < 1600
 %{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
-%endif
 %{_prefix}/bin/%{gcc_target_arch}-gcov
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool
@@ -1041,7 +1033,6 @@ fi
 %{_prefix}/bin/%{gcc_target_arch}-gcc-nm
 %{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib
 %{_prefix}/bin/%{gcc_target_arch}-lto-dump
-%if %{suse_version} < 1600
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-cpp
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc-ar
@@ -1053,16 +1044,13 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
 %endif
-%endif
 %if %{build_cp}
-%{_prefix}/bin/%{gcc_target_arch}-c++
-%{_prefix}/bin/%{gcc_target_arch}-g++
-%if %{suse_version} < 1600
 %{_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++
-%endif
 %if 0%{!?gcc_libc_bootstrap:1}
 %if "%{cross_arch}" == "avr" || 0%{?gcc_target_newlib:1} || 0%{?gcc_target_glibc:1}
 %{_prefix}/include/c++

cross-riscv64-elf-gcc13.spec

@@ -292,24 +292,26 @@ 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_accel: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
+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.
-Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %{gcc_target_arch}-gcc
-Conflicts:      %{pkgname}-bootstrap
 %endif
 #!BuildIgnore: gcc-PIE
-%if %{build_cp}
+%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
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun): update-alternatives
@@ -585,11 +587,11 @@ amdgcn-amdhsa,\
 	--enable-gnu-indirect-function \
 %endif
 %endif
+	--program-suffix=%{binsuffix} \
 %ifarch %{disable_multilib_arch}
 	--disable-multilib \
 %endif
 %if 0%{!?gcc_target_arch:1}
-	--program-suffix=%{binsuffix} \
 %ifarch ia64
 	--with-system-libunwind \
 %else
@@ -597,9 +599,6 @@ amdgcn-amdhsa,\
 %endif
 %endif
 %if 0%{?gcc_target_arch:1}
-%if 0%{?gcc_accel:1} || %{suse_version} < 1600
-	--program-suffix=%{binsuffix} \
-%endif
 	--program-prefix=%{gcc_target_arch}- \
 	--target=%{gcc_target_arch} \
 	--disable-nls \
@@ -862,7 +861,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 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
+# 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.
@@ -887,7 +886,6 @@ 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}/f951
 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
@@ -895,8 +893,6 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 # 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}
-# also remove installed libstdc++ headers
-rm -rf $RPM_BUILD_ROOT%{_prefix}/include/c++
 %endif
 # for amdgcn install the symlinks to the llvm tools
 # follow alternatives symlinks to the hardcoded version requirement
@@ -961,7 +957,7 @@ rm -r env
 
 # we provide update-alternatives for selecting a compiler version for
 # crosses
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
 %if %{build_cp}
@@ -1017,19 +1013,15 @@ fi
 %endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
-%if %{suse_version} < 1600
 %{_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}
-%endif
 %if 0%{!?gcc_libc_bootstrap:1} && "%{cross_arch}" != "bpf"
-%if %{suse_version} < 1600
 %{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
-%endif
 %{_prefix}/bin/%{gcc_target_arch}-gcov
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool
@@ -1040,7 +1032,6 @@ fi
 %{_prefix}/bin/%{gcc_target_arch}-gcc-nm
 %{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib
 %{_prefix}/bin/%{gcc_target_arch}-lto-dump
-%if %{suse_version} < 1600
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-cpp
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc-ar
@@ -1052,16 +1043,13 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
 %endif
-%endif
 %if %{build_cp}
-%{_prefix}/bin/%{gcc_target_arch}-c++
-%{_prefix}/bin/%{gcc_target_arch}-g++
-%if %{suse_version} < 1600
 %{_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++
-%endif
 %if 0%{!?gcc_libc_bootstrap:1}
 %if "%{cross_arch}" == "avr" || 0%{?gcc_target_newlib:1} || 0%{?gcc_target_glibc:1}
 %{_prefix}/include/c++

cross-riscv64-gcc13-bootstrap.spec

@@ -19,7 +19,6 @@
 %define pkgname cross-riscv64-gcc13-bootstrap
 %define cross_arch riscv64
 %define gcc_target_arch riscv64-suse-linux
-%define gcc_target_glibc 1
 %define gcc_libc_bootstrap 1
 # nospeccleaner
 
@@ -293,24 +292,26 @@ 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_accel: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
+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.
-Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %{gcc_target_arch}-gcc
-Conflicts:      %{pkgname}-bootstrap
 %endif
 #!BuildIgnore: gcc-PIE
-%if %{build_cp}
+%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
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun): update-alternatives
@@ -586,11 +587,11 @@ amdgcn-amdhsa,\
 	--enable-gnu-indirect-function \
 %endif
 %endif
+	--program-suffix=%{binsuffix} \
 %ifarch %{disable_multilib_arch}
 	--disable-multilib \
 %endif
 %if 0%{!?gcc_target_arch:1}
-	--program-suffix=%{binsuffix} \
 %ifarch ia64
 	--with-system-libunwind \
 %else
@@ -598,9 +599,6 @@ amdgcn-amdhsa,\
 %endif
 %endif
 %if 0%{?gcc_target_arch:1}
-%if 0%{?gcc_accel:1} || %{suse_version} < 1600
-	--program-suffix=%{binsuffix} \
-%endif
 	--program-prefix=%{gcc_target_arch}- \
 	--target=%{gcc_target_arch} \
 	--disable-nls \
@@ -863,7 +861,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 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
+# 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.
@@ -888,7 +886,6 @@ 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}/f951
 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
@@ -896,8 +893,6 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 # 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}
-# also remove installed libstdc++ headers
-rm -rf $RPM_BUILD_ROOT%{_prefix}/include/c++
 %endif
 # for amdgcn install the symlinks to the llvm tools
 # follow alternatives symlinks to the hardcoded version requirement
@@ -962,7 +957,7 @@ rm -r env
 
 # we provide update-alternatives for selecting a compiler version for
 # crosses
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
 %if %{build_cp}
@@ -1018,19 +1013,15 @@ fi
 %endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
-%if %{suse_version} < 1600
 %{_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}
-%endif
 %if 0%{!?gcc_libc_bootstrap:1} && "%{cross_arch}" != "bpf"
-%if %{suse_version} < 1600
 %{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
-%endif
 %{_prefix}/bin/%{gcc_target_arch}-gcov
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool
@@ -1041,7 +1032,6 @@ fi
 %{_prefix}/bin/%{gcc_target_arch}-gcc-nm
 %{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib
 %{_prefix}/bin/%{gcc_target_arch}-lto-dump
-%if %{suse_version} < 1600
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-cpp
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc-ar
@@ -1053,16 +1043,13 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
 %endif
-%endif
 %if %{build_cp}
-%{_prefix}/bin/%{gcc_target_arch}-c++
-%{_prefix}/bin/%{gcc_target_arch}-g++
-%if %{suse_version} < 1600
 %{_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++
-%endif
 %if 0%{!?gcc_libc_bootstrap:1}
 %if "%{cross_arch}" == "avr" || 0%{?gcc_target_newlib:1} || 0%{?gcc_target_glibc:1}
 %{_prefix}/include/c++

cross-riscv64-gcc13.spec

@@ -292,24 +292,26 @@ 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_accel: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
+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.
-Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %{gcc_target_arch}-gcc
-Conflicts:      %{pkgname}-bootstrap
 %endif
 #!BuildIgnore: gcc-PIE
-%if %{build_cp}
+%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
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun): update-alternatives
@@ -585,11 +587,11 @@ amdgcn-amdhsa,\
 	--enable-gnu-indirect-function \
 %endif
 %endif
+	--program-suffix=%{binsuffix} \
 %ifarch %{disable_multilib_arch}
 	--disable-multilib \
 %endif
 %if 0%{!?gcc_target_arch:1}
-	--program-suffix=%{binsuffix} \
 %ifarch ia64
 	--with-system-libunwind \
 %else
@@ -597,9 +599,6 @@ amdgcn-amdhsa,\
 %endif
 %endif
 %if 0%{?gcc_target_arch:1}
-%if 0%{?gcc_accel:1} || %{suse_version} < 1600
-	--program-suffix=%{binsuffix} \
-%endif
 	--program-prefix=%{gcc_target_arch}- \
 	--target=%{gcc_target_arch} \
 	--disable-nls \
@@ -862,7 +861,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 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
+# 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.
@@ -887,7 +886,6 @@ 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}/f951
 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
@@ -895,8 +893,6 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 # 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}
-# also remove installed libstdc++ headers
-rm -rf $RPM_BUILD_ROOT%{_prefix}/include/c++
 %endif
 # for amdgcn install the symlinks to the llvm tools
 # follow alternatives symlinks to the hardcoded version requirement
@@ -961,7 +957,7 @@ rm -r env
 
 # we provide update-alternatives for selecting a compiler version for
 # crosses
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
 %if %{build_cp}
@@ -1017,19 +1013,15 @@ fi
 %endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
-%if %{suse_version} < 1600
 %{_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}
-%endif
 %if 0%{!?gcc_libc_bootstrap:1} && "%{cross_arch}" != "bpf"
-%if %{suse_version} < 1600
 %{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
-%endif
 %{_prefix}/bin/%{gcc_target_arch}-gcov
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool
@@ -1040,7 +1032,6 @@ fi
 %{_prefix}/bin/%{gcc_target_arch}-gcc-nm
 %{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib
 %{_prefix}/bin/%{gcc_target_arch}-lto-dump
-%if %{suse_version} < 1600
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-cpp
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc-ar
@@ -1052,16 +1043,13 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
 %endif
-%endif
 %if %{build_cp}
-%{_prefix}/bin/%{gcc_target_arch}-c++
-%{_prefix}/bin/%{gcc_target_arch}-g++
-%if %{suse_version} < 1600
 %{_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++
-%endif
 %if 0%{!?gcc_libc_bootstrap:1}
 %if "%{cross_arch}" == "avr" || 0%{?gcc_target_newlib:1} || 0%{?gcc_target_glibc:1}
 %{_prefix}/include/c++

cross-rx-gcc13-bootstrap.spec

@@ -293,24 +293,26 @@ 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_accel: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
+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.
-Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %{gcc_target_arch}-gcc
-Conflicts:      %{pkgname}-bootstrap
 %endif
 #!BuildIgnore: gcc-PIE
-%if %{build_cp}
+%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
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun): update-alternatives
@@ -586,11 +588,11 @@ amdgcn-amdhsa,\
 	--enable-gnu-indirect-function \
 %endif
 %endif
+	--program-suffix=%{binsuffix} \
 %ifarch %{disable_multilib_arch}
 	--disable-multilib \
 %endif
 %if 0%{!?gcc_target_arch:1}
-	--program-suffix=%{binsuffix} \
 %ifarch ia64
 	--with-system-libunwind \
 %else
@@ -598,9 +600,6 @@ amdgcn-amdhsa,\
 %endif
 %endif
 %if 0%{?gcc_target_arch:1}
-%if 0%{?gcc_accel:1} || %{suse_version} < 1600
-	--program-suffix=%{binsuffix} \
-%endif
 	--program-prefix=%{gcc_target_arch}- \
 	--target=%{gcc_target_arch} \
 	--disable-nls \
@@ -863,7 +862,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 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
+# 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.
@@ -888,7 +887,6 @@ 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}/f951
 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
@@ -896,8 +894,6 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 # 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}
-# also remove installed libstdc++ headers
-rm -rf $RPM_BUILD_ROOT%{_prefix}/include/c++
 %endif
 # for amdgcn install the symlinks to the llvm tools
 # follow alternatives symlinks to the hardcoded version requirement
@@ -962,7 +958,7 @@ rm -r env
 
 # we provide update-alternatives for selecting a compiler version for
 # crosses
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
 %if %{build_cp}
@@ -1018,19 +1014,15 @@ fi
 %endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
-%if %{suse_version} < 1600
 %{_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}
-%endif
 %if 0%{!?gcc_libc_bootstrap:1} && "%{cross_arch}" != "bpf"
-%if %{suse_version} < 1600
 %{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
-%endif
 %{_prefix}/bin/%{gcc_target_arch}-gcov
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool
@@ -1041,7 +1033,6 @@ fi
 %{_prefix}/bin/%{gcc_target_arch}-gcc-nm
 %{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib
 %{_prefix}/bin/%{gcc_target_arch}-lto-dump
-%if %{suse_version} < 1600
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-cpp
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc-ar
@@ -1053,16 +1044,13 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
 %endif
-%endif
 %if %{build_cp}
-%{_prefix}/bin/%{gcc_target_arch}-c++
-%{_prefix}/bin/%{gcc_target_arch}-g++
-%if %{suse_version} < 1600
 %{_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++
-%endif
 %if 0%{!?gcc_libc_bootstrap:1}
 %if "%{cross_arch}" == "avr" || 0%{?gcc_target_newlib:1} || 0%{?gcc_target_glibc:1}
 %{_prefix}/include/c++

cross-rx-gcc13.spec

@@ -292,24 +292,26 @@ 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_accel: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
+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.
-Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %{gcc_target_arch}-gcc
-Conflicts:      %{pkgname}-bootstrap
 %endif
 #!BuildIgnore: gcc-PIE
-%if %{build_cp}
+%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
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun): update-alternatives
@@ -585,11 +587,11 @@ amdgcn-amdhsa,\
 	--enable-gnu-indirect-function \
 %endif
 %endif
+	--program-suffix=%{binsuffix} \
 %ifarch %{disable_multilib_arch}
 	--disable-multilib \
 %endif
 %if 0%{!?gcc_target_arch:1}
-	--program-suffix=%{binsuffix} \
 %ifarch ia64
 	--with-system-libunwind \
 %else
@@ -597,9 +599,6 @@ amdgcn-amdhsa,\
 %endif
 %endif
 %if 0%{?gcc_target_arch:1}
-%if 0%{?gcc_accel:1} || %{suse_version} < 1600
-	--program-suffix=%{binsuffix} \
-%endif
 	--program-prefix=%{gcc_target_arch}- \
 	--target=%{gcc_target_arch} \
 	--disable-nls \
@@ -862,7 +861,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 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
+# 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.
@@ -887,7 +886,6 @@ 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}/f951
 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
@@ -895,8 +893,6 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 # 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}
-# also remove installed libstdc++ headers
-rm -rf $RPM_BUILD_ROOT%{_prefix}/include/c++
 %endif
 # for amdgcn install the symlinks to the llvm tools
 # follow alternatives symlinks to the hardcoded version requirement
@@ -961,7 +957,7 @@ rm -r env
 
 # we provide update-alternatives for selecting a compiler version for
 # crosses
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
 %if %{build_cp}
@@ -1017,19 +1013,15 @@ fi
 %endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
-%if %{suse_version} < 1600
 %{_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}
-%endif
 %if 0%{!?gcc_libc_bootstrap:1} && "%{cross_arch}" != "bpf"
-%if %{suse_version} < 1600
 %{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
-%endif
 %{_prefix}/bin/%{gcc_target_arch}-gcov
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool
@@ -1040,7 +1032,6 @@ fi
 %{_prefix}/bin/%{gcc_target_arch}-gcc-nm
 %{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib
 %{_prefix}/bin/%{gcc_target_arch}-lto-dump
-%if %{suse_version} < 1600
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-cpp
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc-ar
@@ -1052,16 +1043,13 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
 %endif
-%endif
 %if %{build_cp}
-%{_prefix}/bin/%{gcc_target_arch}-c++
-%{_prefix}/bin/%{gcc_target_arch}-g++
-%if %{suse_version} < 1600
 %{_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++
-%endif
 %if 0%{!?gcc_libc_bootstrap:1}
 %if "%{cross_arch}" == "avr" || 0%{?gcc_target_newlib:1} || 0%{?gcc_target_glibc:1}
 %{_prefix}/include/c++

cross-s390x-gcc13-bootstrap.spec

@@ -19,7 +19,6 @@
 %define pkgname cross-s390x-gcc13-bootstrap
 %define cross_arch s390x
 %define gcc_target_arch s390x-suse-linux
-%define gcc_target_glibc 1
 %define gcc_libc_bootstrap 1
 # nospeccleaner
 
@@ -293,24 +292,26 @@ 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_accel: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
+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.
-Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %{gcc_target_arch}-gcc
-Conflicts:      %{pkgname}-bootstrap
 %endif
 #!BuildIgnore: gcc-PIE
-%if %{build_cp}
+%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
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun): update-alternatives
@@ -586,11 +587,11 @@ amdgcn-amdhsa,\
 	--enable-gnu-indirect-function \
 %endif
 %endif
+	--program-suffix=%{binsuffix} \
 %ifarch %{disable_multilib_arch}
 	--disable-multilib \
 %endif
 %if 0%{!?gcc_target_arch:1}
-	--program-suffix=%{binsuffix} \
 %ifarch ia64
 	--with-system-libunwind \
 %else
@@ -598,9 +599,6 @@ amdgcn-amdhsa,\
 %endif
 %endif
 %if 0%{?gcc_target_arch:1}
-%if 0%{?gcc_accel:1} || %{suse_version} < 1600
-	--program-suffix=%{binsuffix} \
-%endif
 	--program-prefix=%{gcc_target_arch}- \
 	--target=%{gcc_target_arch} \
 	--disable-nls \
@@ -863,7 +861,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 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
+# 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.
@@ -888,7 +886,6 @@ 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}/f951
 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
@@ -896,8 +893,6 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 # 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}
-# also remove installed libstdc++ headers
-rm -rf $RPM_BUILD_ROOT%{_prefix}/include/c++
 %endif
 # for amdgcn install the symlinks to the llvm tools
 # follow alternatives symlinks to the hardcoded version requirement
@@ -962,7 +957,7 @@ rm -r env
 
 # we provide update-alternatives for selecting a compiler version for
 # crosses
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
 %if %{build_cp}
@@ -1018,19 +1013,15 @@ fi
 %endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
-%if %{suse_version} < 1600
 %{_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}
-%endif
 %if 0%{!?gcc_libc_bootstrap:1} && "%{cross_arch}" != "bpf"
-%if %{suse_version} < 1600
 %{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
-%endif
 %{_prefix}/bin/%{gcc_target_arch}-gcov
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool
@@ -1041,7 +1032,6 @@ fi
 %{_prefix}/bin/%{gcc_target_arch}-gcc-nm
 %{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib
 %{_prefix}/bin/%{gcc_target_arch}-lto-dump
-%if %{suse_version} < 1600
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-cpp
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc-ar
@@ -1053,16 +1043,13 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
 %endif
-%endif
 %if %{build_cp}
-%{_prefix}/bin/%{gcc_target_arch}-c++
-%{_prefix}/bin/%{gcc_target_arch}-g++
-%if %{suse_version} < 1600
 %{_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++
-%endif
 %if 0%{!?gcc_libc_bootstrap:1}
 %if "%{cross_arch}" == "avr" || 0%{?gcc_target_newlib:1} || 0%{?gcc_target_glibc:1}
 %{_prefix}/include/c++

cross-s390x-gcc13.spec

@@ -292,24 +292,26 @@ 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_accel: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
+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.
-Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %{gcc_target_arch}-gcc
-Conflicts:      %{pkgname}-bootstrap
 %endif
 #!BuildIgnore: gcc-PIE
-%if %{build_cp}
+%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
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun): update-alternatives
@@ -585,11 +587,11 @@ amdgcn-amdhsa,\
 	--enable-gnu-indirect-function \
 %endif
 %endif
+	--program-suffix=%{binsuffix} \
 %ifarch %{disable_multilib_arch}
 	--disable-multilib \
 %endif
 %if 0%{!?gcc_target_arch:1}
-	--program-suffix=%{binsuffix} \
 %ifarch ia64
 	--with-system-libunwind \
 %else
@@ -597,9 +599,6 @@ amdgcn-amdhsa,\
 %endif
 %endif
 %if 0%{?gcc_target_arch:1}
-%if 0%{?gcc_accel:1} || %{suse_version} < 1600
-	--program-suffix=%{binsuffix} \
-%endif
 	--program-prefix=%{gcc_target_arch}- \
 	--target=%{gcc_target_arch} \
 	--disable-nls \
@@ -862,7 +861,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 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
+# 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.
@@ -887,7 +886,6 @@ 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}/f951
 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
@@ -895,8 +893,6 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 # 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}
-# also remove installed libstdc++ headers
-rm -rf $RPM_BUILD_ROOT%{_prefix}/include/c++
 %endif
 # for amdgcn install the symlinks to the llvm tools
 # follow alternatives symlinks to the hardcoded version requirement
@@ -961,7 +957,7 @@ rm -r env
 
 # we provide update-alternatives for selecting a compiler version for
 # crosses
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
 %if %{build_cp}
@@ -1017,19 +1013,15 @@ fi
 %endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
-%if %{suse_version} < 1600
 %{_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}
-%endif
 %if 0%{!?gcc_libc_bootstrap:1} && "%{cross_arch}" != "bpf"
-%if %{suse_version} < 1600
 %{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
-%endif
 %{_prefix}/bin/%{gcc_target_arch}-gcov
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool
@@ -1040,7 +1032,6 @@ fi
 %{_prefix}/bin/%{gcc_target_arch}-gcc-nm
 %{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib
 %{_prefix}/bin/%{gcc_target_arch}-lto-dump
-%if %{suse_version} < 1600
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-cpp
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc-ar
@@ -1052,16 +1043,13 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
 %endif
-%endif
 %if %{build_cp}
-%{_prefix}/bin/%{gcc_target_arch}-c++
-%{_prefix}/bin/%{gcc_target_arch}-g++
-%if %{suse_version} < 1600
 %{_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++
-%endif
 %if 0%{!?gcc_libc_bootstrap:1}
 %if "%{cross_arch}" == "avr" || 0%{?gcc_target_newlib:1} || 0%{?gcc_target_glibc:1}
 %{_prefix}/include/c++

cross-x86_64-gcc13.spec

@@ -19,8 +19,7 @@
 %define pkgname cross-x86_64-gcc13
 %define cross_arch x86_64
 %define gcc_target_arch x86_64-suse-linux
-%define gcc_target_glibc 1
-%define gcc_libc_bootstrap 1
+%define gcc_icecream 1
 # nospeccleaner
 
 %define build_cp 0%{!?gcc_accel:1}
@@ -293,24 +292,26 @@ ExclusiveArch:  i586 ppc64le ppc64  s390x aarch64 riscv64
 %if "%pkgname" == "cross-ppc64-gcc49"
 Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 %endif
-%if 0%{!?gcc_accel: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
+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.
-Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %{gcc_target_arch}-gcc
-Conflicts:      %{pkgname}-bootstrap
 %endif
 #!BuildIgnore: gcc-PIE
-%if %{build_cp}
+%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
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun): update-alternatives
@@ -586,11 +587,11 @@ amdgcn-amdhsa,\
 	--enable-gnu-indirect-function \
 %endif
 %endif
+	--program-suffix=%{binsuffix} \
 %ifarch %{disable_multilib_arch}
 	--disable-multilib \
 %endif
 %if 0%{!?gcc_target_arch:1}
-	--program-suffix=%{binsuffix} \
 %ifarch ia64
 	--with-system-libunwind \
 %else
@@ -598,9 +599,6 @@ amdgcn-amdhsa,\
 %endif
 %endif
 %if 0%{?gcc_target_arch:1}
-%if 0%{?gcc_accel:1} || %{suse_version} < 1600
-	--program-suffix=%{binsuffix} \
-%endif
 	--program-prefix=%{gcc_target_arch}- \
 	--target=%{gcc_target_arch} \
 	--disable-nls \
@@ -863,7 +861,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 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
+# 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.
@@ -888,7 +886,6 @@ 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}/f951
 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
@@ -896,8 +893,6 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 # 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}
-# also remove installed libstdc++ headers
-rm -rf $RPM_BUILD_ROOT%{_prefix}/include/c++
 %endif
 # for amdgcn install the symlinks to the llvm tools
 # follow alternatives symlinks to the hardcoded version requirement
@@ -962,7 +957,7 @@ rm -r env
 
 # we provide update-alternatives for selecting a compiler version for
 # crosses
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
 %if %{build_cp}
@@ -1018,19 +1013,15 @@ fi
 %endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
-%if %{suse_version} < 1600
 %{_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}
-%endif
 %if 0%{!?gcc_libc_bootstrap:1} && "%{cross_arch}" != "bpf"
-%if %{suse_version} < 1600
 %{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
-%endif
 %{_prefix}/bin/%{gcc_target_arch}-gcov
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool
@@ -1041,7 +1032,6 @@ fi
 %{_prefix}/bin/%{gcc_target_arch}-gcc-nm
 %{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib
 %{_prefix}/bin/%{gcc_target_arch}-lto-dump
-%if %{suse_version} < 1600
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-cpp
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc-ar
@@ -1053,16 +1043,13 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
 %endif
-%endif
 %if %{build_cp}
-%{_prefix}/bin/%{gcc_target_arch}-c++
-%{_prefix}/bin/%{gcc_target_arch}-g++
-%if %{suse_version} < 1600
 %{_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++
-%endif
 %if 0%{!?gcc_libc_bootstrap:1}
 %if "%{cross_arch}" == "avr" || 0%{?gcc_target_newlib:1} || 0%{?gcc_target_glibc:1}
 %{_prefix}/include/c++

cross.spec.in

@@ -195,24 +195,26 @@ 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_accel: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
+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.
-Provides: %{gcc_target_arch}-gcc
 Conflicts: %{gcc_target_arch}-gcc
-Conflicts: %{pkgname}-bootstrap
 %endif
 #!BuildIgnore: gcc-PIE
-%if %{build_cp}
+%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-gcc@base_ver@
 %endif
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun): update-alternatives
@@ -305,7 +307,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 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
+# 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.
@@ -330,7 +332,6 @@ 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}/f951
 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
@@ -338,8 +339,6 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 # 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}
-# also remove installed libstdc++ headers
-rm -rf $RPM_BUILD_ROOT%{_prefix}/include/c++
 %endif
 # for amdgcn install the symlinks to the llvm tools
 # follow alternatives symlinks to the hardcoded version requirement
@@ -404,7 +403,7 @@ rm -r env
 
 # we provide update-alternatives for selecting a compiler version for
 # crosses
-%if 0%{!?gcc_accel:1} && %{suse_version} < 1600
+%if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
 %if %{build_cp}
@@ -460,19 +459,15 @@ fi
 %endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
-%if %{suse_version} < 1600
 %{_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}
-%endif
 %if 0%{!?gcc_libc_bootstrap:1} && "%{cross_arch}" != "bpf"
-%if %{suse_version} < 1600
 %{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
-%endif
 %{_prefix}/bin/%{gcc_target_arch}-gcov
 %{_prefix}/bin/%{gcc_target_arch}-gcov-dump
 %{_prefix}/bin/%{gcc_target_arch}-gcov-tool
@@ -483,7 +478,6 @@ fi
 %{_prefix}/bin/%{gcc_target_arch}-gcc-nm
 %{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib
 %{_prefix}/bin/%{gcc_target_arch}-lto-dump
-%if %{suse_version} < 1600
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-cpp
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcc-ar
@@ -495,16 +489,13 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
 %endif
-%endif
 %if %{build_cp}
-%{_prefix}/bin/%{gcc_target_arch}-c++
-%{_prefix}/bin/%{gcc_target_arch}-g++
-%if %{suse_version} < 1600
 %{_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++
-%endif
 %if 0%{!?gcc_libc_bootstrap:1}
 %if "%{cross_arch}" == "avr" || 0%{?gcc_target_newlib:1} || 0%{?gcc_target_glibc:1}
 %{_prefix}/include/c++
@@ -538,4 +529,4 @@ fi
 %exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
-%changelog -n %{pkgname}
+%changelog -n cross-%{pkgname}-gcc@base_ver@

gcc.spec.in

@@ -1591,11 +1591,11 @@ amdgcn-amdhsa,\
 	--enable-gnu-indirect-function \
 %endif
 %endif
+	--program-suffix=%{binsuffix} \
 %ifarch %{disable_multilib_arch}
 	--disable-multilib \
 %endif
 %if 0%{!?gcc_target_arch:1}
-	--program-suffix=%{binsuffix} \
 %ifarch ia64
 	--with-system-libunwind \
 %else
@@ -1603,9 +1603,6 @@ amdgcn-amdhsa,\
 %endif
 %endif
 %if 0%{?gcc_target_arch:1}
-%if 0%{?gcc_accel:1} || %{suse_version} < 1600
-	--program-suffix=%{binsuffix} \
-%endif
 	--program-prefix=%{gcc_target_arch}- \
 	--target=%{gcc_target_arch} \
 	--disable-nls \

gcc13-testresults.spec

@@ -777,11 +777,11 @@ amdgcn-amdhsa,\
 	--enable-gnu-indirect-function \
 %endif
 %endif
+	--program-suffix=%{binsuffix} \
 %ifarch %{disable_multilib_arch}
 	--disable-multilib \
 %endif
 %if 0%{!?gcc_target_arch:1}
-	--program-suffix=%{binsuffix} \
 %ifarch ia64
 	--with-system-libunwind \
 %else
@@ -789,9 +789,6 @@ amdgcn-amdhsa,\
 %endif
 %endif
 %if 0%{?gcc_target_arch:1}
-%if 0%{?gcc_accel:1} || %{suse_version} < 1600
-	--program-suffix=%{binsuffix} \
-%endif
 	--program-prefix=%{gcc_target_arch}- \
 	--target=%{gcc_target_arch} \
 	--disable-nls \

gcc13.changes

@@ -1,15 +1,3 @@
--------------------------------------------------------------------
-Thu Jul 17 07:20:37 UTC 2025 - Richard Biener <rguenther@suse.com>
-
-- Remove all %gcc_icecream mode cross-compilers and the corresponding
-  icecream backend subpackages.  Instead use glibc-bootstrap only
-  configs for cross-x86_64-gcc (ipxe,ovmf,qemu), cross-ppc64-gcc (qemu)
-  and cross-arm-gcc (ovmf).
-- Prune the use of update-alternatives from openSUSE Factory and
-  SLFO.
-- Adjust crosses to conflict consistently where they did not
-  already and make them use unsuffixed binaries. 
-
 -------------------------------------------------------------------
 Wed Jul  2 10:31:10 UTC 2025 - Richard Biener <rguenther@suse.com>
 

gcc13.spec

@@ -2601,11 +2601,11 @@ amdgcn-amdhsa,\
 	--enable-gnu-indirect-function \
 %endif
 %endif
+	--program-suffix=%{binsuffix} \
 %ifarch %{disable_multilib_arch}
 	--disable-multilib \
 %endif
 %if 0%{!?gcc_target_arch:1}
-	--program-suffix=%{binsuffix} \
 %ifarch ia64
 	--with-system-libunwind \
 %else
@@ -2613,9 +2613,6 @@ amdgcn-amdhsa,\
 %endif
 %endif
 %if 0%{?gcc_target_arch:1}
-%if 0%{?gcc_accel:1} || %{suse_version} < 1600
-	--program-suffix=%{binsuffix} \
-%endif
 	--program-prefix=%{gcc_target_arch}- \
 	--target=%{gcc_target_arch} \
 	--disable-nls \