- Up requirement to llvm15 when building GCN offload compiler, needed

for gfx1100 support.
- Remove obsolete gcc11-amdgcn-disable-hot-cold-partitioning.patch and
  gcc10-amdgcn-llvm-as.patch patches.

OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc14?expand=0&rev=14

cross-aarch64-gcc14-bootstrap.spec

@@ -130,9 +130,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -242,21 +240,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -345,11 +337,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -891,7 +878,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-aarch64-gcc14.spec

@@ -130,9 +130,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -242,21 +240,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -345,11 +337,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -891,7 +878,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-amdgcn-gcc14.spec

@@ -130,9 +130,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -242,21 +240,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -345,11 +337,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -891,7 +878,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-arm-gcc14.spec

@@ -130,9 +130,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -242,21 +240,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -345,11 +337,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -891,7 +878,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-arm-none-gcc14-bootstrap.spec

@@ -131,9 +131,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -243,21 +241,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -346,11 +338,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -892,7 +879,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-arm-none-gcc14.spec

@@ -130,9 +130,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -242,21 +240,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -345,11 +337,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -891,7 +878,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-avr-gcc14-bootstrap.spec

@@ -130,9 +130,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -242,21 +240,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -345,11 +337,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -891,7 +878,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-avr-gcc14.spec

@@ -130,9 +130,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -242,21 +240,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -345,11 +337,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -891,7 +878,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-bpf-gcc14.spec

@@ -130,9 +130,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -242,21 +240,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -345,11 +337,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -891,7 +878,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-epiphany-gcc14-bootstrap.spec

@@ -131,9 +131,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -243,21 +241,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -346,11 +338,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -892,7 +879,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-epiphany-gcc14.spec

@@ -130,9 +130,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -242,21 +240,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -345,11 +337,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -891,7 +878,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-hppa-gcc14-bootstrap.spec

@@ -130,9 +130,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -242,21 +240,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -345,11 +337,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -891,7 +878,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-hppa-gcc14.spec

@@ -130,9 +130,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -242,21 +240,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -345,11 +337,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -891,7 +878,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-m68k-gcc14.spec

@@ -130,9 +130,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -242,21 +240,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -345,11 +337,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -891,7 +878,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-mips-gcc14.spec

@@ -130,9 +130,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -242,21 +240,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -345,11 +337,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -891,7 +878,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-nvptx-gcc14.spec

@@ -130,9 +130,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -242,21 +240,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -345,11 +337,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -891,7 +878,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-ppc64-gcc14.spec

@@ -130,9 +130,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -242,21 +240,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -345,11 +337,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -891,7 +878,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-ppc64le-gcc14-bootstrap.spec

@@ -130,9 +130,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -242,21 +240,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -345,11 +337,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -891,7 +878,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-ppc64le-gcc14.spec

@@ -130,9 +130,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -242,21 +240,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -345,11 +337,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -891,7 +878,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-pru-gcc14-bootstrap.spec

@@ -131,9 +131,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -243,21 +241,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -346,11 +338,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -892,7 +879,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-pru-gcc14.spec

@@ -130,9 +130,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -242,21 +240,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -345,11 +337,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -891,7 +878,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-riscv64-elf-gcc14-bootstrap.spec

@@ -131,9 +131,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -243,21 +241,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -346,11 +338,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -892,7 +879,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-riscv64-elf-gcc14.spec

@@ -130,9 +130,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -242,21 +240,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -345,11 +337,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -891,7 +878,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-riscv64-gcc14-bootstrap.spec

@@ -130,9 +130,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -242,21 +240,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -345,11 +337,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -891,7 +878,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-riscv64-gcc14.spec

@@ -130,9 +130,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -242,21 +240,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -345,11 +337,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -891,7 +878,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-rx-gcc14-bootstrap.spec

@@ -131,9 +131,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -243,21 +241,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -346,11 +338,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -892,7 +879,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-rx-gcc14.spec

@@ -130,9 +130,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -242,21 +240,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -345,11 +337,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -891,7 +878,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-s390x-gcc14-bootstrap.spec

@@ -130,9 +130,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -242,21 +240,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -345,11 +337,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -891,7 +878,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-s390x-gcc14.spec

@@ -130,9 +130,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -242,21 +240,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -345,11 +337,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -891,7 +878,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-sparc-gcc14.spec

@@ -130,9 +130,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -242,21 +240,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -345,11 +337,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -891,7 +878,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-sparc64-gcc14.spec

@@ -130,9 +130,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -242,21 +240,15 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -345,11 +337,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -891,7 +878,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross-x86_64-gcc14.spec

@@ -130,9 +130,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -242,21 +240,15 @@ ExclusiveArch:
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires:  llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires:  llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires:  lld
-%if %{suse_version} < 1550
-Requires:       llvm13
-%else
 Requires:       llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires:  lld%{product_libs_llvm_ver}
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld
+Requires:       lld%{product_libs_llvm_ver}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
 %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100
@@ -345,11 +337,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -891,7 +878,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

cross.spec.in

@@ -153,20 +153,14 @@ ExclusiveArch: x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker
+# amdgcn uses the llvm assembler and linker, needs at least llvm 15
-%if %{suse_version} < 1550
+%if 0%{?product_libs_llvm_ver} < 15
-BuildRequires: llvm13
+%define product_libs_llvm_ver 15
-%define product_libs_llvm_ver 13
+%endif
-%else
 BuildRequires: llvm%{product_libs_llvm_ver}
-%endif
-BuildRequires: lld
-%if %{suse_version} < 1550
-Requires: llvm13
-%else
 Requires: llvm%{product_libs_llvm_ver}
-%endif
+BuildRequires: lld%{product_libs_llvm_ver}
-Requires: lld
+Requires: lld%{product_libs_llvm_ver}
 Requires: cross-amdgcn-newlib-devel >= %{version}-%{release}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
@@ -346,7 +340,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
 ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
 ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
-ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
+ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
 ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
 ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar

gcc.spec.in

@@ -388,9 +388,7 @@ Patch11:	gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:	gcc7-avoid-fixinc-error.diff
 Patch16:	gcc9-reproducible-builds.patch
 Patch17:	gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:	gcc10-amdgcn-llvm-as.patch
 Patch19:	gcc11-gdwarf-4-default.patch
-Patch20:	gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:	gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -1346,11 +1344,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

gcc10-amdgcn-llvm-as.patch

@@ -1,31 +0,0 @@
-varasm.c: Always output flags in merged .section for LLVM assembler compatibility [PR97827]
-
-For compatibility with LLVM 11's 'mc' assembler, the flags have to be
-repeated every time. See also LLVM Bug 48201 for this issue and
-https://reviews.llvm.org/D73999 for the patch causing the issue.
-
-gcc/
-	PR target/97827
-	* varasm.c (default_elf_asm_named_section): Always output all
-	flags if SECTION_MERGE, even if already declared before.
-
-diff --git a/gcc/varasm.cc b/gcc/varasm.cc
-index 21be03aeba2..9cb46885aa5 100644
---- a/gcc/varasm.cc
-+++ b/gcc/varasm.cc
-@@ -6792,10 +6792,13 @@ default_elf_asm_named_section (const char *name, unsigned int flags,
-   /* If we have already declared this section, we can use an
-      abbreviated form to switch back to it -- unless this section is
-      part of a COMDAT groups or with SHF_GNU_RETAIN or with SHF_LINK_ORDER,
--     in which case GAS requires the full declaration every time.  */
-+     in which case GAS requires the full declaration every time.
-+     LLVM's MC linker requires that the
-+     flags are identical, thus avoid the abbreviated form with MERGE.  */
-   if (!(HAVE_COMDAT_GROUP && (flags & SECTION_LINKONCE))
-       && !(flags & (SECTION_RETAIN | SECTION_LINK_ORDER))
--      && (flags & SECTION_DECLARED))
-+      && (flags & SECTION_DECLARED)
-+      && !(flags & SECTION_MERGE))
-     {
-       fprintf (asm_out_file, "\t.section\t%s\n", name);
-       return;

gcc11-amdgcn-disable-hot-cold-partitioning.patch

@@ -1,22 +0,0 @@
-diff --git a/gcc/config/gcn/gcn.cc b/gcc/config/gcn/gcn.cc
-index 6d02a4a02..d77f66182 100644
---- a/gcc/config/gcn/gcn.cc
-+++ b/gcc/config/gcn/gcn.cc
-@@ -6413,9 +6413,17 @@ gcn_dwarf_register_span (rtx rtl)
-   return p;
- }
- 
-+static void
-+gcn_override_options_after_change (void)
-+{
-+  flag_reorder_blocks_and_partition = 0;
-+}
-+
- /* }}}  */
- /* {{{ TARGET hook overrides.  */
- 
-+#undef TARGET_OVERRIDE_OPTIONS_AFTER_CHANGE
-+#define TARGET_OVERRIDE_OPTIONS_AFTER_CHANGE gcn_override_options_after_change
- #undef  TARGET_ADDR_SPACE_ADDRESS_MODE
- #define TARGET_ADDR_SPACE_ADDRESS_MODE gcn_addr_space_address_mode
- #undef  TARGET_ADDR_SPACE_DEBUG

gcc14-testresults.spec

@@ -404,9 +404,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -536,11 +534,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

gcc14.changes

@@ -3,6 +3,10 @@ Mon Jan 29 08:34:57 UTC 2024 - Richard Biener <rguenther@suse.com>
 
 - Update to trunk head, b702dc980215074a06535e3aa52a766bef, git8486
 - Refresh gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
+- Up requirement to llvm15 when building GCN offload compiler, needed
+  for gfx1100 support.
+- Remove obsolete gcc11-amdgcn-disable-hot-cold-partitioning.patch and
+  gcc10-amdgcn-llvm-as.patch patches.
 
 -------------------------------------------------------------------
 Mon Jan 22 09:50:35 UTC 2024 - Richard Biener <rguenther@suse.com>

gcc14.spec

@@ -383,9 +383,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch15:        gcc7-avoid-fixinc-error.diff
 Patch16:        gcc9-reproducible-builds.patch
 Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
-Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
-Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -2356,11 +2354,6 @@ ln -s newlib-4.4.0.20231231/newlib .
 %patch15
 %patch16
 %patch17 -p1
-# These patches are needed only for llvm11
-%if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
-%endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1