yet work. Package expanded symlinks so concurrent installs do

not pull in another llvm-mc.

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

cross-aarch64-gcc11.changes

@@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Enable gfortran for offload compilers.
 - BuildRequire procps from gcc11-testresults if we test go.
 - Force using llvm11 for amdgcn offloading since llvm12 doesn't
-  yet work.
+  yet work.  Package expanded symlinks so concurrent installs do
+  not pull in another llvm-mc.
 
 -------------------------------------------------------------------
 Tue Apr 20 14:57:07 UTC 2021 - Richard Biener <rguenther@suse.com>

cross-aarch64-gcc11.spec

@@ -234,12 +234,12 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker, llvm12 doesn't
-# work at the moment
-BuildRequires:  lld11
+# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't
+# work at the moment so require llvm11
+BuildRequires:  lld
 BuildRequires:  llvm11
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld11
+Requires:       lld
 Requires:       llvm11
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
@@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 %endif
 # for amdgcn install the symlinks to the llvm tools
+# follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
-ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+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 %{_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

cross-amdgcn-gcc11.changes

@@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Enable gfortran for offload compilers.
 - BuildRequire procps from gcc11-testresults if we test go.
 - Force using llvm11 for amdgcn offloading since llvm12 doesn't
-  yet work.
+  yet work.  Package expanded symlinks so concurrent installs do
+  not pull in another llvm-mc.
 
 -------------------------------------------------------------------
 Tue Apr 20 14:57:07 UTC 2021 - Richard Biener <rguenther@suse.com>

cross-amdgcn-gcc11.spec

@@ -234,12 +234,12 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker, llvm12 doesn't
-# work at the moment
-BuildRequires:  lld11
+# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't
+# work at the moment so require llvm11
+BuildRequires:  lld
 BuildRequires:  llvm11
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld11
+Requires:       lld
 Requires:       llvm11
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
@@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 %endif
 # for amdgcn install the symlinks to the llvm tools
+# follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
-ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+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 %{_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

cross-arm-gcc11.changes

@@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Enable gfortran for offload compilers.
 - BuildRequire procps from gcc11-testresults if we test go.
 - Force using llvm11 for amdgcn offloading since llvm12 doesn't
-  yet work.
+  yet work.  Package expanded symlinks so concurrent installs do
+  not pull in another llvm-mc.
 
 -------------------------------------------------------------------
 Tue Apr 20 14:57:07 UTC 2021 - Richard Biener <rguenther@suse.com>

cross-arm-gcc11.spec

@@ -234,12 +234,12 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker, llvm12 doesn't
-# work at the moment
-BuildRequires:  lld11
+# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't
+# work at the moment so require llvm11
+BuildRequires:  lld
 BuildRequires:  llvm11
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld11
+Requires:       lld
 Requires:       llvm11
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
@@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 %endif
 # for amdgcn install the symlinks to the llvm tools
+# follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
-ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+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 %{_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

cross-arm-none-gcc11-bootstrap.changes

@@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Enable gfortran for offload compilers.
 - BuildRequire procps from gcc11-testresults if we test go.
 - Force using llvm11 for amdgcn offloading since llvm12 doesn't
-  yet work.
+  yet work.  Package expanded symlinks so concurrent installs do
+  not pull in another llvm-mc.
 
 -------------------------------------------------------------------
 Tue Apr 20 14:57:07 UTC 2021 - Richard Biener <rguenther@suse.com>

cross-arm-none-gcc11-bootstrap.spec

@@ -235,12 +235,12 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker, llvm12 doesn't
-# work at the moment
-BuildRequires:  lld11
+# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't
+# work at the moment so require llvm11
+BuildRequires:  lld
 BuildRequires:  llvm11
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld11
+Requires:       lld
 Requires:       llvm11
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
@@ -765,13 +765,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 %endif
 # for amdgcn install the symlinks to the llvm tools
+# follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
-ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+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 %{_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

cross-arm-none-gcc11.changes

@@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Enable gfortran for offload compilers.
 - BuildRequire procps from gcc11-testresults if we test go.
 - Force using llvm11 for amdgcn offloading since llvm12 doesn't
-  yet work.
+  yet work.  Package expanded symlinks so concurrent installs do
+  not pull in another llvm-mc.
 
 -------------------------------------------------------------------
 Tue Apr 20 14:57:07 UTC 2021 - Richard Biener <rguenther@suse.com>

cross-arm-none-gcc11.spec

@@ -234,12 +234,12 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker, llvm12 doesn't
-# work at the moment
-BuildRequires:  lld11
+# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't
+# work at the moment so require llvm11
+BuildRequires:  lld
 BuildRequires:  llvm11
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld11
+Requires:       lld
 Requires:       llvm11
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
@@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 %endif
 # for amdgcn install the symlinks to the llvm tools
+# follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
-ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+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 %{_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

cross-avr-gcc11-bootstrap.changes

@@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Enable gfortran for offload compilers.
 - BuildRequire procps from gcc11-testresults if we test go.
 - Force using llvm11 for amdgcn offloading since llvm12 doesn't
-  yet work.
+  yet work.  Package expanded symlinks so concurrent installs do
+  not pull in another llvm-mc.
 
 -------------------------------------------------------------------
 Tue Apr 20 14:57:07 UTC 2021 - Richard Biener <rguenther@suse.com>

cross-avr-gcc11-bootstrap.spec

@@ -234,12 +234,12 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker, llvm12 doesn't
-# work at the moment
-BuildRequires:  lld11
+# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't
+# work at the moment so require llvm11
+BuildRequires:  lld
 BuildRequires:  llvm11
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld11
+Requires:       lld
 Requires:       llvm11
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
@@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 %endif
 # for amdgcn install the symlinks to the llvm tools
+# follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
-ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+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 %{_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

cross-avr-gcc11.changes

@@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Enable gfortran for offload compilers.
 - BuildRequire procps from gcc11-testresults if we test go.
 - Force using llvm11 for amdgcn offloading since llvm12 doesn't
-  yet work.
+  yet work.  Package expanded symlinks so concurrent installs do
+  not pull in another llvm-mc.
 
 -------------------------------------------------------------------
 Tue Apr 20 14:57:07 UTC 2021 - Richard Biener <rguenther@suse.com>

cross-avr-gcc11.spec

@@ -234,12 +234,12 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker, llvm12 doesn't
-# work at the moment
-BuildRequires:  lld11
+# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't
+# work at the moment so require llvm11
+BuildRequires:  lld
 BuildRequires:  llvm11
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld11
+Requires:       lld
 Requires:       llvm11
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
@@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 %endif
 # for amdgcn install the symlinks to the llvm tools
+# follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
-ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+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 %{_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

cross-epiphany-gcc11-bootstrap.changes

@@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Enable gfortran for offload compilers.
 - BuildRequire procps from gcc11-testresults if we test go.
 - Force using llvm11 for amdgcn offloading since llvm12 doesn't
-  yet work.
+  yet work.  Package expanded symlinks so concurrent installs do
+  not pull in another llvm-mc.
 
 -------------------------------------------------------------------
 Tue Apr 20 14:57:07 UTC 2021 - Richard Biener <rguenther@suse.com>

cross-epiphany-gcc11-bootstrap.spec

@@ -235,12 +235,12 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker, llvm12 doesn't
-# work at the moment
-BuildRequires:  lld11
+# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't
+# work at the moment so require llvm11
+BuildRequires:  lld
 BuildRequires:  llvm11
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld11
+Requires:       lld
 Requires:       llvm11
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
@@ -765,13 +765,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 %endif
 # for amdgcn install the symlinks to the llvm tools
+# follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
-ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+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 %{_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

cross-epiphany-gcc11.changes

@@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Enable gfortran for offload compilers.
 - BuildRequire procps from gcc11-testresults if we test go.
 - Force using llvm11 for amdgcn offloading since llvm12 doesn't
-  yet work.
+  yet work.  Package expanded symlinks so concurrent installs do
+  not pull in another llvm-mc.
 
 -------------------------------------------------------------------
 Tue Apr 20 14:57:07 UTC 2021 - Richard Biener <rguenther@suse.com>

cross-epiphany-gcc11.spec

@@ -234,12 +234,12 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker, llvm12 doesn't
-# work at the moment
-BuildRequires:  lld11
+# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't
+# work at the moment so require llvm11
+BuildRequires:  lld
 BuildRequires:  llvm11
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld11
+Requires:       lld
 Requires:       llvm11
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
@@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 %endif
 # for amdgcn install the symlinks to the llvm tools
+# follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
-ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+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 %{_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

cross-hppa-gcc11.changes

@@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Enable gfortran for offload compilers.
 - BuildRequire procps from gcc11-testresults if we test go.
 - Force using llvm11 for amdgcn offloading since llvm12 doesn't
-  yet work.
+  yet work.  Package expanded symlinks so concurrent installs do
+  not pull in another llvm-mc.
 
 -------------------------------------------------------------------
 Tue Apr 20 14:57:07 UTC 2021 - Richard Biener <rguenther@suse.com>

cross-hppa-gcc11.spec

@@ -234,12 +234,12 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker, llvm12 doesn't
-# work at the moment
-BuildRequires:  lld11
+# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't
+# work at the moment so require llvm11
+BuildRequires:  lld
 BuildRequires:  llvm11
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld11
+Requires:       lld
 Requires:       llvm11
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
@@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 %endif
 # for amdgcn install the symlinks to the llvm tools
+# follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
-ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+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 %{_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

cross-i386-gcc11.changes

@@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Enable gfortran for offload compilers.
 - BuildRequire procps from gcc11-testresults if we test go.
 - Force using llvm11 for amdgcn offloading since llvm12 doesn't
-  yet work.
+  yet work.  Package expanded symlinks so concurrent installs do
+  not pull in another llvm-mc.
 
 -------------------------------------------------------------------
 Tue Apr 20 14:57:07 UTC 2021 - Richard Biener <rguenther@suse.com>

cross-i386-gcc11.spec

@@ -234,12 +234,12 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker, llvm12 doesn't
-# work at the moment
-BuildRequires:  lld11
+# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't
+# work at the moment so require llvm11
+BuildRequires:  lld
 BuildRequires:  llvm11
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld11
+Requires:       lld
 Requires:       llvm11
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
@@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 %endif
 # for amdgcn install the symlinks to the llvm tools
+# follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
-ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+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 %{_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

cross-m68k-gcc11.changes

@@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Enable gfortran for offload compilers.
 - BuildRequire procps from gcc11-testresults if we test go.
 - Force using llvm11 for amdgcn offloading since llvm12 doesn't
-  yet work.
+  yet work.  Package expanded symlinks so concurrent installs do
+  not pull in another llvm-mc.
 
 -------------------------------------------------------------------
 Tue Apr 20 14:57:07 UTC 2021 - Richard Biener <rguenther@suse.com>

cross-m68k-gcc11.spec

@@ -234,12 +234,12 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker, llvm12 doesn't
-# work at the moment
-BuildRequires:  lld11
+# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't
+# work at the moment so require llvm11
+BuildRequires:  lld
 BuildRequires:  llvm11
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld11
+Requires:       lld
 Requires:       llvm11
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
@@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 %endif
 # for amdgcn install the symlinks to the llvm tools
+# follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
-ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+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 %{_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

cross-mips-gcc11.changes

@@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Enable gfortran for offload compilers.
 - BuildRequire procps from gcc11-testresults if we test go.
 - Force using llvm11 for amdgcn offloading since llvm12 doesn't
-  yet work.
+  yet work.  Package expanded symlinks so concurrent installs do
+  not pull in another llvm-mc.
 
 -------------------------------------------------------------------
 Tue Apr 20 14:57:07 UTC 2021 - Richard Biener <rguenther@suse.com>

cross-mips-gcc11.spec

@@ -234,12 +234,12 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker, llvm12 doesn't
-# work at the moment
-BuildRequires:  lld11
+# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't
+# work at the moment so require llvm11
+BuildRequires:  lld
 BuildRequires:  llvm11
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld11
+Requires:       lld
 Requires:       llvm11
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
@@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 %endif
 # for amdgcn install the symlinks to the llvm tools
+# follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
-ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+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 %{_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

cross-nvptx-gcc11.changes

@@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Enable gfortran for offload compilers.
 - BuildRequire procps from gcc11-testresults if we test go.
 - Force using llvm11 for amdgcn offloading since llvm12 doesn't
-  yet work.
+  yet work.  Package expanded symlinks so concurrent installs do
+  not pull in another llvm-mc.
 
 -------------------------------------------------------------------
 Tue Apr 20 14:57:07 UTC 2021 - Richard Biener <rguenther@suse.com>

cross-nvptx-gcc11.spec

@@ -234,12 +234,12 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker, llvm12 doesn't
-# work at the moment
-BuildRequires:  lld11
+# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't
+# work at the moment so require llvm11
+BuildRequires:  lld
 BuildRequires:  llvm11
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld11
+Requires:       lld
 Requires:       llvm11
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
@@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 %endif
 # for amdgcn install the symlinks to the llvm tools
+# follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
-ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+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 %{_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

cross-ppc64-gcc11.changes

@@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Enable gfortran for offload compilers.
 - BuildRequire procps from gcc11-testresults if we test go.
 - Force using llvm11 for amdgcn offloading since llvm12 doesn't
-  yet work.
+  yet work.  Package expanded symlinks so concurrent installs do
+  not pull in another llvm-mc.
 
 -------------------------------------------------------------------
 Tue Apr 20 14:57:07 UTC 2021 - Richard Biener <rguenther@suse.com>

cross-ppc64-gcc11.spec

@@ -234,12 +234,12 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker, llvm12 doesn't
-# work at the moment
-BuildRequires:  lld11
+# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't
+# work at the moment so require llvm11
+BuildRequires:  lld
 BuildRequires:  llvm11
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld11
+Requires:       lld
 Requires:       llvm11
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
@@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 %endif
 # for amdgcn install the symlinks to the llvm tools
+# follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
-ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+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 %{_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

cross-ppc64le-gcc11.changes

@@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Enable gfortran for offload compilers.
 - BuildRequire procps from gcc11-testresults if we test go.
 - Force using llvm11 for amdgcn offloading since llvm12 doesn't
-  yet work.
+  yet work.  Package expanded symlinks so concurrent installs do
+  not pull in another llvm-mc.
 
 -------------------------------------------------------------------
 Tue Apr 20 14:57:07 UTC 2021 - Richard Biener <rguenther@suse.com>

cross-ppc64le-gcc11.spec

@@ -234,12 +234,12 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker, llvm12 doesn't
-# work at the moment
-BuildRequires:  lld11
+# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't
+# work at the moment so require llvm11
+BuildRequires:  lld
 BuildRequires:  llvm11
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld11
+Requires:       lld
 Requires:       llvm11
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
@@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 %endif
 # for amdgcn install the symlinks to the llvm tools
+# follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
-ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+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 %{_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

cross-riscv64-elf-gcc11-bootstrap.changes

@@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Enable gfortran for offload compilers.
 - BuildRequire procps from gcc11-testresults if we test go.
 - Force using llvm11 for amdgcn offloading since llvm12 doesn't
-  yet work.
+  yet work.  Package expanded symlinks so concurrent installs do
+  not pull in another llvm-mc.
 
 -------------------------------------------------------------------
 Tue Apr 20 14:57:07 UTC 2021 - Richard Biener <rguenther@suse.com>

cross-riscv64-elf-gcc11-bootstrap.spec

@@ -235,12 +235,12 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker, llvm12 doesn't
-# work at the moment
-BuildRequires:  lld11
+# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't
+# work at the moment so require llvm11
+BuildRequires:  lld
 BuildRequires:  llvm11
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld11
+Requires:       lld
 Requires:       llvm11
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
@@ -765,13 +765,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 %endif
 # for amdgcn install the symlinks to the llvm tools
+# follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
-ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+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 %{_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

cross-riscv64-elf-gcc11.changes

@@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Enable gfortran for offload compilers.
 - BuildRequire procps from gcc11-testresults if we test go.
 - Force using llvm11 for amdgcn offloading since llvm12 doesn't
-  yet work.
+  yet work.  Package expanded symlinks so concurrent installs do
+  not pull in another llvm-mc.
 
 -------------------------------------------------------------------
 Tue Apr 20 14:57:07 UTC 2021 - Richard Biener <rguenther@suse.com>

cross-riscv64-elf-gcc11.spec

@@ -234,12 +234,12 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker, llvm12 doesn't
-# work at the moment
-BuildRequires:  lld11
+# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't
+# work at the moment so require llvm11
+BuildRequires:  lld
 BuildRequires:  llvm11
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld11
+Requires:       lld
 Requires:       llvm11
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
@@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 %endif
 # for amdgcn install the symlinks to the llvm tools
+# follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
-ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+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 %{_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

cross-riscv64-gcc11.changes

@@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Enable gfortran for offload compilers.
 - BuildRequire procps from gcc11-testresults if we test go.
 - Force using llvm11 for amdgcn offloading since llvm12 doesn't
-  yet work.
+  yet work.  Package expanded symlinks so concurrent installs do
+  not pull in another llvm-mc.
 
 -------------------------------------------------------------------
 Tue Apr 20 14:57:07 UTC 2021 - Richard Biener <rguenther@suse.com>

cross-riscv64-gcc11.spec

@@ -234,12 +234,12 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker, llvm12 doesn't
-# work at the moment
-BuildRequires:  lld11
+# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't
+# work at the moment so require llvm11
+BuildRequires:  lld
 BuildRequires:  llvm11
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld11
+Requires:       lld
 Requires:       llvm11
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
@@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 %endif
 # for amdgcn install the symlinks to the llvm tools
+# follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
-ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+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 %{_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

cross-rx-gcc11-bootstrap.changes

@@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Enable gfortran for offload compilers.
 - BuildRequire procps from gcc11-testresults if we test go.
 - Force using llvm11 for amdgcn offloading since llvm12 doesn't
-  yet work.
+  yet work.  Package expanded symlinks so concurrent installs do
+  not pull in another llvm-mc.
 
 -------------------------------------------------------------------
 Tue Apr 20 14:57:07 UTC 2021 - Richard Biener <rguenther@suse.com>

cross-rx-gcc11-bootstrap.spec

@@ -235,12 +235,12 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker, llvm12 doesn't
-# work at the moment
-BuildRequires:  lld11
+# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't
+# work at the moment so require llvm11
+BuildRequires:  lld
 BuildRequires:  llvm11
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld11
+Requires:       lld
 Requires:       llvm11
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
@@ -765,13 +765,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 %endif
 # for amdgcn install the symlinks to the llvm tools
+# follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
-ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+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 %{_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

cross-rx-gcc11.changes

@@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Enable gfortran for offload compilers.
 - BuildRequire procps from gcc11-testresults if we test go.
 - Force using llvm11 for amdgcn offloading since llvm12 doesn't
-  yet work.
+  yet work.  Package expanded symlinks so concurrent installs do
+  not pull in another llvm-mc.
 
 -------------------------------------------------------------------
 Tue Apr 20 14:57:07 UTC 2021 - Richard Biener <rguenther@suse.com>

cross-rx-gcc11.spec

@@ -234,12 +234,12 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker, llvm12 doesn't
-# work at the moment
-BuildRequires:  lld11
+# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't
+# work at the moment so require llvm11
+BuildRequires:  lld
 BuildRequires:  llvm11
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld11
+Requires:       lld
 Requires:       llvm11
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
@@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 %endif
 # for amdgcn install the symlinks to the llvm tools
+# follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
-ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+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 %{_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

cross-s390x-gcc11.changes

@@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Enable gfortran for offload compilers.
 - BuildRequire procps from gcc11-testresults if we test go.
 - Force using llvm11 for amdgcn offloading since llvm12 doesn't
-  yet work.
+  yet work.  Package expanded symlinks so concurrent installs do
+  not pull in another llvm-mc.
 
 -------------------------------------------------------------------
 Tue Apr 20 14:57:07 UTC 2021 - Richard Biener <rguenther@suse.com>

cross-s390x-gcc11.spec

@@ -234,12 +234,12 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker, llvm12 doesn't
-# work at the moment
-BuildRequires:  lld11
+# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't
+# work at the moment so require llvm11
+BuildRequires:  lld
 BuildRequires:  llvm11
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld11
+Requires:       lld
 Requires:       llvm11
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
@@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 %endif
 # for amdgcn install the symlinks to the llvm tools
+# follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
-ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+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 %{_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

cross-sparc-gcc11.changes

@@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Enable gfortran for offload compilers.
 - BuildRequire procps from gcc11-testresults if we test go.
 - Force using llvm11 for amdgcn offloading since llvm12 doesn't
-  yet work.
+  yet work.  Package expanded symlinks so concurrent installs do
+  not pull in another llvm-mc.
 
 -------------------------------------------------------------------
 Tue Apr 20 14:57:07 UTC 2021 - Richard Biener <rguenther@suse.com>

cross-sparc-gcc11.spec

@@ -234,12 +234,12 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker, llvm12 doesn't
-# work at the moment
-BuildRequires:  lld11
+# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't
+# work at the moment so require llvm11
+BuildRequires:  lld
 BuildRequires:  llvm11
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld11
+Requires:       lld
 Requires:       llvm11
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
@@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 %endif
 # for amdgcn install the symlinks to the llvm tools
+# follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
-ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+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 %{_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

cross-sparc64-gcc11.changes

@@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Enable gfortran for offload compilers.
 - BuildRequire procps from gcc11-testresults if we test go.
 - Force using llvm11 for amdgcn offloading since llvm12 doesn't
-  yet work.
+  yet work.  Package expanded symlinks so concurrent installs do
+  not pull in another llvm-mc.
 
 -------------------------------------------------------------------
 Tue Apr 20 14:57:07 UTC 2021 - Richard Biener <rguenther@suse.com>

cross-sparc64-gcc11.spec

@@ -234,12 +234,12 @@ ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker, llvm12 doesn't
-# work at the moment
-BuildRequires:  lld11
+# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't
+# work at the moment so require llvm11
+BuildRequires:  lld
 BuildRequires:  llvm11
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld11
+Requires:       lld
 Requires:       llvm11
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
@@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 %endif
 # for amdgcn install the symlinks to the llvm tools
+# follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
-ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+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 %{_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

cross-x86_64-gcc11.changes

@@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Enable gfortran for offload compilers.
 - BuildRequire procps from gcc11-testresults if we test go.
 - Force using llvm11 for amdgcn offloading since llvm12 doesn't
-  yet work.
+  yet work.  Package expanded symlinks so concurrent installs do
+  not pull in another llvm-mc.
 
 -------------------------------------------------------------------
 Tue Apr 20 14:57:07 UTC 2021 - Richard Biener <rguenther@suse.com>

cross-x86_64-gcc11.spec

@@ -234,12 +234,12 @@ ExclusiveArch:
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker, llvm12 doesn't
-# work at the moment
-BuildRequires:  lld11
+# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't
+# work at the moment so require llvm11
+BuildRequires:  lld
 BuildRequires:  llvm11
 Requires:       cross-amdgcn-newlib-devel >= %{version}-%{release}
-Requires:       lld11
+Requires:       lld
 Requires:       llvm11
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
@@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 %endif
 # for amdgcn install the symlinks to the llvm tools
+# follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
-ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+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 %{_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

cross.spec.in

@@ -145,12 +145,12 @@ ExclusiveArch: x86_64
 %define nvptx_newlib 1
 %endif
 %if "%{cross_arch}" == "amdgcn"
-# amdgcn uses the llvm assembler and linker, llvm12 doesn't
-# work at the moment
+# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't
+# work at the moment so require llvm11
 BuildRequires: llvm11
-BuildRequires: lld11
+BuildRequires: lld
 Requires: llvm11
-Requires: lld11
+Requires: lld
 Requires: cross-amdgcn-newlib-devel >= %{version}-%{release}
 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does
 # technically also SLE12 SP5 but do not bother there
@@ -307,13 +307,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
 rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
 %endif
 # for amdgcn install the symlinks to the llvm tools
+# follow alternatives symlinks to the hardcoded version requirement
 %if "%{TARGET_ARCH}" == "amdgcn"
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin
-ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar
-ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as
+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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld
-ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm
-ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib
+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 %{_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

gcc11-testresults.changes

@@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Enable gfortran for offload compilers.
 - BuildRequire procps from gcc11-testresults if we test go.
 - Force using llvm11 for amdgcn offloading since llvm12 doesn't
-  yet work.
+  yet work.  Package expanded symlinks so concurrent installs do
+  not pull in another llvm-mc.
 
 -------------------------------------------------------------------
 Tue Apr 20 14:57:07 UTC 2021 - Richard Biener <rguenther@suse.com>

gcc11.changes

@@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Enable gfortran for offload compilers.
 - BuildRequire procps from gcc11-testresults if we test go.
 - Force using llvm11 for amdgcn offloading since llvm12 doesn't
-  yet work.
+  yet work.  Package expanded symlinks so concurrent installs do
+  not pull in another llvm-mc.
 
 -------------------------------------------------------------------
 Tue Apr 20 14:57:07 UTC 2021 - Richard Biener <rguenther@suse.com>