diff --git a/cross-aarch64-gcc13-bootstrap.spec b/cross-aarch64-gcc13-bootstrap.spec
index 64d09e9..8a96f11 100644
--- a/cross-aarch64-gcc13-bootstrap.spec
+++ b/cross-aarch64-gcc13-bootstrap.spec
@@ -247,14 +247,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -305,9 +306,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -459,11 +462,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -883,11 +886,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -988,6 +991,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1057,11 +1068,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-aarch64-gcc13.spec b/cross-aarch64-gcc13.spec
index 5dba260..233a9fe 100644
--- a/cross-aarch64-gcc13.spec
+++ b/cross-aarch64-gcc13.spec
@@ -247,14 +247,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -305,9 +306,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -459,11 +462,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -883,11 +886,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -988,6 +991,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1057,11 +1068,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-amdgcn-gcc13.spec b/cross-amdgcn-gcc13.spec
index 4ca9151..9ced56e 100644
--- a/cross-amdgcn-gcc13.spec
+++ b/cross-amdgcn-gcc13.spec
@@ -247,14 +247,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -305,9 +306,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -459,11 +462,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -883,11 +886,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -988,6 +991,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1057,11 +1068,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-arm-gcc13.spec b/cross-arm-gcc13.spec
index f138b3b..536cc5d 100644
--- a/cross-arm-gcc13.spec
+++ b/cross-arm-gcc13.spec
@@ -247,14 +247,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -305,9 +306,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -459,11 +462,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -883,11 +886,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -988,6 +991,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1057,11 +1068,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-arm-none-gcc13-bootstrap.spec b/cross-arm-none-gcc13-bootstrap.spec
index 077a6ed..f2ed55e 100644
--- a/cross-arm-none-gcc13-bootstrap.spec
+++ b/cross-arm-none-gcc13-bootstrap.spec
@@ -248,14 +248,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -306,9 +307,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -460,11 +463,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -884,11 +887,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -989,6 +992,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1058,11 +1069,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-arm-none-gcc13.spec b/cross-arm-none-gcc13.spec
index 6d6340f..e4e4b90 100644
--- a/cross-arm-none-gcc13.spec
+++ b/cross-arm-none-gcc13.spec
@@ -247,14 +247,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -305,9 +306,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -459,11 +462,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -883,11 +886,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -988,6 +991,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1057,11 +1068,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-avr-gcc13-bootstrap.spec b/cross-avr-gcc13-bootstrap.spec
index 042e3f4..e6addd7 100644
--- a/cross-avr-gcc13-bootstrap.spec
+++ b/cross-avr-gcc13-bootstrap.spec
@@ -247,14 +247,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -305,9 +306,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -459,11 +462,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -883,11 +886,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -988,6 +991,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1057,11 +1068,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-avr-gcc13.spec b/cross-avr-gcc13.spec
index 06276c3..a7e3d9d 100644
--- a/cross-avr-gcc13.spec
+++ b/cross-avr-gcc13.spec
@@ -247,14 +247,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -305,9 +306,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -459,11 +462,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -883,11 +886,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -988,6 +991,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1057,11 +1068,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-bpf-gcc13.spec b/cross-bpf-gcc13.spec
index 30570c8..6b14491 100644
--- a/cross-bpf-gcc13.spec
+++ b/cross-bpf-gcc13.spec
@@ -247,14 +247,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -305,9 +306,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -459,11 +462,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -883,11 +886,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -988,6 +991,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1057,11 +1068,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-epiphany-gcc13-bootstrap.spec b/cross-epiphany-gcc13-bootstrap.spec
index 6b4ede1..e42cd0c 100644
--- a/cross-epiphany-gcc13-bootstrap.spec
+++ b/cross-epiphany-gcc13-bootstrap.spec
@@ -248,14 +248,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -306,9 +307,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -460,11 +463,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -884,11 +887,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -989,6 +992,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1058,11 +1069,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-epiphany-gcc13.spec b/cross-epiphany-gcc13.spec
index 8883e3e..e3b3a10 100644
--- a/cross-epiphany-gcc13.spec
+++ b/cross-epiphany-gcc13.spec
@@ -247,14 +247,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -305,9 +306,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -459,11 +462,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -883,11 +886,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -988,6 +991,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1057,11 +1068,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-hppa-gcc13-bootstrap.spec b/cross-hppa-gcc13-bootstrap.spec
index a761ee9..32f8551 100644
--- a/cross-hppa-gcc13-bootstrap.spec
+++ b/cross-hppa-gcc13-bootstrap.spec
@@ -247,14 +247,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -305,9 +306,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -459,11 +462,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -883,11 +886,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -988,6 +991,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1057,11 +1068,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-hppa-gcc13.spec b/cross-hppa-gcc13.spec
index 893cc2a..9434ef7 100644
--- a/cross-hppa-gcc13.spec
+++ b/cross-hppa-gcc13.spec
@@ -247,14 +247,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -305,9 +306,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -459,11 +462,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -883,11 +886,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -988,6 +991,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1057,11 +1068,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-m68k-gcc13.spec b/cross-m68k-gcc13.spec
index 0b3ae0e..0c0b2c9 100644
--- a/cross-m68k-gcc13.spec
+++ b/cross-m68k-gcc13.spec
@@ -247,14 +247,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -305,9 +306,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -459,11 +462,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -883,11 +886,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -988,6 +991,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1057,11 +1068,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-mips-gcc13.spec b/cross-mips-gcc13.spec
index 60ec716..c8e56d2 100644
--- a/cross-mips-gcc13.spec
+++ b/cross-mips-gcc13.spec
@@ -247,14 +247,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -305,9 +306,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -459,11 +462,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -883,11 +886,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -988,6 +991,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1057,11 +1068,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-nvptx-gcc13.spec b/cross-nvptx-gcc13.spec
index 018aa77..b9c7514 100644
--- a/cross-nvptx-gcc13.spec
+++ b/cross-nvptx-gcc13.spec
@@ -247,14 +247,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -305,9 +306,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -459,11 +462,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -883,11 +886,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -988,6 +991,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1057,11 +1068,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-ppc64-gcc13.spec b/cross-ppc64-gcc13.spec
index b125012..84df4ce 100644
--- a/cross-ppc64-gcc13.spec
+++ b/cross-ppc64-gcc13.spec
@@ -247,14 +247,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -305,9 +306,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -459,11 +462,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -883,11 +886,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -988,6 +991,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1057,11 +1068,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-ppc64le-gcc13-bootstrap.spec b/cross-ppc64le-gcc13-bootstrap.spec
index 6f3f34c..e0e75e4 100644
--- a/cross-ppc64le-gcc13-bootstrap.spec
+++ b/cross-ppc64le-gcc13-bootstrap.spec
@@ -247,14 +247,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -305,9 +306,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -459,11 +462,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -883,11 +886,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -988,6 +991,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1057,11 +1068,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-ppc64le-gcc13.spec b/cross-ppc64le-gcc13.spec
index dbf84f2..9371aaa 100644
--- a/cross-ppc64le-gcc13.spec
+++ b/cross-ppc64le-gcc13.spec
@@ -247,14 +247,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -305,9 +306,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -459,11 +462,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -883,11 +886,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -988,6 +991,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1057,11 +1068,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-pru-gcc13-bootstrap.spec b/cross-pru-gcc13-bootstrap.spec
index 89865f5..e3ff778 100644
--- a/cross-pru-gcc13-bootstrap.spec
+++ b/cross-pru-gcc13-bootstrap.spec
@@ -248,14 +248,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -306,9 +307,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -460,11 +463,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -884,11 +887,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -989,6 +992,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1058,11 +1069,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-pru-gcc13.spec b/cross-pru-gcc13.spec
index 9b01c1e..e2ae877 100644
--- a/cross-pru-gcc13.spec
+++ b/cross-pru-gcc13.spec
@@ -247,14 +247,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -305,9 +306,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -459,11 +462,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -883,11 +886,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -988,6 +991,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1057,11 +1068,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-riscv64-elf-gcc13-bootstrap.spec b/cross-riscv64-elf-gcc13-bootstrap.spec
index 064465d..d321c9c 100644
--- a/cross-riscv64-elf-gcc13-bootstrap.spec
+++ b/cross-riscv64-elf-gcc13-bootstrap.spec
@@ -248,14 +248,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -306,9 +307,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -460,11 +463,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -884,11 +887,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -989,6 +992,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1058,11 +1069,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-riscv64-elf-gcc13.spec b/cross-riscv64-elf-gcc13.spec
index d3f9667..d0923a2 100644
--- a/cross-riscv64-elf-gcc13.spec
+++ b/cross-riscv64-elf-gcc13.spec
@@ -247,14 +247,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -305,9 +306,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -459,11 +462,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -883,11 +886,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -988,6 +991,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1057,11 +1068,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-riscv64-gcc13-bootstrap.spec b/cross-riscv64-gcc13-bootstrap.spec
index 58d1e08..3404ac2 100644
--- a/cross-riscv64-gcc13-bootstrap.spec
+++ b/cross-riscv64-gcc13-bootstrap.spec
@@ -247,14 +247,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -305,9 +306,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -459,11 +462,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -883,11 +886,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -988,6 +991,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1057,11 +1068,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-riscv64-gcc13.spec b/cross-riscv64-gcc13.spec
index 0c4a78e..9945812 100644
--- a/cross-riscv64-gcc13.spec
+++ b/cross-riscv64-gcc13.spec
@@ -247,14 +247,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -305,9 +306,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -459,11 +462,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -883,11 +886,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -988,6 +991,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1057,11 +1068,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-rx-gcc13-bootstrap.spec b/cross-rx-gcc13-bootstrap.spec
index 10999b8..a48d933 100644
--- a/cross-rx-gcc13-bootstrap.spec
+++ b/cross-rx-gcc13-bootstrap.spec
@@ -248,14 +248,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -306,9 +307,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -460,11 +463,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -884,11 +887,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -989,6 +992,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1058,11 +1069,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-rx-gcc13.spec b/cross-rx-gcc13.spec
index 50475f6..1940e49 100644
--- a/cross-rx-gcc13.spec
+++ b/cross-rx-gcc13.spec
@@ -247,14 +247,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -305,9 +306,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -459,11 +462,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -883,11 +886,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -988,6 +991,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1057,11 +1068,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-s390x-gcc13-bootstrap.spec b/cross-s390x-gcc13-bootstrap.spec
index 6d3051f..49361db 100644
--- a/cross-s390x-gcc13-bootstrap.spec
+++ b/cross-s390x-gcc13-bootstrap.spec
@@ -247,14 +247,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -305,9 +306,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -459,11 +462,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -883,11 +886,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -988,6 +991,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1057,11 +1068,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-s390x-gcc13.spec b/cross-s390x-gcc13.spec
index 0380a80..3f7b08a 100644
--- a/cross-s390x-gcc13.spec
+++ b/cross-s390x-gcc13.spec
@@ -247,14 +247,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -305,9 +306,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -459,11 +462,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -883,11 +886,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -988,6 +991,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1057,11 +1068,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-sparc-gcc13.spec b/cross-sparc-gcc13.spec
index e6c2949..eb061ca 100644
--- a/cross-sparc-gcc13.spec
+++ b/cross-sparc-gcc13.spec
@@ -247,14 +247,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -305,9 +306,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -459,11 +462,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -883,11 +886,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -988,6 +991,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1057,11 +1068,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-sparc64-gcc13.spec b/cross-sparc64-gcc13.spec
index 233d3aa..75fd8ec 100644
--- a/cross-sparc64-gcc13.spec
+++ b/cross-sparc64-gcc13.spec
@@ -247,14 +247,15 @@ ExclusiveArch:  x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -305,9 +306,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -459,11 +462,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -883,11 +886,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -988,6 +991,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1057,11 +1068,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross-x86_64-gcc13.spec b/cross-x86_64-gcc13.spec
index b4fe805..ddbe695 100644
--- a/cross-x86_64-gcc13.spec
+++ b/cross-x86_64-gcc13.spec
@@ -247,14 +247,15 @@ ExclusiveArch:
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires:  llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires:  llvm
+BuildRequires:  llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires:  lld
 %if %{suse_version} < 1550
 Requires:       llvm13
 %else
-Requires:       llvm
+Requires:       llvm%{product_libs_llvm_ver}
 %endif
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
 Requires:       lld
@@ -305,9 +306,11 @@ Conflicts:      cross-%{cross_arch}-gcc13
 Requires:       libstdc++6-devel-gcc13
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun):update-alternatives
+%endif
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -459,11 +462,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
@@ -883,11 +886,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -988,6 +991,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -1057,11 +1068,7 @@ fi
 %files -n cross-amdgcn-newlib13-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog
diff --git a/cross.spec.in b/cross.spec.in
index 901620b..2d0ad78 100644
--- a/cross.spec.in
+++ b/cross.spec.in
@@ -155,14 +155,15 @@ ExclusiveArch: x86_64
 # amdgcn uses the llvm assembler and linker
 %if %{suse_version} < 1550
 BuildRequires: llvm13
+%define product_libs_llvm_ver 13
 %else
-BuildRequires: llvm
+BuildRequires: llvm%{product_libs_llvm_ver}
 %endif
 BuildRequires: lld
 %if %{suse_version} < 1550
 Requires: llvm13
 %else
-Requires: llvm
+Requires: llvm%{product_libs_llvm_ver}
 %endif
 Requires: lld
 Requires: cross-amdgcn-newlib-devel >= %{version}-%{release}
@@ -213,9 +214,11 @@ Conflicts: cross-%{cross_arch}-gcc@base_ver@
 Requires:       libstdc++6-devel-gcc@base_ver@
 %endif
 AutoReqProv:    off
+%if 0%{!?gcc_accel:1}
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
 Requires(preun): update-alternatives
+%endif
 Summary:	The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
 
@@ -338,11 +341,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 # follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar
 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as
 ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld
@@ -443,6 +446,14 @@ fi
 %dir %{libsubdir}
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
+%if "%{cross_arch}" == "amdgcn"
+%{_prefix}/%{gcc_target_arch}/bin
+%{_prefix}/bin/amdgcn-amdhsa-ar
+%{_prefix}/bin/amdgcn-amdhsa-as
+%{_prefix}/bin/amdgcn-amdhsa-ld
+%{_prefix}/bin/amdgcn-amdhsa-nm
+%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%endif
 %else
 %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
@@ -512,11 +523,7 @@ fi
 %files -n cross-amdgcn-newlib@base_ver@-devel
 %defattr(-,root,root)
 %{_prefix}/%{gcc_target_arch}
-%{_prefix}/bin/amdgcn-amdhsa-ar
-%{_prefix}/bin/amdgcn-amdhsa-as
-%{_prefix}/bin/amdgcn-amdhsa-ld
-%{_prefix}/bin/amdgcn-amdhsa-nm
-%{_prefix}/bin/amdgcn-amdhsa-ranlib
+%exclude %{_prefix}/%{gcc_target_arch}/bin
 %endif
 
 %changelog -n cross-%{pkgname}-gcc@base_ver@
diff --git a/gcc.spec.in b/gcc.spec.in
index 214ecc8..339fdc3 100644
--- a/gcc.spec.in
+++ b/gcc.spec.in
@@ -1456,11 +1456,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
diff --git a/gcc13-testresults.spec b/gcc13-testresults.spec
index 94d4f0a..c3345d6 100644
--- a/gcc13-testresults.spec
+++ b/gcc13-testresults.spec
@@ -647,11 +647,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif
 
diff --git a/gcc13.changes b/gcc13.changes
index 8305af2..4803871 100644
--- a/gcc13.changes
+++ b/gcc13.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Nov 24 08:49:50 UTC 2023 - Richard Biener <rguenther@suse.com>
+
+- Avoid update-alternatives dependency for accelerator crosses.
+- Package tool links to llvm in cross-amdgcn-gcc13 rather than in
+  cross-amdgcn-newlib13-devel since that also has the dependence.
+- Depend on llvmVER instead of llvm with VER equal to
+  %product_libs_llvm_ver where available and adjust tool discovery
+  accordingly.  This should also properly trigger re-builds when
+  the patchlevel version of llvmVER changes, possibly changing
+  the binary names we link to.  [bsc#1217450]
+
 -------------------------------------------------------------------
 Tue Nov  7 12:57:49 UTC 2023 - Richard Biener <rguenther@suse.com>
 
diff --git a/gcc13.spec b/gcc13.spec
index 633be34..c462ad1 100644
--- a/gcc13.spec
+++ b/gcc13.spec
@@ -2464,11 +2464,11 @@ export _POSIX2_VERSION=199209
 
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p target-tools/bin
-ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar
-ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as
+ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar
+ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as
 ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld
-ln -s /usr/bin/llvm-nm target-tools/bin/amdgcn-amdhsa-nm
-ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib
+ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm
+ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib
 export PATH="`pwd`/target-tools/bin:$PATH"
 %endif